DY-JMXF/mosty-dyga-cloud
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并代码

Browse Source
This commit is contained in:
DEV_ZZ
2025-09-05 17:43:45 +08:00
parent 07ffe495a7
commit 98eb02a007
80 changed files with 3478 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

376
.idea/workspace.xml generated
View File

@ -5,342 +5,81 @@
</component>
<component name="ChangeListManager">
<list default="true" id="2fe7d933-c25c-4b0a-af9e-56f23f2ef2b9" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_cloud_spring_cloud_alibaba_nacos_discovery_2_2_0_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson2_fastjson2_2_0_9.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson2_fastjson2_extension_2_0_9.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_2_0_9.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_spring_spring_context_support_1_0_5.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__cn_hutool_hutool_all_5_7_20.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__cn_hutool_hutool_all_5_7_20.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_cloud_spring_cloud_alibaba_nacos_discovery_2_1_0_RELEASE.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_cloud_spring_cloud_starter_alibaba_nacos_discovery_2_0_3_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_cloud_spring_cloud_starter_alibaba_nacos_discovery_2_0_3_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_cloud_spring_cloud_starter_alibaba_nacos_discovery_2_2_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_cloud_spring_cloud_starter_alibaba_nacos_discovery_2_2_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_10.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_1_2_83.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_nacos_nacos_api_1_1_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_nacos_nacos_api_1_3_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_nacos_nacos_api_1_3_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_nacos_nacos_api_1_4_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_nacos_nacos_api_1_4_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_nacos_nacos_client_1_1_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_nacos_nacos_client_1_3_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_nacos_nacos_client_1_3_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_nacos_nacos_client_1_4_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_nacos_nacos_client_1_4_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_nacos_nacos_common_1_1_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_nacos_nacos_common_1_3_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_nacos_nacos_common_1_3_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_nacos_nacos_common_1_4_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_nacos_nacos_common_1_4_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_spring_spring_context_support_1_0_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_spring_spring_context_support_1_0_10.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_transmittable_thread_local_2_11_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_transmittable_thread_local_2_11_5.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_auth0_java_jwt_3_8_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_auth0_java_jwt_3_8_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_dynamic_datasource_spring_boot_starter_3_4_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_dynamic_datasource_spring_boot_starter_3_4_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_4_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_4_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_4_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_4_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_belerweb_pinyin4j_2_5_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_belerweb_pinyin4j_2_5_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_carrotsearch_thirdparty_simple_xml_safe_2_7_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_carrotsearch_thirdparty_simple_xml_safe_2_7_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_caspar_chen_swagger_ui_layer_1_1_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_caspar_chen_swagger_ui_layer_1_1_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_4_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_3_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_3_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_3_4.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_29_0_jre.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_29_0_jre.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_hikvision_ga_artemis_http_client_1_1_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_hikvision_ga_artemis_http_client_1_1_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mosty_common_base_starter_1_0_0_SNAPSHOT.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_mosty_common_base_starter_1_0_0_SNAPSHOT.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mosty_common_config_starter_1_0_0_SNAPSHOT.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_mosty_common_config_starter_1_0_0_SNAPSHOT.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mosty_common_core_starter_1_0_0_SNAPSHOT.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_mosty_common_core_starter_1_0_0_SNAPSHOT.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mosty_common_log_base_starter_1_0_0_SNAPSHOT.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_mosty_common_log_base_starter_1_0_0_SNAPSHOT.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mosty_common_magic_api_starter_1_0_0_SNAPSHOT.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_mosty_common_magic_api_starter_1_0_0_SNAPSHOT.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mosty_common_redis_starter_1_0_0_SNAPSHOT.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_mosty_common_redis_starter_1_0_0_SNAPSHOT.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mosty_common_token_starter_1_0_0_SNAPSHOT.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_mosty_common_token_starter_1_0_0_SNAPSHOT.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mosty_operation_log_aspect_starter_1_0_0_SNAPSHOT.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_mosty_operation_log_aspect_starter_1_0_0_SNAPSHOT.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_6.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_feign_feign_core_8_14_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_feign_feign_core_8_14_4.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_feign_feign_slf4j_8_14_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_feign_feign_slf4j_8_14_4.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_18.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_18.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_3_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_3_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_3_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_3_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_3_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_3_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_servo_servo_core_0_12_21.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_servo_servo_core_0_12_21.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_oracle_ojdbc6_11_2_0_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_oracle_ojdbc6_11_2_0_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_14_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_14_6.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okio_okio_1_17_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okio_okio_1_17_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_20.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_20.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_vividsolutions_jts_1_13.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_vividsolutions_jts_1_13.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_13.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_13.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_1_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_1_3_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__de_codecentric_spring_boot_admin_client_2_2_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__de_codecentric_spring_boot_admin_client_2_2_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__de_codecentric_spring_boot_admin_starter_client_2_2_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__de_codecentric_spring_boot_admin_starter_client_2_2_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_core_10_10_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_core_10_10_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_10_10_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_10_10_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_10_10_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_10_10_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_form_feign_form_3_8_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_form_feign_form_3_8_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_form_feign_form_spring_3_8_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_form_feign_form_spring_3_8_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_lettuce_lettuce_core_5_2_1_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_lettuce_lettuce_core_5_2_1_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_micrometer_micrometer_core_1_5_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_micrometer_micrometer_core_1_5_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_minio_minio_8_0_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_minio_minio_8_0_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_buffer_4_1_51_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_buffer_4_1_51_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_4_1_51_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_4_1_51_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_http2_4_1_51_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_http2_4_1_51_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_51_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_51_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_socks_4_1_51_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_socks_4_1_51_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_common_4_1_51_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_common_4_1_51_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_handler_4_1_51_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_handler_4_1_51_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_handler_proxy_4_1_51_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_handler_proxy_4_1_51_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_resolver_4_1_51_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_resolver_4_1_51_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_4_1_51_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_4_1_51_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_linux_x86_64_4_1_51_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_linux_x86_64_4_1_51_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_51_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_51_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_projectreactor_addons_reactor_extra_3_3_3_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_projectreactor_addons_reactor_extra_3_3_3_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_projectreactor_netty_reactor_netty_0_9_10_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_projectreactor_netty_reactor_netty_0_9_10_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_8_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_8_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_prometheus_simpleclient_0_5_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_prometheus_simpleclient_0_5_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_core_2_8_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_core_2_8_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_schema_2_8_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_schema_2_8_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spi_2_8_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spi_2_8_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_8_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_8_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_8_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_8_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_8_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_8_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_8_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_8_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_14.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_14.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_models_1_5_14.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_models_1_5_14.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_inject_javax_inject_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_inject_javax_inject_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_mail_mail_1_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_mail_mail_1_4.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jaxen_jaxen_1_2_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jaxen_jaxen_1_2_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jdom_jdom_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jdom_jdom_1_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_16.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_16.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_6.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_6.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_text_1_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_text_1_6.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpasyncclient_4_1_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpasyncclient_4_1_4.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_10.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_13.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_13.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_nio_4_4_13.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_nio_4_4_13.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_3_17.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_17.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_17.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_8_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_8_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_8_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_8_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_8_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_8_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_8_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_8_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_8_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_8_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_8_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_8_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_8_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_8_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_8_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_8_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_8_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_8_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_8_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_8_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_30.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_30.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_30.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_30.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_30.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_30.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_ws_commons_XmlSchema_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_ws_commons_XmlSchema_1_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_assertj_assertj_core_3_13_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_assertj_assertj_core_3_13_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_64.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_64.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_64.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_64.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_checkerframework_checker_qual_2_11_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_checkerframework_checker_qual_2_11_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_woodstox_wstx_asl_3_2_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_woodstox_wstx_asl_3_2_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_xfire_xfire_core_1_2_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_xfire_xfire_core_1_2_6.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_18_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_18_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jolokia_jolokia_core_1_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jolokia_jolokia_core_1_6_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_vintage_junit_vintage_engine_5_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_vintage_junit_vintage_engine_5_6_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_locationtech_jts_jts_core_1_18_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_locationtech_jts_jts_core_1_18_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_3_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_3_1_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_1_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mongodb_bson_3_11_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mongodb_mongodb_driver_3_11_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mongodb_mongodb_driver_core_3_11_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_5_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_5_7.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_2_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_2_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_2_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_2_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_postgresql_postgresql_42_2_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_postgresql_postgresql_42_2_9.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_16_18.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_16_18.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_18_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_18_10.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_reflections_reflections_0_9_11.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_reflections_reflections_0_9_11.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_2_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_2_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_2_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_2_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_2_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_2_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_2_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_2_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_2_2_4_RELEASE.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_2_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_2_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_2_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_2_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_reactor_netty_2_2_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_reactor_netty_2_2_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_2_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_2_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_webflux_2_2_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_webflux_2_2_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_2_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_2_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_2_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_2_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_2_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_2_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_2_5_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_2_5_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_2_5_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_2_5_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_gateway_core_2_2_5_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_gateway_core_2_2_5_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_2_5_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_2_5_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_2_5_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_2_5_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_2_5_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_2_5_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_2_5_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_2_5_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_gateway_2_2_5_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_gateway_2_2_5_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_2_5_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_2_5_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_2_5_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_2_5_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_2_2_5_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_2_2_5_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_3_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_3_2_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_3_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_3_2_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_mongodb_3_0_2_RELEASE.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_3_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_3_2_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_integration_spring_integration_core_5_3_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_integration_spring_integration_core_5_3_2_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_integration_spring_integration_ip_5_3_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_integration_spring_integration_ip_5_3_2_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_5_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_5_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_3_3_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_3_3_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_2_8_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_2_8_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_2_8_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_2_8_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_2_8_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_2_8_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_8_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_8_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_2_8_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_2_8_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_2_8_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_2_8_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_8_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_8_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_8_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_8_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_messaging_5_2_8_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_messaging_5_2_8_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_8_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_8_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_2_8_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_2_8_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_2_8_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_2_8_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_2_8_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_2_8_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webflux_5_2_8_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webflux_5_2_8_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_8_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_8_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_websocket_5_2_8_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_websocket_5_2_8_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ssssssss_magic_api_2_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ssssssss_magic_api_2_0_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ssssssss_magic_api_plugin_swagger_2_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ssssssss_magic_api_plugin_swagger_2_0_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ssssssss_magic_api_spring_boot_starter_2_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ssssssss_magic_api_spring_boot_starter_2_0_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ssssssss_magic_editor_2_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ssssssss_magic_editor_2_0_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ssssssss_magic_script_1_8_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ssssssss_magic_script_1_8_5.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_synchronoss_cloud_nio_multipart_parser_1_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_synchronoss_cloud_nio_multipart_parser_1_1_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_synchronoss_cloud_nio_stream_storage_1_1_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_synchronoss_cloud_nio_stream_storage_1_1_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/annot/IsClbq.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/annot/IsDict.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/annot/IsDictItems.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/annot/IsRybq.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/annot/JwtIgnore.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/annot/validation/ClbqValidation.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/annot/validation/DictItemsValidation.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/annot/validation/DictValidation.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/annot/validation/RybqValidation.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZdxlFgdwUpdateDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZdxlFgxlrwCreateDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZdxlFgxlrwExportDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZdxlFgxlrwJqpzUpdateDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZdxlFgxlrwUpdateDTO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/zddw/TbZdxlFgdw.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/zddw/TbZdxlFgxlrw.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZdxlFgxlrwQuery.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZdxlFgdwVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZdxlFgxlrwJqflVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZdxlFgxlrwJqpzVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZdxlFgxlrwVO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/DictUtils.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/MessageUtils.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/resources/i18n/messages.properties" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbZdxlFgdwController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbZdxlFgxlrwController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZdxlFgdwMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZdxlFgxlrwMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbZdxlFgdwServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbZdxlFgxlrwServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbZdxlFgdwService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbZdxlFgxlrwService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/mosty-yjzl/src/main/java/com/mosty/yjzl/utils/TbZdxlFgxlrwUtils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/mosty-base-feign-sdk.iml" beforeDir="false" afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/mosty-base-feign-sdk.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/Constant.java" beforeDir="false" afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/Constant.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/spring/SpringValidUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/spring/SpringValidUtils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-base/mosty-base.iml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-base/mosty-base.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-base/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-base/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-base/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-base/src/main/resources/bootstrap.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-bkzx/mosty-bkzx.iml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-bkzx/mosty-bkzx.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-gateway/src/main/resources/META-INF/additional-spring-configuration-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-gateway/src/main/resources/META-INF/additional-spring-configuration-metadata.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-bkzx/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-bkzx/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-bkzx/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-bkzx/src/main/resources/bootstrap.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-gateway/mosty-gateway.iml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-gateway/mosty-gateway.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-gateway/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-gateway/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-gateway/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-gateway/src/main/resources/bootstrap.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-hczx/mosty-hczx.iml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-hczx/mosty-hczx.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-hczx/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-hczx/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-hczx/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-hczx/src/main/resources/bootstrap.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-jcgl/mosty-jcgl.iml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-jcgl/mosty-jcgl.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-jcgl/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-jcgl/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-jcgl/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-jcgl/src/main/resources/bootstrap.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-other/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-other/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-other/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-other/src/main/resources/bootstrap.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-qwzx/mosty-qwzx.iml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-qwzx/mosty-qwzx.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-qwzx/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-qwzx/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-qwzx/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-qwzx/src/main/resources/bootstrap.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-rwzx/mosty-rwzx.iml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-rwzx/mosty-rwzx.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-rwzx/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-rwzx/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-rwzx/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-rwzx/src/main/resources/bootstrap.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-rzzx/mosty-rzzx.iml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-rzzx/mosty-rzzx.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-rzzx/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-rzzx/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-rzzx/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-rzzx/src/main/resources/bootstrap.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-sjzx/mosty-sjzx.iml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-sjzx/mosty-sjzx.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-sjzx/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-sjzx/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-sjzx/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-sjzx/src/main/resources/bootstrap.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-spxl/mosty-spxl.iml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-spxl/mosty-spxl.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-websocket/mosty-websocket.iml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-websocket/mosty-websocket.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-spxl/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-spxl/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-spxl/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-spxl/src/main/resources/bootstrap.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-websocket/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-websocket/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-websocket/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-websocket/src/main/resources/bootstrap.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-wzzx/mosty-wzzx.iml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-wzzx/mosty-wzzx.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-wzzx/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-wzzx/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-wzzx/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-wzzx/src/main/resources/bootstrap.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-yjzl/mosty-yjzl.iml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-yjzl/mosty-yjzl.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-yjzl/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-yjzl/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-yjzl/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-yjzl/src/main/resources/bootstrap.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mosty-yszx/mosty-yszx.iml" beforeDir="false" afterPath="$PROJECT_DIR$/mosty-yszx/mosty-yszx.iml" afterDir="false" />
@ -396,7 +135,7 @@
<property name="SHARE_PROJECT_CONFIGURATION_FILES" 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-framework/mosty-cloud" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/resources" />
<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" />
@ -415,6 +154,13 @@
<selection>jr</selection>
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="E:\WorkSpace\project\dyxf\mosty-dyga-cloud\feign-client-api\mosty-base-feign-sdk\src\main\resources" />
<recent name="E:\WorkSpace\project\dyxf\mosty-dyga-cloud\feign-client-api\mosty-base-feign-sdk\src\main\java\com\mosty\base\utils" />
<recent name="E:\WorkSpace\project\dyxf\mosty-dyga-cloud\feign-client-api\mosty-base-feign-sdk\src\main\java\com\mosty\base" />
<recent name="E:\WorkSpace\project\dyxf\mosty-dyga-cloud\feign-client-api\mosty-base-feign-sdk\src\main\java\com\mosty\base\enums" />
<recent name="E:\WorkSpace\project\dyxf\mosty-dyga-cloud\mosty-yjzl\src\main\java\com\mosty\yjzl\utils" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.mosty.base.model.dto.qwzx" />
</key>
@ -709,6 +455,8 @@
<workItem from="1747644696400" duration="1460000" />
<workItem from="1747733778428" duration="649000" />
<workItem from="1747739963892" duration="3769000" />
<workItem from="1757036647987" duration="1655000" />
<workItem from="1757038745411" duration="9331000" />
</task>
<task id="LOCAL-00001" summary="德阳最近修改">
<created>1747745304973</created>

4
feign-client-api/mosty-base-feign-sdk/mosty-base-feign-sdk.iml
View File

@ -17,10 +17,10 @@
<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="1747276765359" />
<entry key="lastExternalPluginCheckTime" value="1757036647255" />
</map>
</option>
<option name="version" value="13" />
<option name="version" value="15" />
</configuration>
</facet>
</component>

54
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/annot/IsClbq.java Normal file
View File

@ -0,0 +1,54 @@
package com.mosty.base.annot;
import com.mosty.base.annot.validation.ClbqValidation;
import javax.validation.Constraint;
import javax.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
* @author zhangzhao
* @description 校验是否是车辆标签 注解
* @modifier zhangzhao
* @modifiedTime 2023/3/18 15:38
* @since 2023/3/18 15:38
*/
@Documented
@Target({METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE})
@Retention(RUNTIME)
@Constraint(validatedBy = {ClbqValidation.class})
public @interface IsClbq {
Class<?>[] groups() default {};
Class<? extends Payload>[] payload() default {};
/**
* 错误提示信息
* @return 错误提示信息
*/
String message() default "dict.not.standard";
/**
* 是否必填，默认为必填
* @return 是否
*/
boolean isNotBlank() default true;
/**
* 最大值
* @return 最大值
*/
int max() default Integer.MAX_VALUE;
/**
* 最小值
* @return 最小值
*/
int min() default Integer.MIN_VALUE;
}

48
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/annot/IsDict.java Normal file
View File

@ -0,0 +1,48 @@
package com.mosty.base.annot;
import com.mosty.base.annot.validation.DictValidation;
import javax.validation.Constraint;
import javax.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
* @author zhangzhao
* @description 校验是否是字典 注解
* @modifier zhangzhao
* @modifiedTime 2023/3/17 17:40
* @since 2023/3/17 17:40
*/
@Documented
@Target({METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE})
@Retention(RUNTIME)
@Constraint(validatedBy = {DictValidation.class})
public @interface IsDict {
Class<?>[] groups() default {};
Class<? extends Payload>[] payload() default {};
/**
* 错误提示信息
* @return 错误提示信息
*/
String message() default "dict.not.standard";
/**
* 字典编号
* @return 字典编号
*/
String zdbh() default "";
/**
* 是否必填，默认为必填
* @return 是否
*/
boolean isNotBlank() default true;
}

48
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/annot/IsDictItems.java Normal file
View File

@ -0,0 +1,48 @@
package com.mosty.base.annot;
import com.mosty.base.annot.validation.DictItemsValidation;
import javax.validation.Constraint;
import javax.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
* @author zhangzhao
* @description 校验是否是字典（多个字典项逐一校验） 注解
* @modifier zhangzhao
* @modifiedTime 2024/07/03 15:53
* @since 2023/07/03 15:53
*/
@Documented
@Target({METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE})
@Retention(RUNTIME)
@Constraint(validatedBy = {DictItemsValidation.class})
public @interface IsDictItems {
Class<?>[] groups() default {};
Class<? extends Payload>[] payload() default {};
/**
* 错误提示信息
* @return 错误提示信息
*/
String message() default "dict.not.standard";
/**
* 字典编号
* @return 字典编号
*/
String zdbh() default "";
/**
* 是否必填，默认为必填
* @return 是否
*/
boolean isNotBlank() default true;
}

54
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/annot/IsRybq.java Normal file
View File

@ -0,0 +1,54 @@
package com.mosty.base.annot;
import com.mosty.base.annot.validation.RybqValidation;
import javax.validation.Constraint;
import javax.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.*;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
* @author zhangzhao
* @description 校验是否是人员标签 注解
* @modifier zhangzhao
* @modifiedTime 2023/3/18 14:06
* @since 2023/3/18 14:06
*/
@Documented
@Target({METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE})
@Retention(RUNTIME)
@Constraint(validatedBy = {RybqValidation.class})
public @interface IsRybq {
Class<?>[] groups() default {};
Class<? extends Payload>[] payload() default {};
/**
* 错误提示信息
* @return 错误提示信息
*/
String message() default "dict.not.standard";
/**
* 是否必填，默认为必填
* @return 是否
*/
boolean isNotBlank() default true;
/**
* 最大值
* @return 最大值
*/
int max() default Integer.MAX_VALUE;
/**
* 最小值
* @return 最小值
*/
int min() default Integer.MIN_VALUE;
}

16
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/annot/JwtIgnore.java Normal file
View File

@ -0,0 +1,16 @@
package com.mosty.base.annot;
import java.lang.annotation.*;
/**
* ========================
* JWT验证忽略注解
* Created with IntelliJ IDEA.
* Version: v1.0
* ========================
*/
@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface JwtIgnore {
}

40
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/annot/validation/ClbqValidation.java Normal file
View File

@ -0,0 +1,40 @@
package com.mosty.base.annot.validation;
import com.mosty.base.annot.IsClbq;
import com.mosty.base.utils.DictUtils;
import com.mosty.base.utils.spring.SpringValidUtils;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
/**
* @author zhangzhao
* @description 校验是否是车辆标签 实现类
* @modifier zhangzhao
* @modifiedTime 2023/3/18 15:38
* @since 2023/3/18 15:38
*/
public class ClbqValidation implements ConstraintValidator<IsClbq, Object> {
private IsClbq annotation;
@Override
public void initialize(IsClbq constraintAnnotation) {
this.annotation = constraintAnnotation;
}
@Override
public boolean isValid(Object value, ConstraintValidatorContext constraintValidatorContext) {
String valueStr = value + "";
//校验车辆标签长度是否合规
boolean isSizeValidation = SpringValidUtils.annotationSizeValidation(annotation.isNotBlank(), annotation.max(), annotation.min(), valueStr);
if(!isSizeValidation){
return false;
}
//使用字典工具类中的校验方法
return DictUtils.isDictContainValues(DictUtils.DICT_ZDBH_D_BZ_CLBQ, valueStr);
}
}

37
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/annot/validation/DictItemsValidation.java Normal file
View File

@ -0,0 +1,37 @@
package com.mosty.base.annot.validation;
import com.mosty.base.annot.IsDictItems;
import com.mosty.base.utils.DictUtils;
import com.mosty.common.base.util.StringUtils;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
/**
* @author zhangzhao
* @description 校验是否是字典（多个字典项逐一校验） 实现类
* @modifier zhangzhao
* @modifiedTime 2024/07/03 15:53
* @since 2023/07/03 15:53
*/
public class DictItemsValidation implements ConstraintValidator<IsDictItems, Object> {
private IsDictItems annotation;
@Override
public void initialize(IsDictItems constraintAnnotation) {
this.annotation = constraintAnnotation;
}
@Override
public boolean isValid(Object value, ConstraintValidatorContext context) {
if(value == null || StringUtils.isBlank(value + "")){
//如果需要校验的值为空，并且该项为必填项，则返回错误
return !annotation.isNotBlank();
}else{
//使用字典工具类中的校验方法
return DictUtils.isDictContainValues(annotation.zdbh(), value + "");
}
}
}

36
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/annot/validation/DictValidation.java Normal file
View File

@ -0,0 +1,36 @@
package com.mosty.base.annot.validation;
import com.mosty.base.annot.IsDict;
import com.mosty.base.utils.DictUtils;
import com.mosty.common.base.util.StringUtils;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
/**
* @author zhangzhao
* @description 校验是否是字典 实现类
* @modifier zhangzhao
* @modifiedTime 2023/3/17 17:40
* @since 2023/3/17 17:40
*/
public class DictValidation implements ConstraintValidator<IsDict, Object> {
private IsDict annotation;
@Override
public void initialize(IsDict constraintAnnotation) {
this.annotation = constraintAnnotation;
}
@Override
public boolean isValid(Object value, ConstraintValidatorContext context) {
if(value == null || StringUtils.isBlank(value + "")){
//如果需要校验的值为空，并且该项为必填项，则返回错误
return !annotation.isNotBlank();
}else{
//使用字典工具类中的校验方法
return DictUtils.isDictContainValue(annotation.zdbh(), value + "");
}
}
}

40
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/annot/validation/RybqValidation.java Normal file
View File

@ -0,0 +1,40 @@
package com.mosty.base.annot.validation;
import com.mosty.base.annot.IsRybq;
import com.mosty.base.utils.DictUtils;
import com.mosty.base.utils.spring.SpringValidUtils;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
/**
* @author zhangzhao
* @description 校验是否是人员标签 实现类
* @modifier zhangzhao
* @modifiedTime 2023/3/18 14:07
* @since 2023/3/18 14:07
*/
public class RybqValidation implements ConstraintValidator<IsRybq, Object> {
private IsRybq annotation;
@Override
public void initialize(IsRybq constraintAnnotation) {
this.annotation = constraintAnnotation;
}
@Override
public boolean isValid(Object value, ConstraintValidatorContext constraintValidatorContext) {
String valueStr = value + "";
//校验人员标签长度是否合规
boolean isSizeValidation = SpringValidUtils.annotationSizeValidation(annotation.isNotBlank(), annotation.max(), annotation.min(), valueStr);
if(!isSizeValidation){
return false;
}
//使用字典工具类中的校验方法
return DictUtils.isDictContainValues(DictUtils.DICT_ZDBH_D_BZ_RYBQ, value + "");
}
}

44
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZdxlFgdwUpdateDTO.java Normal file
View File

@ -0,0 +1,44 @@
package com.mosty.base.model.dto.yjzl;
import com.baomidou.mybatisplus.annotation.TableField;
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;
/**
* @author zhangzhao
* @description 指导巡逻方格点位表修改DTO对象
* @modifier zhangzhao
* @modifiedTime 2025/05/15 22:39
* @since 2025/05/15 22:39
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "TbZdxlFgdwUpdateDTO对象", description = "指导巡逻方格点位表修改DTO对象")
public class TbZdxlFgdwUpdateDTO {
/**
* 主键id
*/
@ApiModelProperty(value = "主键id", required = true)
@NotBlank(message = "id.bnwk")
private String id;
/**
* 名称
*/
@ApiModelProperty(value = "名称")
private String mc;
/**
* 地址
*/
@ApiModelProperty(value = "地址")
private String dz;
}

52
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZdxlFgxlrwCreateDTO.java Normal file
View File

@ -0,0 +1,52 @@
package com.mosty.base.model.dto.yjzl;
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 javax.validation.constraints.NotNull;
import java.util.Date;
/**
* @author zhangzhao
* @description 指导巡逻方格巡逻任务表创建DTO对象
* @modifier zhangzhao
* @modifiedTime 2025/05/12 22:59
* @since 2025/05/12 22:59
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "TbZdxlFgxlrwCreateDTO对象", description = "指导巡逻方格巡逻任务表创建DTO对象")
public class TbZdxlFgxlrwCreateDTO {
/**
* 任务日期
*/
@ApiModelProperty(value = "任务日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@NotNull(message = "zdxl.fgxlrw.rwRq.notNull")
private Date rwRq;
/**
* 任务计算开始日期
*/
@ApiModelProperty(value = "任务计算开始日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date rwJsKsrq;
/**
* 任务计算结束日期
*/
@ApiModelProperty(value = "任务计算结束日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date rwJsJsrq;
}

36
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZdxlFgxlrwExportDTO.java Normal file
View File

@ -0,0 +1,36 @@
package com.mosty.base.model.dto.yjzl;
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 javax.validation.constraints.NotNull;
import java.util.Date;
/**
* @author zhangzhao
* @description 指导巡逻方格巡逻任务表导出DTO对象
* @modifier zhangzhao
* @modifiedTime 2025/05/13 10:52
* @since 2025/05/13 10:52
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "TbZdxlFgxlrwExportDTO对象", description = "指导巡逻方格巡逻任务表导出DTO对象")
public class TbZdxlFgxlrwExportDTO {
/**
* 任务日期
*/
@ApiModelProperty(value = "任务日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@NotNull(message = "zdxl.fgxlrw.rwRq.notNull")
private Date rwRq;
}

53
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZdxlFgxlrwJqpzUpdateDTO.java Normal file
View File

@ -0,0 +1,53 @@
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 javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
/**
* @author zhangzhao
* @description 指导巡逻方格巡逻任务表警情配置修改DTO对象
* @modifier zhangzhao
* @modifiedTime 2025/08/26 17:16
* @since 2025/08/26 17:16
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "TbZdxlFgxlrwJqpzUpdateDTO对象", description = "指导巡逻方格巡逻任务表警情配置修改DTO对象")
public class TbZdxlFgxlrwJqpzUpdateDTO {
/**
* 报警细类
*/
@ApiModelProperty(value = "报警细类")
@NotBlank(message = "zdxl.fgxlrw.jqpz.bjxl.notBlank")
@Size(max = 1000, message = "zdxl.fgxlrw.jqpz.bjxl.size")
private String bjxl;
/**
* 报警细类说明
*/
@Size(max = 200, message = "zdxl.fgxlrw.jqpz.bjxlSm.size")
private String bjxlSm;
/**
* 报警子类
*/
@ApiModelProperty(value = "报警子类")
@NotBlank(message = "zdxl.fgxlrw.jqpz.bjzl.notBlank")
@Size(max = 1000, message = "zdxl.fgxlrw.jqpz.bjzl.size")
private String bjzl;
/**
* 报警子类说明
*/
@Size(max = 200, message = "zdxl.fgxlrw.jqpz.bjzlSm.size")
private String bjzlSm;
}

82
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZdxlFgxlrwUpdateDTO.java Normal file
View File

@ -0,0 +1,82 @@
package com.mosty.base.model.dto.yjzl;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mosty.base.annot.IsDict;
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 javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
/**
* @author zhangzhao
* @description 指导巡逻方格巡逻任务表修改DTO对象
* @modifier zhangzhao
* @modifiedTime 2025/05/13 16:49
* @since 2025/05/13 16:49
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "TbZdxlFgxlrwUpdateDTO对象", description = "指导巡逻方格巡逻任务表修改DTO对象")
public class TbZdxlFgxlrwUpdateDTO {
/**
* 主键id
*/
@ApiModelProperty(value = "主键id", required = true)
@NotBlank(message = "id.bnwk")
private String id;
/**
* 方格预警等级 D_ZDXL_FGXLRW_YJDJ
*/
@ApiModelProperty(value = "方格预警等级 D_ZDXL_FGXLRW_YJDJ")
@IsDict(zdbh = "D_ZDXL_FGXLRW_YJDJ", message = "zdxl.fgxlrw.rwRq.fgYjdj.isDict")
private String fgYjdj;
/**
* 方格预警颜色 D_ZDXL_FGXLRW_YJYS
*/
@ApiModelProperty(value = "方格预警颜色 D_ZDXL_FGXLRW_YJYS")
@IsDict(zdbh = "D_ZDXL_FGXLRW_YJYS", message = "zdxl.fgxlrw.rwRq.fgYjys.isDict")
private String fgYjys;
/**
* 巡逻规划时长（分钟）
*/
@ApiModelProperty(value = "巡逻规划时长（分钟）")
@NotNull(message = "zdxl.fgxlrw.rwRq.xlghSc.notNull")
private Double xlghSc;
/**
* 巡逻规划开始时间
*/
@ApiModelProperty(value = "巡逻规划开始时间")
@JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "HH:mm:ss")
@NotNull(message = "zdxl.fgxlrw.rwRq.xlghSjKs.notNull")
private Date xlghSjKs;
/**
* 巡逻规划结束时间
*/
@ApiModelProperty(value = "巡逻规划结束时间")
@JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "HH:mm:ss")
@NotNull(message = "zdxl.fgxlrw.rwRq.xlghSjJs.notNull")
private Date xlghSjJs;
/**
* 巡逻规划巡逻里程（公里）
*/
@ApiModelProperty(value = "巡逻规划巡逻里程（公里）")
@NotNull(message = "zdxl.fgxlrw.rwRq.xlghXllc.notNull")
private Double xlghXllc;
}

299
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/zddw/TbZdxlFgdw.java Normal file
View File

@ -0,0 +1,299 @@
package com.mosty.base.model.entity.yjzl.zddw;
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.common.base.entity.log.Excel;
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 zhangzhao
* @description 指导巡逻方格点位表
* @modifier zhangzhao
* @modifiedTime 2025/05/15 21:52
* @since 2025/05/15 21:52
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("tb_zdxl_fgdw")
@ApiModel(value = "TbZdxlFgdw对象", description = "指导巡逻方格点位表")
public class TbZdxlFgdw extends BaseEntity implements Serializable, Cloneable {
@TableField(exist = false)
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ApiModelProperty(value = "主键ID")
@TableId(value = "id", type = IdType.AUTO)
@Excel(name = "主键ID", sort = 1)
private Integer id;
/**
* 名称
*/
@ApiModelProperty(value = "名称")
@TableField(value = "mc1")
private String mc1;
/**
* 开始日期
*/
@ApiModelProperty(value = "开始日期")
@TableField(value = "ksrq")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date ksrq;
/**
* 结束日期
*/
@ApiModelProperty(value = "结束日期")
@TableField(value = "jsrq")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date jsrq;
/**
* 网格坐标X1
*/
@ApiModelProperty(value = "网格坐标X1")
@TableField(value = "x11")
private BigDecimal x11;
/**
* 网格坐标Y1
*/
@ApiModelProperty(value = "网格坐标Y1")
@TableField(value = "y11")
private BigDecimal y11;
/**
* 网格坐标X2
*/
@ApiModelProperty(value = "网格坐标X2")
@TableField(value = "x21")
private BigDecimal x21;
/**
* 网格坐标Y2
*/
@ApiModelProperty(value = "网格坐标Y2")
@TableField(value = "y21")
private BigDecimal y21;
/**
* 中心X
*/
@ApiModelProperty(value = "中心X")
@TableField(value = "zx_x")
private BigDecimal zxX;
/**
* 中心Y
*/
@ApiModelProperty(value = "中心Y")
@TableField(value = "zx_y")
private BigDecimal zxY;
/**
* 地址
*/
@ApiModelProperty(value = "地址")
@TableField(value = "dz")
private String dz;
/**
* 下发时段
*/
@ApiModelProperty(value = "下发时段")
@TableField(value = "xfsd")
private String xfsd;
/**
* 网格大小
*/
@ApiModelProperty(value = "网格大小")
@TableField(value = "grid_type")
private String gridType;
/**
* 所属部门id
*/
@ApiModelProperty(value = "所属部门id")
private String ssbmid;
/**
* 报备部门
*/
@ApiModelProperty(value = "报备部门")
private String ssbm;
/**
* 报备部门代码
*/
@ApiModelProperty(value = "报备部门代码")
private String ssbmdm;
/**
* 所属县公安局
*/
@ApiModelProperty(value = "所属县公安局")
private String ssxgaj;
/**
* 所属县公安局id
*/
@ApiModelProperty(value = "所属县公安局id")
private String ssxgajid;
/**
* 所属县公安局代码
*/
@ApiModelProperty(value = "所属县公安局代码")
private String ssxgajdm;
/**
* 所属市公安局id
*/
@ApiModelProperty(value = "所属市公安局id")
private String sssgajid;
/**
* 所属市公安局
*/
@ApiModelProperty(value = "所属市公安局")
private String sssgaj;
/**
* 所属市公安局代码
*/
@ApiModelProperty(value = "所属市公安局代码")
private String sssgajdm;
/**
* 主键ID字段名
*/
public static String ID_FIELD = "id";
/**
* 字段名
*/
public static String MC = "mc";
/**
* 字段名
*/
public static String KSRQ = "ksrq";
/**
* 字段名
*/
public static String JSRQ = "jsrq";
/**
* 字段名
*/
public static String X1 = "x1";
/**
* 字段名
*/
public static String Y1 = "y1";
/**
* 字段名
*/
public static String X2 = "x2";
/**
* 字段名
*/
public static String Y2 = "y2";
/**
* 字段名
*/
public static String ZX_X = "zx_x";
/**
* 字段名
*/
public static String ZX_Y = "zx_y";
/**
* 字段名
*/
public static String DZ = "dz";
/**
* 字段名
*/
public static String XFSD = "xfsd";
/**
* 字段名
*/
public static String GRID_TYPE = "grid_type";
/**
* 所属部门id
*/
public static String SSBMID_TYPE = "ssbmid";
/**
* 报备部门
*/
public static String SSBM_TYPE = "ssbm";
/**
* 报备部门代码
*/
public static String SSBMDM_TYPE = "ssbmdm";
/**
* 所属县公安局
*/
public static String SSXGAJ_TYPE = "ssxgaj";
/**
* 所属县公安局id
*/
public static String SSXGAJID_TYPE = "ssxgajid";
/**
* 所属县公安局代码
*/
public static String SSXGAJDM_TYPE = "ssxgajdm";
/**
* 所属市公安局id
*/
public static String SSSGAJID_TYPE = "sssgajid";
/**
* 所属市公安局
*/
public static String SSSGAJ_TYPE = "sssgaj";
/**
* 所属市公安局代码
*/
public static String SSSGAJDM_TYPE = "sssgajdm";
}

306
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/zddw/TbZdxlFgxlrw.java Normal file
View File

@ -0,0 +1,306 @@
package com.mosty.base.model.entity.yjzl.zddw;
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.common.base.entity.log.Excel;
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 zhangzhao
* @description 指导巡逻方格巡逻任务表
* @modifier zhangzhao
* @modifiedTime 2025/05/10 19:33
* @since 2025/05/10 19:33
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("tb_zdxl_fgxlrw")
@ApiModel(value = "TbZdxlFgxlrw对象", description = "指导巡逻方格巡逻任务表")
public class TbZdxlFgxlrw extends BaseEntity implements Serializable, Cloneable {
@TableField(exist = false)
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ApiModelProperty(value = "主键ID")
@TableId(value = "id", type = IdType.ASSIGN_ID)
@Excel(name = "主键ID", sort = 1)
private String id;
/**
* 方格ID
*/
@ApiModelProperty(value = "方格ID")
@TableField(value = "fg_id")
@Excel(name = "方格ID", sort = 2, cellType = Excel.ColumnType.NUMERIC)
private Integer fgId;
/**
* 方格排序
*/
@ApiModelProperty(value = "方格排序")
@TableField(value = "fg_px")
@Excel(name = "方格排序", sort = 3, cellType = Excel.ColumnType.NUMERIC)
private Integer fgPx;
/**
* 方格预警等级 D_ZDXL_FGXLRW_YJDJ
*/
@ApiModelProperty(value = "方格预警等级 D_ZDXL_FGXLRW_YJDJ")
@TableField(value = "fg_yjdj")
@Excel(name = "方格预警等级", sort = 4)
private String fgYjdj;
/**
* 方格预警颜色 D_ZDXL_FGXLRW_YJYS
*/
@ApiModelProperty(value = "方格预警颜色 D_ZDXL_FGXLRW_YJYS")
@TableField(value = "fg_yjys")
@Excel(name = "方格预警颜色", sort = 5)
private String fgYjys;
/**
* 方格预警警情数量
*/
@ApiModelProperty(value = "方格预警警情数量")
@TableField(value = "fg_yjjqsl")
@Excel(name = "方格预警警情数量", sort = 6, cellType = Excel.ColumnType.NUMERIC)
private Integer fgYjjqsl;
/**
* 方格预警高发时段
*/
@ApiModelProperty(value = "方格预警高发时段")
@TableField(value = "fg_yjgfsd")
@Excel(name = "方格预警高发时段", sort = 7)
private String fgYjgfsd;
/**
* 方格预警高发警情
*/
@ApiModelProperty(value = "方格预警高发警情")
@TableField(value = "fg_gfjq")
@Excel(name = "方格预警高发警情", sort = 8)
private String fgGfjq;
/**
* 方格警情小时统计
*/
@ApiModelProperty(value = "方格警情小时统计")
@TableField(value = "fg_jqtj_xs")
@Excel(name = "方格警情小时统计", sort = 9)
private String fgJqtjXs;
/**
* 方格警情类型统计
*/
@ApiModelProperty(value = "方格警情类型统计")
@TableField(value = "fg_jqtj_lx")
@Excel(name = "方格警情类型统计", sort = 10)
private String fgJqtjLx;
/**
* 任务日期
*/
@ApiModelProperty(value = "任务日期")
@TableField(value = "rw_rq")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "任务日期", sort = 11, dateFormat = "yyyy-MM-dd")
private Date rwRq;
/**
* 任务状态 D_ZDXL_FGXLRW_RWZT
*/
@ApiModelProperty(value = "任务状态 D_ZDXL_FGXLRW_RWZT")
@TableField(value = "rw_zt")
@Excel(name = "任务状态", sort = 12)
private String rwZt;
/**
* 巡逻规划时长（分钟）
*/
@ApiModelProperty(value = "巡逻规划时长（分钟）")
@TableField(value = "xlgh_sc")
@Excel(name = "巡逻规划时长（分钟）", sort = 13, cellType = Excel.ColumnType.NUMERIC)
private Double xlghSc;
/**
* 巡逻规划开始时间
*/
@ApiModelProperty(value = "巡逻规划开始时间")
@TableField(value = "xlgh_sj_ks")
@JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "HH:mm:ss")
@Excel(name = "巡逻规划开始时间", sort = 14, dateFormat = "HH:mm:ss")
private Date xlghSjKs;
/**
* 巡逻规划结束时间
*/
@ApiModelProperty(value = "巡逻规划结束时间")
@TableField(value = "xlgh_sj_js")
@JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "HH:mm:ss")
@Excel(name = "巡逻规划开始时间", sort = 15, dateFormat = "HH:mm:ss")
private Date xlghSjJs;
/**
* 巡逻规划巡逻里程（公里）
*/
@ApiModelProperty(value = "巡逻规划巡逻里程（公里）")
@TableField(value = "xlgh_xllc")
@Excel(name = "巡逻规划巡逻里程（公里）", sort = 16, cellType = Excel.ColumnType.NUMERIC)
private Double xlghXllc;
/**
* 巡逻实际时长（分钟）
*/
@ApiModelProperty(value = "巡逻实际时长（分钟）")
@TableField(value = "xlsj_sc")
@Excel(name = "巡逻实际时长（分钟）", sort = 17, cellType = Excel.ColumnType.NUMERIC)
private Double xlsjSc;
/**
* 巡逻实际开始时间
*/
@ApiModelProperty(value = "巡逻实际开始时间")
@TableField(value = "xlsj_sj_ks")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "巡逻实际开始时间", sort = 18, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date xlsjSjKs;
/**
* 巡逻实际结束时间
*/
@ApiModelProperty(value = "巡逻实际结束时间")
@TableField(value = "xlsj_sj_js")
@Excel(name = "巡逻实际结束时间", sort = 19, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date xlsjSjJs;
/**
* 巡逻实际巡逻里程（公里）
*/
@ApiModelProperty(value = "巡逻实际巡逻里程（公里）")
@TableField(value = "xlsj_xllc")
@Excel(name = "巡逻实际巡逻里程（公里）", sort = 20, cellType = Excel.ColumnType.NUMERIC)
private Double xlsjXllc;
/**
* 主键ID字段名
*/
public static String ID_FIELD = "id";
/**
* 方格ID字段名
*/
public static String FG_ID_FIELD = "fg_id";
/**
* 方格排序字段名
*/
public static String FG_PX_FIELD = "fg_px";
/**
* 方格预警等级字段名
*/
public static String FG_YJDJ_FIELD = "fg_yjdj";
/**
* 方格预警颜色字段名
*/
public static String FG_YJYS_FIELD = "fg_yjys";
/**
* 方格预警警情数量字段名
*/
public static String FG_YJJQSL_FIELD = "fg_yjjqsl";
/**
* 方格预警高发时段字段名
*/
public static String FG_YJGFSD_FIELD = "fg_yjgfsd";
/**
* 方格预警高发警情字段名
*/
public static String FG_GFJQ_FIELD = "fg_gfjq";
/**
* 方格警情小时统计字段名
*/
public static String FG_JQTJ_XS_FIELD = "fg_jqtj_xs";
/**
* 方格警情类型统计字段名
*/
public static String FG_JQTJ_LX_FIELD = "fg_jqtj_lx";
/**
* 任务日期字段名
*/
public static String RW_RQ_FIELD = "rw_rq";
/**
* 任务状态字段名
*/
public static String RW_ZT_FIELD = "rw_zt";
/**
* 巡逻规划时长字段名
*/
public static String XLGH_SC_FIELD = "xlgh_sc";
/**
* 巡逻规划开始时间字段名
*/
public static String XLGH_SJ_KS_FIELD = "xlgh_sj_ks";
/**
* 巡逻规划结束时间字段名
*/
public static String XLGH_SJ_JS_FIELD = "xlgh_sj_js";
/**
* 巡逻规划巡逻里程字段名
*/
public static String XLGH_XLLC_FIELD = "xlgh_xllc";
/**
* 巡逻实际时长字段名
*/
public static String XLSJ_SC_FIELD = "xlsj_sc";
/**
* 巡逻实际开始时间字段名
*/
public static String XLSJ_SJ_KS_FIELD = "xlsj_sj_ks";
/**
* 巡逻实际结束时间字段名
*/
public static String XLSJ_SJ_JS_FIELD = "xlsj_sj_js";
/**
* 巡逻实际巡逻里程字段名
*/
public static String XLSJ_XLLC_FIELD = "xlsj_xllc";
}

43
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZdxlFgxlrwQuery.java Normal file
View File

@ -0,0 +1,43 @@
package com.mosty.base.model.query.yjzl;
import com.baomidou.mybatisplus.annotation.TableField;
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.util.Date;
/**
* @author zhangzhao
* @description 指导巡逻方格巡逻任务查询对象
* @modifier zhangzhao
* @modifiedTime 2025/05/12 22:06
* @since 2025/05/12 22:06
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "TbZdxlFgxlrwQuery对象", description = "指导巡逻方格巡逻任务查询对象")
public class TbZdxlFgxlrwQuery extends BasePage {
/**
* 方格ID
*/
@ApiModelProperty(value = "方格ID")
@TableField(value = "fg_id")
private Integer fgId;
/**
* 任务日期
*/
@ApiModelProperty(value = "任务日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date rwRq;
}

60
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZdxlFgdwVO.java Normal file
View File

@ -0,0 +1,60 @@
package com.mosty.base.model.vo.yjzl;
import com.baomidou.mybatisplus.annotation.TableField;
import com.mosty.base.model.entity.yjzl.zddw.TbZdxlFgdw;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
* @author zhangzhao
* @description 指导巡逻方格点位表返回对象
* @modifier zhangzhao
* @modifiedTime 2025/06/11 18:56
* @since 2025/06/11 18:56
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "TbZdxlFgxlrwVO对象", description = "指导巡逻方格点位表返回对象")
public class TbZdxlFgdwVO extends TbZdxlFgdw {
/**
* 名称
*/
@ApiModelProperty(value = "名称")
private String mc;
/**
* 网格坐标X1
*/
@ApiModelProperty(value = "网格坐标X1")
@TableField(value = "x1")
private BigDecimal x1;
/**
* 网格坐标Y1
*/
@ApiModelProperty(value = "网格坐标Y1")
@TableField(value = "y1")
private BigDecimal y1;
/**
* 网格坐标X2
*/
@ApiModelProperty(value = "网格坐标X2")
@TableField(value = "x2")
private BigDecimal x2;
/**
* 网格坐标Y2
*/
@ApiModelProperty(value = "网格坐标Y2")
@TableField(value = "y2")
private BigDecimal y2;
}

51
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZdxlFgxlrwJqflVO.java Normal file
View File

@ -0,0 +1,51 @@
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.util.List;
/**
* @author zhangzhao
* @description 指导巡逻方格巡逻任务警情分类返回对象
* @modifier zhangzhao
* @modifiedTime 2025/09/02 15:26
* @since 2025/09/02 15:26
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "TbZdxlFgxlrwJqflVO对象", description = "指导巡逻方格巡逻任务警情分类返回对象")
public class TbZdxlFgxlrwJqflVO {
/**
* 名称
*/
@ApiModelProperty(value = "名称")
private String name;
/**
* 代码
*/
@ApiModelProperty(value = "代码")
private String code;
/**
* 下级列表
*/
@ApiModelProperty(value = "下级列表")
private List<TbZdxlFgxlrwJqflVO> childList;
public TbZdxlFgxlrwJqflVO(){
}
public TbZdxlFgxlrwJqflVO(String name, String code){
this.name = name;
this.code = code;
}
}

34
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZdxlFgxlrwJqpzVO.java Normal file
View File

@ -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;
/**
* @author zhangzhao
* @description 指导巡逻方格巡逻任务警情配置返回对象
* @modifier zhangzhao
* @modifiedTime 2025/08/26 17:34
* @since 2025/08/26 17:34
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "TbZdxlFgxlrwJqpzVO对象", description = "指导巡逻方格巡逻任务警情配置返回对象")
public class TbZdxlFgxlrwJqpzVO {
/**
* 报警细类
*/
@ApiModelProperty(value = "报警细类")
private String bjxl;
/**
* 报警子类
*/
@ApiModelProperty(value = "报警子类")
private String bjzl;
}

67
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZdxlFgxlrwVO.java Normal file
View File

@ -0,0 +1,67 @@
package com.mosty.base.model.vo.yjzl;
import com.mosty.base.model.entity.yjzl.zddw.TbZdxlFgxlrw;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
* @author zhangzhao
* @description 指导巡逻方格巡逻任务返回对象
* @modifier zhangzhao
* @modifiedTime 2025/05/12 22:01
* @since 2025/05/12 22:01
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "TbZdxlFgxlrwVO对象", description = "指导巡逻方格巡逻任务返回对象")
public class TbZdxlFgxlrwVO extends TbZdxlFgxlrw {
/**
* 名称
*/
@ApiModelProperty(value = "名称")
private String mc;
/**
* 网格坐标X1
*/
@ApiModelProperty(value = "网格坐标X1")
private BigDecimal x1;
/**
* 网格坐标Y1
*/
@ApiModelProperty(value = "网格坐标Y1")
private BigDecimal y1;
/**
* 网格坐标X2
*/
@ApiModelProperty(value = "网格坐标X2")
private BigDecimal x2;
/**
* 网格坐标Y2
*/
@ApiModelProperty(value = "网格坐标Y2")
private BigDecimal y2;
/**
* 中心X
*/
@ApiModelProperty(value = "中心X")
private BigDecimal zxX;
/**
* 中心Y
*/
@ApiModelProperty(value = "中心Y")
private BigDecimal zxY;
}

10
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/Constant.java
View File

@ -115,6 +115,16 @@ public class Constant {
//设备
public static final String PGIS_SB = "PGIS_SB:";
/**
* 分隔符-下划线
*/
public static final String SEPARATOR_UNDERLINE = "_";
/**
* 分隔符-英语逗号
*/
public static final String SEPARATOR_ENGLISH_COMMA = ",";
/**
* 字典项-是否-是
*/

251
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/DictUtils.java Normal file
View File

@ -0,0 +1,251 @@
package com.mosty.base.utils;
import com.alibaba.fastjson.JSON;
import com.mosty.base.feign.service.MostyBaseFeignService;
import com.mosty.common.base.constant.Constants;
import com.mosty.common.base.domain.ResponseResult;
import com.mosty.common.base.entity.log.SpringUtils;
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.config.entity.vo.SysDictItemVO;
import com.mosty.common.config.entity.vo.SysDictVO;
import com.mosty.common.redis.service.RedisService;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.Objects;
/**
* @author zhangzhao
* @description 字典工具类
* @modifier zhangzhao
* @modifiedTime 2023/3/17 17:40
* @since 2023/3/17 17:40
*/
public class DictUtils {
/**
* 字典编号-人员标签
*/
public static final String DICT_ZDBH_D_BZ_RYBQ = "D_BZ_RYBQ";
/**
* 字典编号-车辆标签
*/
public static final String DICT_ZDBH_D_BZ_CLBQ = "D_BZ_CLBQ";
/**
* 公共FeignService
*/
private static MostyBaseFeignService mostyBaseFeignService;
/**
* 获取FeignService
* @return 返回FeignService
*/
private static MostyBaseFeignService getBaseFeignService(){
if(mostyBaseFeignService == null){
DictUtils.mostyBaseFeignService = SpringUtils.getBean(MostyBaseFeignService.class);
}
return DictUtils.mostyBaseFeignService;
}
/**
* 设置字典缓存
*
* @param key 参数键
* @param dictDatas 字典数据列表
*/
public static void setDictCache(String key, List<SysDictItem> dictDatas)
{
SpringUtils.getBean(RedisService.class).setCacheObject(getCacheKey(key), dictDatas);
}
/**
* 设置cache key
*
* @param configKey 参数键
* @return 缓存键key
*/
public static String getCacheKey(String configKey)
{
return Constants.SYS_DICT_KEY + configKey;
}
/**
* 获取字典信息
* @param zdbh 字典编号
* @return 字典信息
*/
public static SysDictVO getSysDict(String zdbh){
ResponseResult<SysDictVO> responseResult = DictUtils.getBaseFeignService().getSysDictByCode(zdbh);
if (responseResult == null || !responseResult.isSuccess()) {
System.out.println("获取查询条件异常 responseResult = " + JSON.toJSONString(responseResult));
throw new BusinessException("字典服务调用异常");
}
return responseResult.getData();
}
/**
* 获取字典项列表
* @param zdbh 字典编号
* @return 字典项列表
*/
public static List<SysDictItemVO> getDictItemList(String zdbh){
SysDictVO sysDictVO = DictUtils.getSysDict(zdbh);
if(sysDictVO == null || CollectionUtils.isEmpty(sysDictVO.getItemList())){
return null;
}
return sysDictVO.getItemList();
}
/**
* 判断该字典代码是否在字典项中
* @param zdbh 字典编号
* @param dm 字典代码
* @return 是否在该字典项中
*/
public static boolean isDictContainValue(String zdbh, String dm){
//如果字典编号和字典代码有一项为空，则返回错误
if(StringUtils.isBlank(zdbh) || StringUtils.isBlank(dm)){
return false;
}
List<SysDictItemVO> sysDictItemList = DictUtils.getDictItemList(zdbh);
//如果未查询到该字典，返回错误
if(sysDictItemList == null || sysDictItemList.isEmpty()){
return false;
}
//循环字典项数据，如果存在该数据，则返回正确
for(SysDictItemVO sysDictItemVO : sysDictItemList){
if (Objects.equals(dm, sysDictItemVO.getDm())) {
return true;
}
}
return false;
}
/**
* 判断该字典代码是否在字典项中(多个代码判断，有一个不正确就返回错误)
* @param zdbh 字典编号
* @param dm 字典代码
* @return 是否在该字典项中（有一个不在就返回错误）
*/
public static boolean isDictContainValues(String zdbh, String dm){
//如果字典编号和字典代码有一项为空，则返回错误
if(StringUtils.isBlank(zdbh) || StringUtils.isBlank(dm)){
return false;
}
List<SysDictItemVO> sysDictItemList = DictUtils.getDictItemList(zdbh);
//如果未查询到该字典，返回错误
if(sysDictItemList == null || sysDictItemList.isEmpty()){
return false;
}
String[] dmArray = dm.split(",");
for(String dmItem : dmArray){
//如果有字典代码为空，直接返回错误
if(StringUtils.isBlank(dmItem)){
return false;
}
//此代码是否在字典之中
boolean isThisDmInDict = false;
//循环字典项列表判断代码是否在字典项中
for(SysDictItemVO sysDictItemVO : sysDictItemList){
if(Objects.equals(dmItem, sysDictItemVO.getDm())){
isThisDmInDict = true;
}
}
//经过循环后，isDmInDict依然为false，表示代码不在字典项列表中，直接返回
if(!isThisDmInDict){
return false;
}
}
//经过所有循环后，到这一步，表示传入的代码都在字典中，所以返回正确
return true;
}
/**
* 查询具体字典
* @param zdbh 字典编号
* @param dm 字典代码
* @return 是否在该字典项中
*/
public static SysDictItemVO getDictZdbhAndDm(String zdbh, String dm){
//如果字典编号和字典代码有一项为空，则返回错误
if(StringUtils.isBlank(zdbh) || StringUtils.isBlank(dm)){
return null;
}
List<SysDictItemVO> sysDictItemList = DictUtils.getDictItemList(zdbh);
//如果未查询到该字典，返回错误
if(sysDictItemList == null || sysDictItemList.isEmpty()){
return null;
}
//循环字典项数据，如果存在该数据，则返回正确
for(SysDictItemVO sysDictItemVO : sysDictItemList){
if (Objects.equals(dm, sysDictItemVO.getDm())) {
return sysDictItemVO;
}
}
return null;
}
/**
* 查询字典名称
* @param zdbh 字典编号
* @param dm 字典代码
* @return 字典名称
*/
public static String getDictZdmcByZdbhAndDm(String zdbh, String dm){
String zdmc = "";
SysDictItemVO sysDictItemVO = DictUtils.getDictZdbhAndDm(zdbh, dm);
if(ObjectUtils.isNotEmpty(sysDictItemVO)){
zdmc = sysDictItemVO.getZdmc();
}
return zdmc;
}
/**
* 查询字典名称（多个字典代码）
* @param zdbh 字典编号
* @param dms 字典代码（多个）
* @return 字典名称
*/
public static String getDictZdmcsByZdbhAndDms(String zdbh, String dms){
if(StringUtils.isBlank(zdbh) || StringUtils.isBlank(dms)){
return null;
}
StringBuilder zdmc = new StringBuilder();
String[] dmArray = dms.split(Constant.SEPARATOR_ENGLISH_COMMA);
for(String dm : dmArray){
SysDictItemVO sysDictItemVO = DictUtils.getDictZdbhAndDm(zdbh, dm);
if(ObjectUtils.isNotEmpty(sysDictItemVO)){
zdmc.append(sysDictItemVO.getZdmc());
zdmc.append(Constant.SEPARATOR_ENGLISH_COMMA);
}
}
if(zdmc.length() > 0 ){
zdmc.deleteCharAt(zdmc.length() - 1);
return zdmc.toString();
}
return null;
}
}

243
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/MessageUtils.java Normal file
View File

@ -0,0 +1,243 @@
package com.mosty.base.utils;
import com.mosty.common.base.entity.log.SpringUtils;
import org.springframework.context.MessageSource;
import org.springframework.context.i18n.LocaleContextHolder;
/**
* 获取i18n资源文件
*
* @author Ruoyi
*/
public class MessageUtils
{
/**
* 根据消息键和参数 获取消息 委托给spring messageSource
*
* @param code 消息键
* @param args 参数
* @return 获取国际化翻译值
*/
public static String message(String code, Object... args)
{
MessageSource messageSource = SpringUtils.getBean(MessageSource.class);
return messageSource.getMessage(code, args, LocaleContextHolder.getLocale());
}
/**
* 获取查询失败消息
* @return 查询失败消息（“查询失败！”）
*/
public static String getQueryFailMsg(){
return MessageUtils.message("query.fail");
}
/**
* 获取查询服务异常消息
* @return 获取查询服务异常消息（“查询失败！服务异常”）
*/
public static String getQueryServerErrorMsg(){
return MessageUtils.message("query.fail") + MessageUtils.message("server.error");
}
/**
* 获取保存失败消息
* @return 保存失败消息（“保存失败！”）
*/
public static String getSaveFailMsg(){
return MessageUtils.message("save.fail");
}
/**
* 获取保存服务异常消息
* @return 获取保存服务异常消息（“保存失败！服务异常”）
*/
public static String getSaveServerErrorMsg(){
return MessageUtils.message("save.fail") + MessageUtils.message("server.error");
}
/**
* 获取复制失败消息
* @return 复制失败消息（“复制失败！”）
*/
public static String getCopyFailMsg(){
return MessageUtils.message("copy.fail");
}
/**
* 获取复制服务异常消息
* @return 获取复制服务异常消息（“复制失败！服务异常”）
*/
public static String getCopyServerErrorMsg(){
return MessageUtils.message("copy.fail") + MessageUtils.message("server.error");
}
/**
* 获取修改数据查询为空消息
* @return 获取修改数据查询为空消息（“修改失败！数据不存在或已被注销”）
*/
public static String getEditDataNotFoundMsg(){
return MessageUtils.getEditFailMsg() + MessageUtils.message("data.bcz");
}
/**
* 获取修改失败消息
* @return 修改失败消息（“修改失败！”）
*/
public static String getEditFailMsg(){
return MessageUtils.message("edit.fail");
}
/**
* 获取修改服务异常消息
* @return 获取修改服务异常消息（“修改失败！服务异常”）
*/
public static String getEditServerErrorMsg(){
return MessageUtils.message("edit.fail") + MessageUtils.message("server.error");
}
/**
* 获取注销失败消息
* @return 注销失败消息（“注销失败！”）
*/
public static String getCancelFailMsg(){
return MessageUtils.message("cancel.fail");
}
/**
* 获取注销服务异常消息
* @return 获取注销服务异常消息（“注销失败！服务异常”）
*/
public static String getCancelServerErrorMsg(){
return MessageUtils.message("cancel.fail") + MessageUtils.message("server.error");
}
/**
* 获取注销服务异常消息（由于主键ID为空）
* @return 获取注销服务异常消息（“注销失败！【主键ID】不能为空”）
*/
public static String getCancelBecauseIdBnwk(){
return MessageUtils.message("cancel.fail") + MessageUtils.message("id.bnwk");
}
/**
* 获取审核失败消息
* @return 审核失败消息（“审核失败！”）
*/
public static String getAuditsFailMsg(){
return MessageUtils.message("audits.fail");
}
/**
* 获取审核服务异常消息
* @return 获取审核服务异常消息（“审核失败！服务异常”）
*/
public static String getAuditsServerErrorMsg(){
return MessageUtils.message("audits.fail") + MessageUtils.message("server.error");
}
/**
* 获取审核数据查询为空消息
* @return 获取修改数据查询为空消息（“审核失败！数据不存在或已被注销”）
*/
public static String getAuditsDataNotFoundMsg(){
return MessageUtils.getAuditsFailMsg() + MessageUtils.message("data.bcz");
}
/**
* 获取送审失败消息
* @return 注销失败消息（“送审失败！”）
*/
public static String getSubExamineFailMsg(){
return MessageUtils.message("sub.examine.fail");
}
/**
* 获取送审服务异常消息
* @return 获取审核服务异常消息（“送审失败！服务异常”）
*/
public static String getSubExamineServerErrorMsg(){
return MessageUtils.message("sub.examine.fail") + MessageUtils.message("server.error");
}
/**
* 获取送审数据查询为空消息
* @return 获取修改数据查询为空消息（“送审失败！数据不存在或已被注销”）
*/
public static String getSubExamineDataNotFoundMsg(){
return MessageUtils.getSubExamineFailMsg() + MessageUtils.message("data.bcz");
}
/**
* 获取审核失败消息
* @return 注销失败消息（“审核失败！”）
*/
public static String getToExamineFailMsg(){
return MessageUtils.message("to.examine.fail");
}
/**
* 获取审核服务异常消息
* @return 获取审核服务异常消息（“审核失败！服务异常”）
*/
public static String getToExamineServerErrorMsg(){
return MessageUtils.message("to.examine.fail") + MessageUtils.message("server.error");
}
/**
* 获取审核数据查询为空消息
* @return 获取修改数据查询为空消息（“审核失败！数据不存在或已被注销”）
*/
public static String getToExamineDataNotFoundMsg(){
return MessageUtils.getToExamineFailMsg() + MessageUtils.message("data.bcz");
}
/**
* 获取导出失败消息
* @return 注销失败消息（“导出失败！”）
*/
public static String getExportFailMsg(){
return MessageUtils.message("export.fail");
}
/**
* 获取导出服务异常消息
* @return 获取导出服务异常消息（“导出失败！服务异常”）
*/
public static String getExportServerErrorMsg(){
return MessageUtils.message("export.fail") + MessageUtils.message("server.error");
}
/**
* 获取导出数据查询为空消息
* @return 获取修改数据查询为空消息（“导出失败！数据不存在或已被注销”）
*/
public static String getExportDataNotFoundMsg(){
return MessageUtils.getExportFailMsg() + MessageUtils.message("data.bcz");
}
/**
* 获取导入失败消息
* @return 注销失败消息（“导入失败！”）
*/
public static String getImportFailMsg(){
return MessageUtils.message("import.fail");
}
/**
* 获取导入服务异常消息
* @return 获取导出服务异常消息（“导入失败！服务异常”）
*/
public static String getImportServerErrorMsg(){
return MessageUtils.message("import.fail") + MessageUtils.message("server.error");
}
/**
* 获取导入数据查询为空消息
* @return 获取修改数据查询为空消息（“导入失败！数据不存在或已被注销”）
*/
public static String getImportDataNotFoundMsg(){
return MessageUtils.getImportFailMsg() + MessageUtils.message("data.bcz");
}
}

77
feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/spring/SpringValidUtils.java
View File

@ -1,5 +1,7 @@
package com.mosty.base.utils.spring;
import com.mosty.base.utils.MessageUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.validation.BindingResult;
import org.springframework.validation.ObjectError;
@ -10,6 +12,16 @@ import java.util.List;
*/
public class SpringValidUtils {
/**
* 主键ID长度最大值
*/
private static final Integer ID_MAX_LENGTH = 32;
/**
* 备注长度最大值
*/
private static final Integer MARK_MAX_LENGTH = 500;
/**
* 获取错误信息
* @param bindingResult spring校验对象
@ -44,4 +56,69 @@ public class SpringValidUtils {
return null;
}
/**
* 校验注销信息
* @param id 主键ID
* @param xtZxyy 注销原因
* @return 错误信息
*/
public static String getCancelMsg(String id, String xtZxyy){
//错误信息
StringBuilder esbd = new StringBuilder();
if(StringUtils.isBlank(id)){
esbd.append(MessageUtils.message("id.bnwk"));
esbd.append("，");
}else if(id.length() > ID_MAX_LENGTH){
esbd.append(MessageUtils.message("id.size"));
esbd.append("，");
}
if(StringUtils.isBlank(xtZxyy)){
esbd.append(MessageUtils.message("xt.zxyy.bnwk"));
esbd.append("，");
}else if(xtZxyy.length() > MARK_MAX_LENGTH){
esbd.append(MessageUtils.message("xt.zxyy.size"));
esbd.append("，");
}
if(esbd.length() > 0) {
esbd.deleteCharAt(esbd.length() - 1);
return esbd.toString();
}
return null;
}
/**
* 注解长度校验
* @param isNotBlank 是否不能为空
* @param max 最大值
* @param min 最小值
* @param value 需要校验的字符串
* @return 是否校验通过
*/
public static boolean annotationSizeValidation(boolean isNotBlank, int max, int min, String value){
//校验是否为空
if(StringUtils.isBlank(value)){
//如果需要校验的值为空，并且该项为必填项，则返回错误
if(isNotBlank){
return false;
}
}
//校验是否大于最大值
if(!StringUtils.isBlank(value) && max != Integer.MAX_VALUE) {
if(value.length() > max){
return false;
}
}
//校验是否小于最小值
if(!StringUtils.isBlank(value) && min != Integer.MIN_VALUE){
return value.length() > min;
}
return true;
}
}

164
feign-client-api/mosty-base-feign-sdk/src/main/resources/i18n/messages.properties Normal file
View File

@ -0,0 +1,164 @@
#错误消息
not.null=* 必须填写
user.jcaptcha.error=验证码错误
user.jcaptcha.expire=验证码已失效
user.not.exists=用户不存在/密码错误
user.password.not.match=用户不存在/密码错误
user.password.retry.limit.count=密码输入错误{0}次
user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定10分钟
user.password.delete=对不起，您的账号已被删除
user.blocked=用户已封禁，请联系管理员
role.blocked=角色已封禁，请联系管理员
user.logout.success=退出成功
length.not.valid=长度必须在{min}到{max}个字符之间
user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
user.password.not.valid=* 5-50个字符
user.email.not.valid=邮箱格式错误
user.mobile.phone.number.not.valid=手机号格式错误
user.login.success=登录成功
user.login.fail=登录失败！
user.register.success=注册成功
user.notfound=请重新登录
user.forcelogout=管理员强制退出，请重新登录
user.unknown.error=未知错误，请重新登录
##文件上传消息
upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！
upload.filename.exceed.length=上传的文件名最长{0}个字符
##权限
no.permission=您没有数据的权限，请联系管理员添加权限 [{0}]
no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}]
no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}]
no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]
##业务功能提示信息
login.user.not.found=当前登陆人信息未找到
query.fail=查询失败！
save.fail=保存失败！
edit.fail=修改失败！
cancel.fail=注销失败！
cancel.zxyy.plzx=批量注销
cancel.zxyy.gsxx=跟随高速信息注销
cancel.zxyy.glid=跟随关联信息注销
audits.fail=审核失败！
sub.examine.fail=送审失败！
to.examine.fail=审核失败！
export.fail=导出失败！
import.fail=导入失败！
startup.fail=启动失败！
startup.success=启动成功！
shutoff.fail=关闭失败！
shutoff.success=关闭成功！
comparison.fail=比对失败！
feedback.fail=反馈失败！
receive.success=接收成功！
receive.fail=接收失败！
server.error=服务异常
data.bcz=数据不存在或已被注销
id.bnwk=【主键ID】不能为空
id.size=【主键ID】不能超过32个字符
xt.zxyy.bnwk=【注销原因】不能为空
xt.zxyy.size=【注销原因】不能超过100个字符
bz.size=【备注】不能超过500个字符
#通用提示信息
param.not.standard=参数不规范
dict.not.standard=字典不规范
phone.bnwk=【手机号码】不能为空
phone.size=【手机号码】不能超过11个字符
xm.bnwk=【姓名】不能为空
xm.size=【姓名】不能超过20个字符
sfzh.bnwk=【身份证号】不能为空
sfzh.size=【身份证号】不能超过18个字符
cjsj.bnwk=【采集时间】不能为空
cjdd.bnwk=【采集地点名称】不能为空
cjdd.size=【采集地点名称】不能超过200个字符
jd.bnwk=【地球经度】不能为空
jd.digits=【地球经度】整数位不能超过3位，小数位不能超过18位
jd.min=【地球经度】最小值为-180.00
jd.max=【地球经度】最大值为180.00
jd.size=【地球经度】不能超过30个字符
wd.bnwk=【地球纬度】不能为空
wd.digits=【地球纬度】整数位不能超过3位，小数位不能超过18位
wd.min=【地球纬度】最小值为-90.00
wd.max=【地球纬度】最大值为90.00
wd.size=【地球纬度】不能超过30个字符
sbmc.bnwk=【采集设备名称】不能为空
sbmc.size=【采集设备名称】不能超过50位
sbbh.bnwk=【采集设备编号】不能为空
sbbh.size=【采集设备编号】不能超过50位
hpzl.bgf=【号牌种类】不规范
hphm.bnwk=【号牌号码】不能为空
hphm.size=【号牌号码】不能超过15个字符
ryBqDm.bgf=【人员标签代码】不规范或超长
ryBqMc.size=【人员标签名称】不能超过100个字符
ryBqLy.size=【人员标签来源】不能超过100个字符
clBqDm.bgf=【车辆标签代码】不规范或超长
clBqMc.size=【车辆标签名称】不能超过100个字符
clBqLy.size=【车辆标签来源】不能超过100个字符
#业务提示信息
imsi.bnwk=【imsi】不能为空
imsi.size=【imsi】不能超过15个字符
syrXm.bnwk=【使用人姓名】不能为空
syrXm.size=【使用人姓名】不能超过20位
syrSfzh.bnwk=【使用人身份证号】不能为空
syrSfzh.size=【使用人身份证号】不能超过18位
syrSsbmmc.bnwk=【使用人所在部门名称】不能为空
syrSsbmmc.size=【使用人所在部门名称】不能超过100位
syrSsbmdm.bnwk=【使用人所在部门代码】不能为空
syrSsbmdm.size=【使用人所在部门代码】不能超过12位
sbglbmmc.bnwk=【设备管理部门名称】不能为空
sbglbmmc.size=【设备管理部门名称】不能超过100位
sbglbmdm.bnwk=【设备管理部门代码】不能为空
sbglbmdm.size=【设备管理部门代码】不能超过12位
sbsybmmc.bnwk=【设备使用部门名称】不能为空
sbsybmmc.size=【设备使用部门名称】不能超过100位
sbsybmdm.bnwk=【设备使用部门代码】不能为空
sbsybmdm.size=【设备使用部门代码】不能超过12位
czclList.bnwk=【乘坐车辆列表】不能为空
imsi.cl.knx.bnwk=【乘坐车辆可能性】不能为空
imsi.cl.knx.digits=【乘坐车辆可能性】整数位不能超过3位，小数位不能超过18位
imsi.cl.knx.min=【乘坐车辆可能性】最小值为00.00
imsi.cl.knx.max=【乘坐车辆可能性】最大值为99.99
imsi.cj.jx.blank=imsi采集信息解析为空
imsi.sjhm.not.found.people=根据手机号码未找到人员，手机号码：
scgadsj.userId.bnwk=用户的公民身份号码不能为空
scgadsj.userName.bnwk=用户的公民姓名不能为空
scgadsj.organization.bnwk=用户所属单位的公安机关机构名称不能为空
scgadsj.organizationId.bnwk=用户所属单位的公安机关机构代码不能为空
scgadsj.terminalPhone.bnwk=移动警务终端对应手机号码不能为空
scgadsj.terminalIMEI.bnwk=移动警务终端对应手机串号不能为空
scgadsj.terminalLongitude.bnwk=移动警务终端对应经度不能为空
scgadsj.terminalLatitude.bnwk=移动警务终端对应纬度不能为空
scgadsj.sfzh.bnwk=身份证号不能为空
scgadsj.mac.bnwk=mac地址不能为空
scgadsj.hphm.bnwk=号牌号码不能为空
scgadsj.hpzl.bnwk=号牌种类不能为空
ssbm.queryNull=未查询到此部门
ssbmdm.notBlank=【所属部门代码】不能为空
ssbmdm.size=【所属部门代码】不能超过32位
#指导巡逻-方格巡逻任务
zdxl.fgxlrw.jqpz.bjxl.notBlank=【报警细类】不能为空
zdxl.fgxlrw.jqpz.bjxl.size=【报警细类】不能超过1000位
zdxl.fgxlrw.jqpz.bjxlSm.size=【报警细类说明】不能超过200位
zdxl.fgxlrw.jqpz.bjzl.notBlank=【报警子类】不能为空
zdxl.fgxlrw.jqpz.bjzl.size=【报警子类】不能超过1000位
zdxl.fgxlrw.jqpz.bjzlSm.size=【报警子类说明】不能超过200位
zdxl.fgxlrw.rwRq.notNull=【任务日期】不能为空
zdxl.fgxlrw.rwRq.fgYjdj.isDict=【方格预警等级】不规范
zdxl.fgxlrw.rwRq.fgYjys.isDict=【方格预警颜色】不规范
zdxl.fgxlrw.rwRq.xlghSc.notNull=【巡逻规划时长】不能为空
zdxl.fgxlrw.rwRq.xlghSjKs.notNull=【巡逻规划开始时间】不能为空
zdxl.fgxlrw.rwRq.xlghSjJs.notNull=【巡逻规划结束时间】不能为空
zdxl.fgxlrw.rwRq.xlghXllc.notNull=【巡逻规划巡逻里程】不能为空
zdxl.fgxlrw.rwRq.export.queryNull=当日没有生成任务，请生成后再下载

4
mosty-base/mosty-base.iml
View File

@ -17,10 +17,10 @@
<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="1747276765359" />
<entry key="lastExternalPluginCheckTime" value="1757036647255" />
</map>
</option>
<option name="version" value="13" />
<option name="version" value="15" />
</configuration>
</facet>
</component>

38
mosty-base/src/main/resources/application.yml
View File

@ -1,6 +1,7 @@
ribbon:
ReadTimeout: 600000
ConnectTimeout: 600000
spring:
main:
allow-bean-definition-overriding: true
@ -12,7 +13,7 @@ spring:
jackson:
serialization:
write-dates-as-timestamps: false
# # 格式化返回时间 yyyy-MM-dd HH:mm:ss
# 格式化返回时间 yyyy-MM-dd HH:mm:ss
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
datasource:
@ -22,11 +23,11 @@ spring:
strict: false
datasource:
base:
url: jdbc:mysql://172.20.19.130:33306/mosty_base?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://192.168.1.129:33306/mosty_base?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: mostyDB1
password: mostyDBMysql1
jcgl:
url: jdbc:mysql://172.20.19.130:33306/mosty_jcgl?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://192.168.1.129:33306/mosty_jcgl?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: mostyDB1
password: mostyDBMysql1
hikari:
@ -36,29 +37,11 @@ spring:
max-lifetime: 540000 # ????????????0???30??????????30??.?????mysql????????
connection-timeout: 60000 # ????????????250????????????30?
connection-test-query: SELECT 1 # ???????????????
# 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
# Redis数据库索引（默认为0）
# redis:
# database: 8
# # Redis服务器地址
# host: 192.168.200.131
# # Redis服务器连接端口
# port: 6379
# # Redis服务器连接密码（默认为空）
# password: mosty888
# # 连接超时时间（毫秒）
# timeout: 2000
# jedis:
# pool:
# max-active: 50
redis:
database: 1
# Redis服务器地址
host: 172.20.19.130
host: 192.168.1.129
# Redis服务器连接端口
port: 63799
# Redis服务器连接密码（默认为空）
@ -69,7 +52,6 @@ spring:
pool:
max-active: 50
#mybatis:
# mapper-locations: classpath:mapper/*.xml
@ -82,12 +64,8 @@ mybatis-plus:
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
endpoint: http://172.20.19.130:29002
downloadEndpoint: http://172.20.19.130:29002
endpoint: http://192.168.1.129:29002
downloadEndpoint: http://192.168.1.129:29002
accessKey: minioRoot
secretKey: minio1994Inferno
@ -103,7 +81,7 @@ magic-api:
web: /magic/web
#配置文件存储位置。当以classpath开头时，为只读模式
resource:
# location: /data/magic-api
# location: /data/magic-api
type: database
table-name: magic_api_file_v2 # 数据库中的表名
prefix: /magic-api # 前缀

8
mosty-base/src/main/resources/bootstrap.yml
View File

@ -2,22 +2,19 @@ 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
namespace: f23c13d4-0935-42e0-850e-a2216125f2ae
server-addr: 172.20.19.130:18848
server-addr: 192.168.1.129:18848
username: nacosDev1
password: nacosDev1
# 开启健康监控
management:
endpoints:
@ -41,4 +38,3 @@ management:
# 日志
#logging:
# file: /application/applogs/admin.log

4
mosty-bkzx/mosty-bkzx.iml
View File

@ -17,10 +17,10 @@
<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="1747276765357" />
<entry key="lastExternalPluginCheckTime" value="1757036647255" />
</map>
</option>
<option name="version" value="13" />
<option name="version" value="15" />
</configuration>
</facet>
</component>

20
mosty-bkzx/src/main/resources/application.yml
View File

@ -1,6 +1,7 @@
ribbon:
ReadTimeout: 600000
ConnectTimeout: 600000
spring:
servlet:
multipart:
@ -9,14 +10,14 @@ spring:
jackson:
serialization:
write-dates-as-timestamps: false
# # 格式化返回时间 yyyy-MM-dd HH:mm:ss
# 格式化返回时间 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
url: jdbc:mysql://192.168.1.129:33306/mosty_bkzx?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
username: mostyDB1
password: mostyDBMysql1
hikari:
minimum-idle: 10 # ??????????10???0???maximum-pool-size??????maximum-pool-size
maximum-pool-size: 20 # ??????????0????????10??????1?????minimum-idle??
@ -26,13 +27,13 @@ spring:
connection-test-query: SELECT 1 # ???????????????
# Redis数据库索引（默认为0）
redis:
database: 8
database: 1
# Redis服务器地址
host: 192.168.200.131
host: 192.168.1.129
# Redis服务器连接端口
port: 6379
port: 63799
# Redis服务器连接密码（默认为空）
password: mosty888
password: redis1994Inferno
# 连接超时时间（毫秒）
timeout: 2000
jedis:
@ -55,13 +56,14 @@ magic-api:
web: /magic/web
#配置文件存储位置。当以classpath开头时，为只读模式
resource:
# location: /data/magic-api
# location: /data/magic-api
type: database
table-name: magic_api # 数据库中的表名
prefix: /magic-api # 前缀
datasource:
response-code:
success: 10000
exclude:
pathPatterns:
swagger:

11
mosty-bkzx/src/main/resources/bootstrap.yml
View File

@ -2,16 +2,18 @@ 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 # 是否将自己注册到配置中心，让其他服务发现调用（本地调试使用）
register-enabled: true
namespace: f23c13d4-0935-42e0-850e-a2216125f2ae
server-addr: 192.168.1.129:18848
username: nacosDev1
password: nacosDev1
# 开启健康监控
management:
@ -36,4 +38,3 @@ management:
# 日志
#logging:
# file: /application/applogs/admin.log

4
mosty-gateway/mosty-gateway.iml
View File

@ -12,10 +12,10 @@
<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="1747276765359" />
<entry key="lastExternalPluginCheckTime" value="1757036647255" />
</map>
</option>
<option name="version" value="13" />
<option name="version" value="15" />
</configuration>
</facet>
</component>

1
mosty-gateway/src/main/resources/application.yml
View File

@ -1,5 +1,6 @@
ribbon:
ReadTimeout: 600000
ConnectTimeout: 600000
servlet:
context-path: mosty-api

10
mosty-gateway/src/main/resources/bootstrap.yml
View File

@ -5,20 +5,15 @@ spring:
application:
name: mosty-gateway
redis:
# host: 192.168.200.131
# port: 6379
# password: mosty888
host: 172.20.19.130
host: 192.168.1.129
port: 63799
password: redis1994Inferno
cloud:
nacos:
discovery:
# namespace: 657d1843-b590-41ac-b5e7-5d261bf00de9
# server-addr: 192.168.200.131:8848
register-enabled: true
namespace: f23c13d4-0935-42e0-850e-a2216125f2ae
server-addr: 172.20.19.130:18848
server-addr: 192.168.1.129:18848
username: nacosDev1
password: nacosDev1
gateway:
@ -145,4 +140,3 @@ management:
# 日志
#logging:
# file: /application/applogs/admin.log

4
mosty-hczx/mosty-hczx.iml
View File

@ -17,10 +17,10 @@
<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="1747276765357" />
<entry key="lastExternalPluginCheckTime" value="1757036647255" />
</map>
</option>
<option name="version" value="13" />
<option name="version" value="15" />
</configuration>
</facet>
</component>

26
mosty-hczx/src/main/resources/application.yml
View File

@ -1,6 +1,7 @@
ribbon:
ReadTimeout: 600000
ConnectTimeout: 600000
spring:
servlet:
multipart:
@ -9,15 +10,12 @@ spring:
jackson:
serialization:
write-dates-as-timestamps: false
# # 格式化返回时间 yyyy-MM-dd HH:mm:ss
# 格式化返回时间 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
url: jdbc:mysql://172.20.19.130:33306/mosty_hczx?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://192.168.1.129:33306/mosty_hczx?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
username: mostyDB1
password: mostyDBMysql1
hikari:
@ -28,23 +26,10 @@ spring:
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
redis:
database: 1
# Redis服务器地址
host: 172.20.19.130
host: 192.168.1.129
# Redis服务器连接端口
port: 63799
# Redis服务器连接密码（默认为空）
@ -71,13 +56,14 @@ magic-api:
web: /magic/web
#配置文件存储位置。当以classpath开头时，为只读模式
resource:
# location: /data/magic-api
# location: /data/magic-api
type: database
table-name: magic_api # 数据库中的表名
prefix: /magic-api # 前缀
datasource:
response-code:
success: 10000
exclude:
pathPatterns:
swagger:

10
mosty-hczx/src/main/resources/bootstrap.yml
View File

@ -2,22 +2,19 @@ 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
register-enabled: true # 是否将自己注册到配置中心，让其他服务发现调用（本地调试使用）
register-enabled: true
namespace: f23c13d4-0935-42e0-850e-a2216125f2ae
server-addr: 172.20.19.130:18848
server-addr: 192.168.1.129:18848
username: nacosDev1
password: nacosDev1
# 开启健康监控
management:
endpoints:
@ -41,4 +38,3 @@ management:
# 日志
#logging:
# file: /application/applogs/admin.log

4
mosty-jcgl/mosty-jcgl.iml
View File

@ -17,10 +17,10 @@
<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="1747276765359" />
<entry key="lastExternalPluginCheckTime" value="1757036647255" />
</map>
</option>
<option name="version" value="13" />
<option name="version" value="15" />
</configuration>
</facet>
</component>

25
mosty-jcgl/src/main/resources/application.yml
View File

@ -10,15 +10,12 @@ spring:
jackson:
serialization:
write-dates-as-timestamps: false
# # 格式化返回时间 yyyy-MM-dd HH:mm:ss
# 格式化返回时间 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
url: jdbc:mysql://172.20.19.130:33306/mosty_jcgl?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://192.168.1.129:33306/mosty_jcgl?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: mostyDB1
password: mostyDBMysql1
hikari:
@ -29,23 +26,10 @@ spring:
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
redis:
database: 1
# Redis服务器地址
host: 172.20.19.130
host: 192.168.1.129
# Redis服务器连接端口
port: 63799
# Redis服务器连接密码（默认为空）
@ -72,13 +56,14 @@ magic-api:
web: /magic/web
#配置文件存储位置。当以classpath开头时，为只读模式
resource:
# location: /data/magic-api
# location: /data/magic-api
type: database
table-name: magic_api # 数据库中的表名
prefix: /magic-api # 前缀
datasource:
response-code:
success: 10000
exclude:
pathPatterns:
swagger:

7
mosty-jcgl/src/main/resources/bootstrap.yml
View File

@ -2,21 +2,19 @@ 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
namespace: f23c13d4-0935-42e0-850e-a2216125f2ae
server-addr: 172.20.19.130:18848
server-addr: 192.168.1.129:18848
username: nacosDev1
password: nacosDev1
# 开启健康监控
management:
endpoints:
@ -40,4 +38,3 @@ management:
# 日志
#logging:
# file: /application/applogs/admin.log

17
mosty-other/src/main/resources/application.yml
View File

@ -1,6 +1,7 @@
ribbon:
ReadTimeout: 600000
ConnectTimeout: 600000
spring:
servlet:
multipart:
@ -9,7 +10,7 @@ spring:
jackson:
serialization:
write-dates-as-timestamps: false
# # 格式化返回时间 yyyy-MM-dd HH:mm:ss
# 格式化返回时间 yyyy-MM-dd HH:mm:ss
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
datasource:
@ -23,17 +24,20 @@ spring:
username: qcck_test
password: 12345678abc
driver-class-name: org.postgresql.Driver
# Redis数据库索引（默认为0）
redis:
database: 8
database: 1
# Redis服务器地址
host: 192.168.200.131
host: 192.168.1.129
# Redis服务器连接端口
port: 6379
port: 63799
# Redis服务器连接密码（默认为空）
password: mosty888
password: redis1994Inferno
# 连接超时时间（毫秒）
timeout: 2000
jedis:
pool:
max-active: 50
swagger:
host: 80.93.7.13
@ -42,6 +46,7 @@ swagger:
mybatis-plus:
configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
exclude:
pathPatterns:
swagger:

10
mosty-other/src/main/resources/bootstrap.yml
View File

@ -2,15 +2,19 @@ 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 # 是否将自己注册到配置中心，让其他服务发现调用（本地调试使用）
register-enabled: true
namespace: f23c13d4-0935-42e0-850e-a2216125f2ae
server-addr: 192.168.1.129:18848
username: nacosDev1
password: nacosDev1
# 开启健康监控
management:
endpoints:

4
mosty-qwzx/mosty-qwzx.iml
View File

@ -17,10 +17,10 @@
<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="1747276765357" />
<entry key="lastExternalPluginCheckTime" value="1757036647255" />
</map>
</option>
<option name="version" value="13" />
<option name="version" value="15" />
</configuration>
</facet>
</component>

26
mosty-qwzx/src/main/resources/application.yml
View File

@ -1,6 +1,7 @@
ribbon:
ReadTimeout: 600000
ConnectTimeout: 600000
spring:
servlet:
multipart:
@ -9,15 +10,12 @@ spring:
jackson:
serialization:
write-dates-as-timestamps: false
# # 格式化返回时间 yyyy-MM-dd HH:mm:ss
# 格式化返回时间 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
url: jdbc:mysql://172.20.19.130:33306/mosty_qwgl?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://192.168.1.129:33306/mosty_qwgl?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: mostyDB1
password: mostyDBMysql1
hikari:
@ -28,23 +26,10 @@ spring:
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
redis:
database: 1
# Redis服务器地址
host: 172.20.19.130
host: 192.168.1.129
# Redis服务器连接端口
port: 63799
# Redis服务器连接密码（默认为空）
@ -71,13 +56,14 @@ magic-api:
web: /magic/web
#配置文件存储位置。当以classpath开头时，为只读模式
resource:
# location: /data/magic-api
# location: /data/magic-api
type: database
table-name: magic_api # 数据库中的表名
prefix: /magic-api # 前缀
datasource:
response-code:
success: 10000
exclude:
pathPatterns:
swagger:

9
mosty-qwzx/src/main/resources/bootstrap.yml
View File

@ -2,21 +2,19 @@ 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 # 是否将自己注册到配置中心，让其他服务发现调用（本地调试使用）
register-enabled: true
namespace: f23c13d4-0935-42e0-850e-a2216125f2ae
server-addr: 172.20.19.130:18848
server-addr: 192.168.1.129:18848
username: nacosDev1
password: nacosDev1
# 开启健康监控
management:
endpoints:
@ -40,4 +38,3 @@ management:
# 日志
#logging:
# file: /application/applogs/admin.log

4
mosty-rwzx/mosty-rwzx.iml
View File

@ -17,10 +17,10 @@
<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="1747276765359" />
<entry key="lastExternalPluginCheckTime" value="1757036647255" />
</map>
</option>
<option name="version" value="13" />
<option name="version" value="15" />
</configuration>
</facet>
</component>

26
mosty-rwzx/src/main/resources/application.yml
View File

@ -1,6 +1,7 @@
ribbon:
ReadTimeout: 600000
ConnectTimeout: 600000
spring:
servlet:
multipart:
@ -9,15 +10,12 @@ spring:
jackson:
serialization:
write-dates-as-timestamps: false
# # 格式化返回时间 yyyy-MM-dd HH:mm:ss
# 格式化返回时间 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
url: jdbc:mysql://172.20.19.130:33306/mosty_rwzx?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://192.168.1.129:33306/mosty_rwzx?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
username: mostyDB1
password: mostyDBMysql1
hikari:
@ -28,23 +26,10 @@ spring:
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
redis:
database: 1
# Redis服务器地址
host: 172.20.19.130
host: 192.168.1.129
# Redis服务器连接端口
port: 63799
# Redis服务器连接密码（默认为空）
@ -71,13 +56,14 @@ magic-api:
web: /magic/web
#配置文件存储位置。当以classpath开头时，为只读模式
resource:
# location: /data/magic-api
# location: /data/magic-api
type: database
table-name: magic_api # 数据库中的表名
prefix: /magic-api # 前缀
datasource:
response-code:
success: 10000
exclude:
pathPatterns:
swagger:

9
mosty-rwzx/src/main/resources/bootstrap.yml
View File

@ -2,21 +2,19 @@ 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 # 是否将自己注册到配置中心，让其他服务发现调用（本地调试使用）
register-enabled: true
namespace: f23c13d4-0935-42e0-850e-a2216125f2ae
server-addr: 172.20.19.130:18848
server-addr: 192.168.1.129:18848
username: nacosDev1
password: nacosDev1
# 开启健康监控
management:
endpoints:
@ -40,4 +38,3 @@ management:
# 日志
#logging:
# file: /application/applogs/admin.log

4
mosty-rzzx/mosty-rzzx.iml
View File

@ -17,10 +17,10 @@
<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="1747276765359" />
<entry key="lastExternalPluginCheckTime" value="1757036647255" />
</map>
</option>
<option name="version" value="13" />
<option name="version" value="15" />
</configuration>
</facet>
</component>

16
mosty-rzzx/src/main/resources/application.yml
View File

@ -1,6 +1,7 @@
ribbon:
ReadTimeout: 600000
ConnectTimeout: 600000
spring:
servlet:
multipart:
@ -9,12 +10,12 @@ spring:
jackson:
serialization:
write-dates-as-timestamps: false
# # 格式化返回时间 yyyy-MM-dd HH:mm:ss
# 格式化返回时间 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
url: jdbc:mysql://192.168.1.129:33306/mosty_rzzx?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
username: root
password: mosty888
hikari:
@ -26,13 +27,13 @@ spring:
connection-test-query: SELECT 1 # ???????????????
# Redis数据库索引（默认为0）
redis:
database: 8
database: 1
# Redis服务器地址
host: 192.168.200.131
host: 192.168.1.129
# Redis服务器连接端口
port: 6379
port: 63799
# Redis服务器连接密码（默认为空）
password: mosty888
password: redis1994Inferno
# 连接超时时间（毫秒）
timeout: 2000
jedis:
@ -55,13 +56,14 @@ magic-api:
web: /magic/web
#配置文件存储位置。当以classpath开头时，为只读模式
resource:
# location: /data/magic-api
# location: /data/magic-api
type: database
table-name: magic_api # 数据库中的表名
prefix: /magic-api # 前缀
datasource:
response-code:
success: 10000
exclude:
pathPatterns:
swagger:

11
mosty-rzzx/src/main/resources/bootstrap.yml
View File

@ -2,16 +2,18 @@ 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 # 是否将自己注册到配置中心，让其他服务发现调用（本地调试使用）
register-enabled: true
namespace: f23c13d4-0935-42e0-850e-a2216125f2ae
server-addr: 192.168.1.129:18848
username: nacosDev1
password: nacosDev1
# 开启健康监控
management:
@ -36,4 +38,3 @@ management:
# 日志
#logging:
# file: /application/applogs/admin.log

4
mosty-sjzx/mosty-sjzx.iml
View File

@ -17,10 +17,10 @@
<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="1747276765357" />
<entry key="lastExternalPluginCheckTime" value="1757036647257" />
</map>
</option>
<option name="version" value="13" />
<option name="version" value="15" />
</configuration>
</facet>
</component>

21
mosty-sjzx/src/main/resources/application.yml
View File

@ -10,15 +10,12 @@ spring:
jackson:
serialization:
write-dates-as-timestamps: false
# # 格式化返回时间 yyyy-MM-dd HH:mm:ss
# 格式化返回时间 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
url: jdbc:mysql://172.20.19.130:33306/mosty_sjzx?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://192.168.1.129:33306/mosty_sjzx?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
username: mostyDB1
password: mostyDBMysql1
hikari:
@ -29,15 +26,14 @@ spring:
connection-timeout: 60000 # ????????????250????????????30?
connection-test-query: SELECT 1 # ???????????????
# Redis数据库索引（默认为0）
# Redis数据库索引（默认为0）
redis:
database: 8
database: 1
# Redis服务器地址
host: 192.168.200.131
host: 192.168.1.129
# Redis服务器连接端口
port: 6379
port: 63799
# Redis服务器连接密码（默认为空）
password: mosty888
password: redis1994Inferno
# 连接超时时间（毫秒）
timeout: 2000
jedis:
@ -60,13 +56,14 @@ magic-api:
web: /magic/web
#配置文件存储位置。当以classpath开头时，为只读模式
resource:
# location: /data/magic-api
# location: /data/magic-api
type: database
table-name: magic_api # 数据库中的表名
prefix: /magic-api # 前缀
datasource:
response-code:
success: 10000
exclude:
pathPatterns:
swagger:
@ -75,6 +72,6 @@ exclude:
- /v2/**
- /swagger-ui.html/**
- /docs.html/**
-
config:
orgCode: 510600000000

7
mosty-sjzx/src/main/resources/bootstrap.yml
View File

@ -2,21 +2,19 @@ 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
namespace: f23c13d4-0935-42e0-850e-a2216125f2ae
server-addr: 172.20.19.130:18848
server-addr: 192.168.1.129:18848
username: nacosDev1
password: nacosDev1
# 开启健康监控
management:
endpoints:
@ -40,4 +38,3 @@ management:
# 日志
#logging:
# file: /application/applogs/admin.log

4
mosty-spxl/mosty-spxl.iml
View File

@ -17,10 +17,10 @@
<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="1747276765359" />
<entry key="lastExternalPluginCheckTime" value="1757036647255" />
</map>
</option>
<option name="version" value="13" />
<option name="version" value="15" />
</configuration>
</facet>
</component>

17
mosty-spxl/src/main/resources/application.yml
View File

@ -1,6 +1,7 @@
ribbon:
ReadTimeout: 600000
ConnectTimeout: 600000
spring:
servlet:
multipart:
@ -9,12 +10,12 @@ spring:
jackson:
serialization:
write-dates-as-timestamps: false
# # 格式化返回时间 yyyy-MM-dd HH:mm:ss
# 格式化返回时间 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
url: jdbc:mysql://192.168.1.129:33306/mosty_spxl?autoReconnect=true&failOverReadOnly=false&useUnicode=tr&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
username: root
password: mosty888
hikari:
@ -26,18 +27,19 @@ spring:
connection-test-query: SELECT 1 # ???????????????
# Redis数据库索引（默认为0）
redis:
database: 8
database: 1
# Redis服务器地址
host: 192.168.200.131
host: 192.168.1.129
# Redis服务器连接端口
port: 6379
port: 63799
# Redis服务器连接密码（默认为空）
password: mosty888
password: redis1994Inferno
# 连接超时时间（毫秒）
timeout: 2000
jedis:
pool:
max-active: 50
swagger:
host: 80.155.0.84
port: 8010
@ -54,13 +56,14 @@ magic-api:
web: /magic/web
#配置文件存储位置。当以classpath开头时，为只读模式
resource:
# location: /data/magic-api
# location: /data/magic-api
type: database
table-name: magic_api # 数据库中的表名
prefix: /magic-api # 前缀
datasource:
response-code:
success: 10000
exclude:
pathPatterns:
swagger:

11
mosty-spxl/src/main/resources/bootstrap.yml
View File

@ -2,16 +2,18 @@ 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 # 是否将自己注册到配置中心，让其他服务发现调用（本地调试使用）
register-enabled: true
namespace: f23c13d4-0935-42e0-850e-a2216125f2ae
server-addr: 192.168.1.129:18848
username: nacosDev1
password: nacosDev1
# 开启健康监控
management:
@ -36,4 +38,3 @@ management:
# 日志
#logging:
# file: /application/applogs/admin.log

21
mosty-websocket/src/main/resources/application.yml
View File

@ -1,6 +1,7 @@
ribbon:
ReadTimeout: 600000
ConnectTimeout: 600000
spring:
servlet:
multipart:
@ -13,10 +14,7 @@ spring:
time-zone: GMT+8
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://183.222.39.242:3306/mosty_jcgl?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
# username: root
# password: mosty888
url: jdbc:mysql://172.20.19.130:33306/mosty_jcgl?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://192.168.1.129:33306/mosty_jcgl?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
username: mostyDB1
password: mostyDBMysql1
hikari:
@ -27,23 +25,10 @@ spring:
connection-timeout: 60000
connection-test-query: SELECT 1
# Redis数据库索引（默认为0）
# redis:
# database: 8
# # Redis服务器地址
# host: 183.222.39.242
# # Redis服务器连接端口
# port: 6379
# # Redis服务器连接密码（默认为空）
# password: mosty888
# # 连接超时时间（毫秒）
# timeout: 2000
# jedis:
# pool:
# max-active: 50
redis:
database: 1
# Redis服务器地址
host: 172.20.19.130
host: 192.168.1.129
# Redis服务器连接端口
port: 63799
# Redis服务器连接密码（默认为空）

7
mosty-websocket/src/main/resources/bootstrap.yml
View File

@ -2,21 +2,19 @@ server:
port: 8026
servlet:
context-path: /mosty-websocket/
spring:
application:
name: mosty-websocket
cloud:
nacos:
discovery:
# namespace: 657d1843-b590-41ac-b5e7-5d261bf00de9
# server-addr: 183.222.39.242:8848
register-enabled: true
namespace: f23c13d4-0935-42e0-850e-a2216125f2ae
server-addr: 172.20.19.130:18848
server-addr: 192.168.1.129:18848
username: nacosDev1
password: nacosDev1
# 开启健康监控
management:
endpoints:
@ -28,4 +26,3 @@ management:
show-details: always
auditevents:
enabled: true

4
mosty-wzzx/mosty-wzzx.iml
View File

@ -17,10 +17,10 @@
<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="1747276765357" />
<entry key="lastExternalPluginCheckTime" value="1757036647255" />
</map>
</option>
<option name="version" value="13" />
<option name="version" value="15" />
</configuration>
</facet>
</component>

26
mosty-wzzx/src/main/resources/application.yml
View File

@ -1,6 +1,7 @@
ribbon:
ReadTimeout: 600000
ConnectTimeout: 600000
spring:
servlet:
multipart:
@ -9,15 +10,12 @@ spring:
jackson:
serialization:
write-dates-as-timestamps: false
# # 格式化返回时间 yyyy-MM-dd HH:mm:ss
# 格式化返回时间 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://183.222.39.242:3306/mosty_wzzx?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
# username: root
# password: mosty888
url: jdbc:mysql://172.20.19.130:33306/mosty_wzzx?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://192.168.1.129:33306/mosty_wzzx?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
username: mostyDB1
password: mostyDBMysql1
hikari:
@ -28,23 +26,10 @@ spring:
connection-timeout: 60000 # ????????????250????????????30?
connection-test-query: SELECT 1 # ???????????????
# Redis数据库索引（默认为0）
# redis:
# database: 8
# # Redis服务器地址
# host: 183.222.39.242
# # Redis服务器连接端口
# port: 6379
# # Redis服务器连接密码（默认为空）
# password: mosty888
# # 连接超时时间（毫秒）
# timeout: 20000000
# jedis:
# pool:
# max-active: 1000
redis:
database: 1
# Redis服务器地址
host: 172.20.19.130
host: 192.168.1.129
# Redis服务器连接端口
port: 63799
# Redis服务器连接密码（默认为空）
@ -78,6 +63,7 @@ magic-api:
datasource:
response-code:
success: 10000
exclude:
pathPatterns:
swagger:
@ -86,6 +72,7 @@ exclude:
- /v2/**
- /swagger-ui.html/**
- /docs.html/**
custom:
#POINAME分组位置信息默偏移天数
userTrackPoiNameOffset: -15
@ -96,7 +83,6 @@ custom:
LzUdpPort: 18004
LzUdpTest: false
config:
orgCode: 510600000000

9
mosty-wzzx/src/main/resources/bootstrap.yml
View File

@ -2,21 +2,19 @@ server:
port: 51822
servlet:
context-path: /mosty-wzzx/
spring:
application:
name: mosty-wzzx
cloud:
nacos:
discovery:
# namespace: 657d1843-b590-41ac-b5e7-5d261bf00de9
# server-addr: 183.222.39.242:8848
register-enabled: true # 是否将自己注册到配置中心，让其他服务发现调用（本地调试使用）
register-enabled: true
namespace: f23c13d4-0935-42e0-850e-a2216125f2ae
server-addr: 172.20.19.130:18848
server-addr: 192.168.1.129:18848
username: nacosDev1
password: nacosDev1
# 开启健康监控
management:
endpoints:
@ -40,4 +38,3 @@ management:
# 日志
#logging:
# file: /application/applogs/admin.log

4
mosty-yjzl/mosty-yjzl.iml
View File

@ -17,10 +17,10 @@
<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="1747276765359" />
<entry key="lastExternalPluginCheckTime" value="1757036647255" />
</map>
</option>
<option name="version" value="13" />
<option name="version" value="15" />
</configuration>
</facet>
</component>

97
mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbZdxlFgdwController.java Normal file
View File

@ -0,0 +1,97 @@
package com.mosty.yjzl.controller;
import com.mosty.base.model.dto.yjzl.TbZdxlFgdwUpdateDTO;
import com.mosty.base.model.vo.yjzl.TbZdxlFgdwVO;
import com.mosty.base.utils.MessageUtils;
import com.mosty.base.utils.spring.SpringValidUtils;
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.util.StringUtils;
import com.mosty.common.token.JwtSysUser;
import com.mosty.yjzl.service.TbZdxlFgdwService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
* @author zhangzhao
* @description 指导巡逻方格点位接口
* @modifier zhangzhao
* @modifiedTime 2025/05/15 21:53
* @since 2025/05/15 21:53
*/
@Api(tags = {"指导巡逻-方格点位接口"})
@RestController
@AllArgsConstructor
@RequestMapping("/tbZdxlFgdw")
public class TbZdxlFgdwController {
/**
* 指导巡逻方格点位表Service
*/
private final TbZdxlFgdwService tbZdxlFgdwService;
/**
* 查询单条（根据主键ID）
* @param id 主键ID
* @return ResponseResult 实体信息
*/
@ApiOperation(value = "查询单条（根据主键ID）")
@GetMapping("{id}")
@JwtSysUser
@Log(title = "指导巡逻-方格点位接口-查询单条（根据主键ID）", businessType = BusinessType.OTHER)
public ResponseResult<TbZdxlFgdwVO> selectById(@PathVariable("id") Integer id) {
return ResponseResult.success(tbZdxlFgdwService.selectById(id));
}
/**
* 查询全量列表
* @return ResponseResult 实体信息列表
*/
@ApiOperation(value = "查询全量列表")
@GetMapping("/selectAllList")
@JwtSysUser
@Log(title = "指导巡逻-方格点位接口-查询全量列表", businessType = BusinessType.OTHER)
public ResponseResult<List<TbZdxlFgdwVO>> selectAllList() {
return ResponseResult.success(tbZdxlFgdwService.selectAllList());
}
/**
* 修改单条
* @param dto 修改DTO对象
* @param bindResult 校验对象
* @return ResponseResult 实体主键ID
*/
@ApiOperation(value = "修改单条")
@PostMapping("update")
@JwtSysUser
@Log(title = "指导巡逻-方格点位接口-修改单条", businessType = BusinessType.UPDATE)
public ResponseResult<Integer> update(@RequestBody @Valid TbZdxlFgdwUpdateDTO dto, BindingResult bindResult){
try {
//基础信息校验
String message = SpringValidUtils.getErrorsMsg(bindResult);
if (StringUtils.isNotBlank(message)) {
return ResponseResult.fail(MessageUtils.getEditFailMsg() + message);
}
//修改
Integer resultId = tbZdxlFgdwService.updateEntity(dto);
if(ObjectUtils.isNotEmpty(resultId)){
return ResponseResult.success(resultId);
}
return ResponseResult.fail(MessageUtils.getEditFailMsg());
} catch (Exception e) {
e.printStackTrace();
return ResponseResult.fail(MessageUtils.getEditServerErrorMsg());
}
}
}

161
mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbZdxlFgxlrwController.java Normal file
View File

@ -0,0 +1,161 @@
package com.mosty.yjzl.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mosty.base.model.dto.yjzl.TbZdxlFgxlrwCreateDTO;
import com.mosty.base.model.dto.yjzl.TbZdxlFgxlrwUpdateDTO;
import com.mosty.base.model.entity.yjzl.zddw.TbZdxlFgxlrw;
import com.mosty.base.model.query.yjzl.TbZdxlFgxlrwQuery;
import com.mosty.base.model.vo.yjzl.TbZdxlFgxlrwVO;
import com.mosty.base.utils.MessageUtils;
import com.mosty.base.utils.spring.SpringValidUtils;
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.util.StringUtils;
import com.mosty.common.config.Excel.ExcelUtil;
import com.mosty.common.token.JwtSysUser;
import com.mosty.yjzl.service.TbZdxlFgxlrwService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.List;
/**
* @author zhangzhao
* @description 指导巡逻方格巡逻任务接口
* @modifier zhangzhao
* @modifiedTime 2025/05/10 21:52
* @since 2025/05/10 21:52
*/
@Api(tags = {"指导巡逻-方格巡逻任务接口"})
@RestController
@AllArgsConstructor
@RequestMapping("/tbZdxlFgxlrw")
public class TbZdxlFgxlrwController {
/**
* 指导巡逻方格巡逻任务表Service
*/
private final TbZdxlFgxlrwService tbZdxlFgxlrwService;
/**
* 查询分页
* @param query 实体查询对象
* @return ResponseResult 实体返回信息分页列表
*/
@ApiOperation(value = "查询分页")
@GetMapping("/selectPage")
@JwtSysUser
@Log(title = "指导巡逻-方格巡逻任务接口-查询分页", businessType = BusinessType.OTHER)
public ResponseResult<IPage<TbZdxlFgxlrwVO>> selectPage(TbZdxlFgxlrwQuery query) {
return ResponseResult.success(tbZdxlFgxlrwService.selectPage(query));
}
/**
* 查询列表
* @param query 实体查询对象
* @return ResponseResult 实体返回信息列表
*/
@ApiOperation(value = "查询列表")
@GetMapping("/selectList")
@JwtSysUser
@Log(title = "指导巡逻-方格巡逻任务接口-查询列表", businessType = BusinessType.OTHER)
public ResponseResult<List<TbZdxlFgxlrwVO>> selectList(TbZdxlFgxlrwQuery query) {
return ResponseResult.success(tbZdxlFgxlrwService.selectList(query));
}
/**
* 修改单条
* @param dto 修改DTO对象
* @param bindResult 校验对象
* @return ResponseResult 实体主键ID
*/
@ApiOperation(value = "修改单条")
@PostMapping("update")
@JwtSysUser
@Log(title = "指导巡逻-方格巡逻任务接口-修改单条", businessType = BusinessType.UPDATE)
public ResponseResult<String> update(@RequestBody @Valid TbZdxlFgxlrwUpdateDTO dto, BindingResult bindResult){
try {
//基础信息校验
String message = SpringValidUtils.getErrorsMsg(bindResult);
if (StringUtils.isNotBlank(message)) {
return ResponseResult.fail(MessageUtils.getEditFailMsg() + message);
}
//修改
String resultId = tbZdxlFgxlrwService.updateEntity(dto);
if(StringUtils.isNotBlank(resultId)){
return ResponseResult.success(resultId);
}
return ResponseResult.fail(MessageUtils.getEditFailMsg());
} catch (Exception e) {
e.printStackTrace();
return ResponseResult.fail(MessageUtils.getEditServerErrorMsg());
}
}
/**
* 导出任务（根据任务日期）
* @param response 返回体
* @param dto 任务日期DTO
* @param bindResult 校验对象
*/
@PostMapping("/exportByRwRq")
@ApiOperation("导出任务（根据任务日期）")
@Log(title = "指导巡逻-方格巡逻任务接口-导出任务（根据任务日期）", businessType = BusinessType.OTHER)
public void exportByRwRq(HttpServletResponse response, @RequestBody @Valid TbZdxlFgxlrwCreateDTO dto, BindingResult bindResult) {
try {
//基础信息校验
String message = SpringValidUtils.getErrorsMsg(bindResult);
if (StringUtils.isNotBlank(message)) {
System.out.println(MessageUtils.getExportFailMsg() + message);
}
//查询列表
List<TbZdxlFgxlrw> baseList = tbZdxlFgxlrwService.selectListByRwRq(dto.getRwRq());
if(CollectionUtils.isEmpty(baseList)){
System.out.println(MessageUtils.getExportFailMsg() + MessageUtils.message("zdxl.fgxlrw.rwRq.export.queryNull"));
}else{
tbZdxlFgxlrwService.updateListRwZtToYdc(baseList);
ExcelUtil<TbZdxlFgxlrw> util = new ExcelUtil<>(TbZdxlFgxlrw.class);
util.exportExcel(response, baseList, "任务列表", "方格巡逻任务");
System.out.println(baseList.size() + "");
}
} catch (Exception e) {
System.out.println(MessageUtils.getExportServerErrorMsg());
}
}
/**
* 导入列表（根据导出的模板）
* @param file 导入文件
* @return ResponseResult 导入条数
*/
@ApiOperation(value = "导入列表（根据导出的模板）")
@PostMapping("/importListByMb")
@JwtSysUser
@Log(title = "指导巡逻-方格巡逻任务接口-导入列表（根据导出的模板）", businessType = BusinessType.IMPORT)
public ResponseResult<Integer> importListByMb(MultipartFile file) {
try {
ExcelUtil<TbZdxlFgxlrw> util = new ExcelUtil<>(TbZdxlFgxlrw.class);
List<TbZdxlFgxlrw> fgxlrwList = util.importExcel(file.getInputStream());
if(CollectionUtils.isEmpty(fgxlrwList)){
int resultInt = tbZdxlFgxlrwService.importListByMb(fgxlrwList);
if(resultInt > 0){
return ResponseResult.success(resultInt);
}
}
return ResponseResult.fail(MessageUtils.getImportFailMsg());
} catch (Exception e) {
return ResponseResult.fail(MessageUtils.getImportServerErrorMsg());
}
}
}

17
mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZdxlFgdwMapper.java Normal file
View File

@ -0,0 +1,17 @@
package com.mosty.yjzl.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mosty.base.model.entity.yjzl.zddw.TbZdxlFgdw;
import org.apache.ibatis.annotations.Mapper;
/**
* @author zhangzhao
* @description 指导巡逻方格巡逻任务表Mapper
* @modifier zhangzhao
* @modifiedTime 2025/05/15 21:56
* @since 2025/05/15 21:56
*/
@Mapper
public interface TbZdxlFgdwMapper extends BaseMapper<TbZdxlFgdw> {
}

17
mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZdxlFgxlrwMapper.java Normal file
View File

@ -0,0 +1,17 @@
package com.mosty.yjzl.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mosty.base.model.entity.yjzl.zddw.TbZdxlFgxlrw;
import org.apache.ibatis.annotations.Mapper;
/**
* @author zhangzhao
* @description 指导巡逻方格巡逻任务表Mapper
* @modifier zhangzhao
* @modifiedTime 2025/05/10 22:04
* @since 2025/05/10 22:04
*/
@Mapper
public interface TbZdxlFgxlrwMapper extends BaseMapper<TbZdxlFgxlrw> {
}

198
mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbZdxlFgdwServiceImpl.java Normal file
View File

@ -0,0 +1,198 @@
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.dto.yjzl.TbZdxlFgdwUpdateDTO;
import com.mosty.base.model.entity.yjzl.zddw.TbZdxlFgdw;
import com.mosty.base.model.vo.yjzl.TbZdxlFgdwVO;
import com.mosty.yjzl.mapper.TbZdxlFgdwMapper;
import com.mosty.yjzl.service.TbZdxlFgdwService;
import lombok.AllArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
/**
* @author zhangzhao
* @description 指导巡逻方格点位表Service实现类
* @modifier zhangzhao
* @modifiedTime 2025/05/15 21:55
* @since 2025/05/15 21:55
*/
@Service
@AllArgsConstructor
public class TbZdxlFgdwServiceImpl extends ServiceImpl<TbZdxlFgdwMapper, TbZdxlFgdw> implements TbZdxlFgdwService {
@Override
public TbZdxlFgdwVO selectById(Integer id) {
if(ObjectUtils.isEmpty(id)){
return null;
}
TbZdxlFgdw entity = this.baseMapper.selectOne(new QueryWrapper<TbZdxlFgdw>()
.eq(TbZdxlFgdw.ID_FIELD, id)
.eq("xt_sjzt", "1")
.eq("xt_scbz", "0")
);
return this.buildAllInfoByEntity(entity);
}
@Override
public List<TbZdxlFgdwVO> selectAllList() {
return this.buildAllInfoListByEntityList(this.baseMapper.selectList(new QueryWrapper<>()));
}
@Override
public int saveListByGenerate(List<TbZdxlFgdw> saveList, String firstMc) {
if(CollectionUtils.isEmpty(saveList)){
return -1;
}
//获取基准方格，baseLeftTopDw表示最左侧一列从上向下第一个方格，baseTopLeftDw表示最上一行从左向右第一个方格
TbZdxlFgdw baseLeftTopDw = new TbZdxlFgdw(), baseTopLeftDw = new TbZdxlFgdw();
for(TbZdxlFgdw dw : saveList){
//x11取最小值，y11取最大值
if(ObjectUtils.isEmpty(baseLeftTopDw.getX11()) && ObjectUtils.isEmpty(baseLeftTopDw.getY11())){
baseLeftTopDw = dw;
} else if (dw.getX11().compareTo(baseLeftTopDw.getX11()) < 0){
baseLeftTopDw = dw;
} else if (dw.getX11().compareTo(baseLeftTopDw.getX11()) == 0 && dw.getY11().compareTo(baseLeftTopDw.getY11()) >= 0){
baseLeftTopDw = dw;
}
//y21取最大值，x21取最小值
if(ObjectUtils.isEmpty(baseTopLeftDw.getX21()) && ObjectUtils.isEmpty(baseTopLeftDw.getY21())){
baseTopLeftDw = dw;
}else if (dw.getY21().compareTo(baseTopLeftDw.getY21()) > 0){
baseTopLeftDw = dw;
}else if (dw.getY21().compareTo(baseTopLeftDw.getY21()) == 0 && dw.getX21().compareTo(baseTopLeftDw.getX21()) <= 0){
baseTopLeftDw = dw;
}
}
//按列循环，赋值中间名，从基准方格中，取x11的值为开始
Map<String, TbZdxlFgdw> entityMap = new HashMap<>();
BigDecimal baseLeftTopDwX11 = baseLeftTopDw.getX11();
char letter = 'A';
while (baseLeftTopDwX11 != null) {
BigDecimal finalBaseLeftTopDwX11 = baseLeftTopDwX11;
//查询x11相同的方格，按y11正序排列，开始取名
List<TbZdxlFgdw> dwList = saveList.stream()
.filter(entity -> entity.getX11().compareTo(finalBaseLeftTopDwX11) == 0)
.sorted(Comparator.comparing(TbZdxlFgdw::getY11))
.collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(dwList)){
//如果查询出来的列表不为空，则需要将列表中的x21赋值给baseLeftTopDwX11，以进行下次循环
baseLeftTopDwX11 = dwList.get(0).getX21();
//同一列的名称，中间名相同
for(TbZdxlFgdw entity : dwList){
entity.setMc1(firstMc + "-" + letter);
entityMap.put("" + entity.getX11() + entity.getY11(), entity);
}
letter++;
if(letter > 'Z'){
letter = 'A';
}
}else{
baseLeftTopDwX11 = null;
}
}
//按行循环，赋值尾名，从基准方格中，取y21的值为开始
BigDecimal baseTopLeftDwY21 = baseTopLeftDw.getY21();
int i = 1;
while (baseTopLeftDwY21 != null) {
BigDecimal finalBaseTopLeftDwY21 = baseTopLeftDwY21;
//查询y21相同的方格，按x21正序排列，开始取名
List<TbZdxlFgdw> dwList = saveList.stream()
.filter(entity -> entity.getY21().compareTo(finalBaseTopLeftDwY21) == 0)
.sorted(Comparator.comparing(TbZdxlFgdw::getX21))
.collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(dwList)){
//如果查询出来的列表不为空，则需要将列表中的y11赋值给baseTopLeftDwY21，以进行下次循环
baseTopLeftDwY21 = dwList.get(0).getY11();
//同一行的名称，尾名相同
for(TbZdxlFgdw entity : dwList){
TbZdxlFgdw mcEntity = entityMap.get("" + entity.getX11() + entity.getY11());
mcEntity.setMc1(entity.getMc1() + "-" + i);
entityMap.put("" + entity.getX11() + entity.getY11(), mcEntity);
}
i++;
}else{
baseTopLeftDwY21 = null;
}
}
boolean success = this.saveBatch(entityMap.values());
if(success){
return entityMap.values().size();
}
return 0;
}
@Override
@Transactional(rollbackFor = Exception.class)
public Integer updateEntity(TbZdxlFgdwUpdateDTO dto) {
//复制参数至实体
TbZdxlFgdw entity = BeanUtil.copyProperties(dto, TbZdxlFgdw.class);
entity.setMc1(dto.getMc());
//修改实体
int resultInt = this.baseMapper.updateById(entity);
if(resultInt > 0){
//返回主键
return entity.getId();
}
return null;
}
/**
* 组装全量信息列表（根据实体列表）
* @param entityList 实体列表
* @return 全量信息列表
*/
private List<TbZdxlFgdwVO> buildAllInfoListByEntityList(List<TbZdxlFgdw> entityList){
if(CollectionUtils.isEmpty(entityList)){
return null;
}
List<TbZdxlFgdwVO> allInfoVOList = new ArrayList<>();
//组装返回数据
for(TbZdxlFgdw entity : entityList){
TbZdxlFgdwVO resultVO = this.buildAllInfoByEntity(entity);
allInfoVOList.add(resultVO);
}
//返回列表
if(CollectionUtils.isEmpty(allInfoVOList)){
return null;
}
return allInfoVOList;
}
/**
* 组装全量信息（根据实体信息）
* @param entity 实体信息
* @return 全量信息
*/
private TbZdxlFgdwVO buildAllInfoByEntity(TbZdxlFgdw entity){
if(ObjectUtils.isEmpty(entity)){
return null;
}
TbZdxlFgdwVO resultVO = BeanUtil.copyProperties(entity, TbZdxlFgdwVO.class);
//组装方格其他数据
resultVO.setMc(resultVO.getMc1());
resultVO.setX1(resultVO.getX11());
resultVO.setY1(resultVO.getY11());
resultVO.setX2(resultVO.getX21());
resultVO.setY2(resultVO.getY21());
return resultVO;
}
}

259
mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbZdxlFgxlrwServiceImpl.java Normal file
View File

@ -0,0 +1,259 @@
package com.mosty.yjzl.service.Impl;
import cn.hutool.core.bean.BeanUtil;
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.yjzl.TbZdxlFgxlrwUpdateDTO;
import com.mosty.base.model.entity.yjzl.zddw.TbZdxlFgdw;
import com.mosty.base.model.entity.yjzl.zddw.TbZdxlFgxlrw;
import com.mosty.base.model.query.yjzl.TbZdxlFgxlrwQuery;
import com.mosty.base.model.vo.yjzl.TbZdxlFgxlrwVO;
import com.mosty.base.utils.PageUtils;
import com.mosty.base.utils.QueryWrapperUtils;
import com.mosty.common.base.util.StringUtils;
import com.mosty.yjzl.mapper.TbZdxlFgxlrwMapper;
import com.mosty.yjzl.service.TbZdxlFgdwService;
import com.mosty.yjzl.service.TbZdxlFgxlrwService;
import com.mosty.yjzl.utils.TbZdxlFgxlrwUtils;
import lombok.AllArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* @author zhangzhao
* @description 指导巡逻方格巡逻任务表Service实现类
* @modifier zhangzhao
* @modifiedTime 2025/05/10 22:03
* @since 2025/05/10 22:03
*/
@Service
@AllArgsConstructor
public class TbZdxlFgxlrwServiceImpl extends ServiceImpl<TbZdxlFgxlrwMapper, TbZdxlFgxlrw> implements TbZdxlFgxlrwService {
/**
* 指导巡逻Service
*/
private final TbZdxlFgdwService tbZdxlFgdwService;
@Override
public TbZdxlFgxlrw selectById(String id) {
if(StringUtils.isBlank(id)){
return null;
}
return this.baseMapper.selectOne(new QueryWrapper<TbZdxlFgxlrw>()
.eq(TbZdxlFgxlrw.ID_FIELD, id)
.eq("xt_sjzt", "1")
.eq("xt_scbz", "0")
);
}
@Override
public IPage<TbZdxlFgxlrwVO> selectPage(TbZdxlFgxlrwQuery query) {
IPage<TbZdxlFgxlrw> page = PageUtils.buildPage(query.getPageSize(), query.getPageCurrent());
QueryWrapper<TbZdxlFgxlrw> qw = new QueryWrapper<>();
//组装查询参数
this.buildListSelectQueryWrapper(qw, query);
//返回Page
IPage<TbZdxlFgxlrwVO> resultPage = new Page<>(query.getPageCurrent(), query.getPageSize());
//查询数据
page = this.baseMapper.selectPage(page, qw);
List<TbZdxlFgxlrw> list = page.getRecords();
if(CollectionUtils.isEmpty(list)){
return resultPage;
}
//转为VO
List<TbZdxlFgxlrwVO> resultList = this.buildAllInfoListByEntityList(list);
//组装VO
resultPage.setRecords(resultList);
resultPage.setTotal(page.getTotal());
return resultPage;
}
@Override
public List<TbZdxlFgxlrwVO> selectList(TbZdxlFgxlrwQuery query) {
QueryWrapper<TbZdxlFgxlrw> qw = new QueryWrapper<>();
//组装查询参数
this.buildListSelectQueryWrapper(qw, query);
//查询数据
List<TbZdxlFgxlrw> list = this.baseMapper.selectList(qw);
if(CollectionUtils.isEmpty(list)){
return null;
}
//转为VO返回
return this.buildAllInfoListByEntityList(list);
}
@Override
public List<TbZdxlFgxlrw> selectListByRwRq(Date rwRq) {
if (ObjectUtils.isEmpty(rwRq)) {
return null;
}
return this.baseMapper.selectList(new QueryWrapper<TbZdxlFgxlrw>()
.eq(TbZdxlFgxlrw.RW_RQ_FIELD, rwRq)
.eq("xt_sjzt", "1")
.eq("xt_scbz", "0")
);
}
@Override
public String updateEntity(TbZdxlFgxlrwUpdateDTO dto) {
//复制参数至实体
TbZdxlFgxlrw entity = BeanUtil.copyProperties(dto, TbZdxlFgxlrw.class);
//修改实体
int resultInt = this.baseMapper.updateById(entity);
if(resultInt > 0){
//返回主键
return entity.getId();
}
return null;
}
@Override
@Transactional(rollbackFor = Exception.class)
public int updateListRwZtToYdc(List<TbZdxlFgxlrw> entityList) {
if(CollectionUtils.isEmpty(entityList)){
return -1;
}
List<TbZdxlFgxlrw> updateList = new ArrayList<>();
for(TbZdxlFgxlrw entity : entityList){
if(TbZdxlFgxlrwUtils.DICT_ITEM_D_ZDXL_FGXLRW_RWZT_CJ.equals(entity.getRwZt())){
TbZdxlFgxlrw updateEntity = new TbZdxlFgxlrw();
updateEntity.setId(entity.getId());
updateEntity.setRwZt(TbZdxlFgxlrwUtils.DICT_ITEM_D_ZDXL_FGXLRW_RWZT_YDC);
updateList.add(updateEntity);
}
}
if(CollectionUtils.isNotEmpty(updateList)){
boolean success = this.updateBatchById(updateList);
if(success){
return updateList.size();
}
}
return 0;
}
@Override
@Transactional(rollbackFor = Exception.class)
public int importListByMb(List<TbZdxlFgxlrw> entityList) {
if(CollectionUtils.isEmpty(entityList)){
return -1;
}
//筛选保存和修改列表
List<TbZdxlFgxlrw> saveList = new ArrayList<>(), updateList = new ArrayList<>();
for(TbZdxlFgxlrw entity : entityList){
TbZdxlFgxlrw baseEntity = this.selectById(entity.getId());
if(ObjectUtils.isEmpty(baseEntity)){
//保存
saveList.add(entity);
}else{
//修改
if(TbZdxlFgxlrwUtils.DICT_ITEM_D_ZDXL_FGXLRW_RWZT_CJ.equals(baseEntity.getRwZt()) ||
TbZdxlFgxlrwUtils.DICT_ITEM_D_ZDXL_FGXLRW_RWZT_YDC.equals(baseEntity.getRwZt())){
updateList.add(entity);
}
}
}
//分别保存和修改
int resultInt = 0;
if(CollectionUtils.isNotEmpty(saveList)){
boolean success = this.saveBatch(saveList);
if(success){
resultInt += saveList.size();
}
}
if(CollectionUtils.isNotEmpty(updateList)){
boolean success = this.updateBatchById(updateList);
if(success){
resultInt += updateList.size();
}
}
return resultInt;
}
/**
* 组装查询参数
* @param qw QueryWrapper
* @param query 查询对象
*/
private void buildListSelectQueryWrapper(QueryWrapper<TbZdxlFgxlrw> qw, TbZdxlFgxlrwQuery query){
//默认使用排序字段
if(StringUtils.isBlank(query.getSort())){
query.setSort(TbZdxlFgxlrw.FG_PX_FIELD);
query.setOrder(QueryWrapperUtils.ORDER_ASC_STRING);
}
//组装其他排序方式
QueryWrapperUtils.buildQueryWrapperOrder(qw, query.getSort(), query.getOrder());
//未注销数据
qw.eq("xt_sjzt", "1").eq("xt_scbz", "0");
//方格ID
qw.eq(ObjectUtils.isNotEmpty(query.getFgId()), TbZdxlFgxlrw.FG_ID_FIELD, query.getFgId());
//任务日期
qw.eq(ObjectUtils.isNotEmpty(query.getRwRq()), TbZdxlFgxlrw.RW_RQ_FIELD, query.getRwRq());
}
/**
* 组装全量信息列表（根据实体列表）
* @param entityList 实体列表
* @return 全量信息列表
*/
private List<TbZdxlFgxlrwVO> buildAllInfoListByEntityList(List<TbZdxlFgxlrw> entityList){
List<TbZdxlFgxlrwVO> allInfoVOList = new ArrayList<>();
//组装返回数据
for(TbZdxlFgxlrw entity : entityList){
TbZdxlFgxlrwVO resultVO = this.buildAllInfoByEntity(entity);
allInfoVOList.add(resultVO);
}
//返回列表
if(CollectionUtils.isEmpty(allInfoVOList)){
return null;
}
return allInfoVOList;
}
/**
* 组装全量信息（根据实体信息）
* @param entity 实体信息
* @return 全量信息
*/
private TbZdxlFgxlrwVO buildAllInfoByEntity(TbZdxlFgxlrw entity){
TbZdxlFgxlrwVO resultVO = BeanUtil.copyProperties(entity, TbZdxlFgxlrwVO.class);
//组装方格数据
if(ObjectUtils.isNotEmpty(resultVO.getFgId())){
TbZdxlFgdw fg = tbZdxlFgdwService.selectById(resultVO.getFgId());
if(ObjectUtils.isNotEmpty(fg)){
resultVO.setMc(fg.getMc1());
resultVO.setX1(fg.getX11());
resultVO.setY1(fg.getY11());
resultVO.setX2(fg.getX21());
resultVO.setY2(fg.getY21());
resultVO.setZxX(fg.getZxX());
resultVO.setZxY(fg.getZxY());
}
}
return resultVO;
}
}

45
mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbZdxlFgdwService.java Normal file
View File

@ -0,0 +1,45 @@
package com.mosty.yjzl.service;
import com.mosty.base.model.dto.yjzl.TbZdxlFgdwUpdateDTO;
import com.mosty.base.model.entity.yjzl.zddw.TbZdxlFgdw;
import com.mosty.base.model.vo.yjzl.TbZdxlFgdwVO;
import java.util.List;
/**
* @author zhangzhao
* @description 指导巡逻方格点位表Service
* @modifier zhangzhao
* @modifiedTime 2025/05/15 21:55
* @since 2025/05/15 21:55
*/
public interface TbZdxlFgdwService {
/**
* 查询单条（根据主键ID）
* @param id 主键ID
* @return 实体信息
*/
TbZdxlFgdwVO selectById(Integer id);
/**
* 查询全量列表
* @return 实体信息列表
*/
List<TbZdxlFgdwVO> selectAllList();
/**
* 保存列表（根据生成数据）
* @param saveList 生成数据列表
* @return 保存数量
*/
int saveListByGenerate(List<TbZdxlFgdw> saveList, String firstMc);
/**
* 修改单条
* @param dto 修改DTO对象
* @return 实体主键ID
*/
Integer updateEntity(TbZdxlFgdwUpdateDTO dto);
}

70
mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbZdxlFgxlrwService.java Normal file
View File

@ -0,0 +1,70 @@
package com.mosty.yjzl.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mosty.base.model.dto.yjzl.TbZdxlFgxlrwUpdateDTO;
import com.mosty.base.model.entity.yjzl.zddw.TbZdxlFgxlrw;
import com.mosty.base.model.query.yjzl.TbZdxlFgxlrwQuery;
import com.mosty.base.model.vo.yjzl.TbZdxlFgxlrwVO;
import java.util.Date;
import java.util.List;
/**
* @author zhangzhao
* @description 指导巡逻方格巡逻任务表Service
* @modifier zhangzhao
* @modifiedTime 2025/05/10 22:02
* @since 2025/05/10 22:02
*/
public interface TbZdxlFgxlrwService {
/**
* 查询单条（根据主键ID）
* @param id 主键ID
* @return 实体信息
*/
TbZdxlFgxlrw selectById(String id);
/**
* 查询分页
* @param query 实体查询对象
* @return 实体返回信息分页列表
*/
IPage<TbZdxlFgxlrwVO> selectPage(TbZdxlFgxlrwQuery query);
/**
* 查询列表
* @param query 实体查询对象
* @return 实体返回信息列表
*/
List<TbZdxlFgxlrwVO> selectList(TbZdxlFgxlrwQuery query);
/**
* 查询列表（根据任务日期）
* @param rwRq 任务日期
* @return 实体信息
*/
List<TbZdxlFgxlrw> selectListByRwRq(Date rwRq);
/**
* 修改单条
* @param dto 修改DTO对象
* @return 实体主键ID
*/
String updateEntity(TbZdxlFgxlrwUpdateDTO dto);
/**
* 修改列表（修改任务状态为”已导出“）
* @param entityList 实体列表
* @return 操作数量
*/
int updateListRwZtToYdc(List<TbZdxlFgxlrw> entityList);
/**
* 导入列表（根据导出的模板）
* @param entityList 实体列表
* @return 操作数量
*/
int importListByMb(List<TbZdxlFgxlrw> entityList);
}

122
mosty-yjzl/src/main/java/com/mosty/yjzl/utils/TbZdxlFgxlrwUtils.java Normal file
View File

@ -0,0 +1,122 @@
package com.mosty.yjzl.utils;
/**
* @author zhangzhao
* @description 指导巡逻方格巡逻任务工具类
* @modifier zhangzhao
* @modifiedTime 2025/05/11 22:43
* @since 2025/05/11 22:43
*/
public class TbZdxlFgxlrwUtils {
/**
* 方格巡逻任务-街面警情-查询开始日期运算长度
*/
public final static Integer FGXLRW_JMJQ_QUERY_START_D_STEP = -8;
/**
* 方格巡逻任务-街面警情-查询结束日期运算长度
*/
public final static Integer FGXLRW_JMJQ_QUERY_END_D_STEP = -1;
/**
* 方格巡逻任务-街面警情-数量统计-红色预警
*/
public final static Integer FGXLRW_JMJQ_COUNT_RED = 20;
/**
* 方格巡逻任务-街面警情-数量统计-橙色预警
*/
public final static Integer FGXLRW_JMJQ_COUNT_ORANGE = 10;
/**
* 方格巡逻任务-街面警情-数量统计-黄色预警
*/
public final static Integer FGXLRW_JMJQ_COUNT_YELLOW = 5;
/**
* 方格巡逻任务-高发时段-开始小时-运算长度
*/
public final static Integer FGXLRW_GFSD_HOUR_START_STEP = -1;
/**
* 方格巡逻任务-高发时段-结束小时-运算长度
*/
public final static Integer FGXLRW_GFSD_HOUR_END_STEP = 1;
/**
* 方格巡逻任务-高发警情最大数量
*/
public final static Integer FGXLRW_GFJQ_MAX_COUNT = 5;
/**
* 方格巡逻任务-默认规划时长（分钟）
*/
public final static Double FGXLRW_DEFAULT_XLGHSC = 120.00;
/**
* 方格巡逻任务-默认规划巡逻里程（公里）
*/
public final static Double FGXLRW_DEFAULT_XLGHXLLC = 2.00;
/**
* 字典项-指导巡逻方格巡逻任务预警等级-一级
*/
public final static String DICT_ITEM_D_ZDXL_FGXLRW_YJDJ_FT = "01";
/**
* 字典项-指导巡逻方格巡逻任务预警等级-二级
*/
public final static String DICT_ITEM_D_ZDXL_FGXLRW_YJDJ_SE = "02";
/**
* 字典项-指导巡逻方格巡逻任务预警等级-三级
*/
public final static String DICT_ITEM_D_ZDXL_FGXLRW_YJDJ_TH = "03";
/**
* 字典项-指导巡逻方格巡逻任务预警等级-四级
*/
public final static String DICT_ITEM_D_ZDXL_FGXLRW_YJDJ_FO = "04";
/**
* 字典项-指导巡逻方格巡逻任务预警颜色-红色预警
*/
public final static String DICT_ITEM_D_ZDXL_FGXLRW_YJYS_RED = "01";
/**
* 字典项-指导巡逻方格巡逻任务预警颜色-橙色预警
*/
public final static String DICT_ITEM_D_ZDXL_FGXLRW_YJYS_ORANGE = "02";
/**
* 字典项-指导巡逻方格巡逻任务预警颜色-黄色预警
*/
public final static String DICT_ITEM_D_ZDXL_FGXLRW_YJYS_YELLOW = "03";
/**
* 字典项-指导巡逻方格巡逻任务预警颜色-蓝色预警
*/
public final static String DICT_ITEM_D_ZDXL_FGXLRW_YJYS_BLUE = "04";
/**
* 字典项-指导巡逻方格巡逻任务状态-创建
*/
public final static String DICT_ITEM_D_ZDXL_FGXLRW_RWZT_CJ = "01";
/**
* 字典项-指导巡逻方格巡逻任务状态-已导出
*/
public final static String DICT_ITEM_D_ZDXL_FGXLRW_RWZT_YDC = "02";
/**
* 系统配置配置键-方格巡逻任务警情配置-报警细类
*/
public final static String SYS_CONFIG_PZJ_FGXLRW_JQPZ_BJXL = "ZDXL_FGYSJS_JQ_BJXL";
/**
* 系统配置配置键-方格巡逻任务警情配置-报警子类
*/
public final static String SYS_CONFIG_PZJ_FGXLRW_JQPZ_BJZL = "ZDXL_FGYSJS_JQ_BJZL";
}

17
mosty-yjzl/src/main/resources/application.yml
View File

@ -1,6 +1,7 @@
ribbon:
ReadTimeout: 6000000
ConnectTimeout: 6000000
spring:
kafka:
producer:
@ -12,15 +13,12 @@ spring:
jackson:
serialization:
write-dates-as-timestamps: false
# # 格式化返回时间 yyyy-MM-dd HH:mm:ss
# 格式化返回时间 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
url: jdbc:mysql://172.20.19.130:33306/mosty_yjzl?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://192.168.1.129:33306/mosty_yjzl?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
username: mostyDB1
password: mostyDBMysql1
hikari:
@ -32,13 +30,13 @@ spring:
connection-test-query: SELECT 1 # ???????????????
# Redis数据库索引（默认为0）
redis:
database: 8
database: 1
# Redis服务器地址
host: 192.168.200.131
host: 192.168.1.129
# Redis服务器连接端口
port: 6379
port: 63799
# Redis服务器连接密码（默认为空）
password: mosty888
password: redis1994Inferno
# 连接超时时间（毫秒）
timeout: 2000
jedis:
@ -68,6 +66,7 @@ magic-api:
datasource:
response-code:
success: 10000
exclude:
pathPatterns:
swagger:

9
mosty-yjzl/src/main/resources/bootstrap.yml
View File

@ -2,21 +2,19 @@ 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 # 是否将自己注册到配置中心，让其他服务发现调用（本地调试使用）
register-enabled: true
namespace: f23c13d4-0935-42e0-850e-a2216125f2ae
server-addr: 172.20.19.130:18848
server-addr: 192.168.1.129:18848
username: nacosDev1
password: nacosDev1
# 开启健康监控
management:
endpoints:
@ -40,4 +38,3 @@ management:
# 日志
#logging:
# file: /application/applogs/admin.log

4
mosty-yszx/mosty-yszx.iml
View File

@ -17,10 +17,10 @@
<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="1747276765359" />
<entry key="lastExternalPluginCheckTime" value="1757036647255" />
</map>
</option>
<option name="version" value="13" />
<option name="version" value="15" />
</configuration>
</facet>
</component>

24
mosty-yszx/src/main/resources/application.yml
View File

@ -1,6 +1,7 @@
ribbon:
ReadTimeout: 600000
ConnectTimeout: 600000
spring:
servlet:
multipart:
@ -9,15 +10,12 @@ spring:
jackson:
serialization:
write-dates-as-timestamps: false
# # 格式化返回时间 yyyy-MM-dd HH:mm:ss
# 格式化返回时间 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
url: jdbc:mysql://172.20.19.130:33306/mosty_yszx?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://192.168.1.129:33306/mosty_yszx?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
username: mostyDB1
password: mostyDBMysql1
hikari:
@ -28,23 +26,10 @@ spring:
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
redis:
database: 1
# Redis服务器地址
host: 172.20.19.130
host: 192.168.1.129
# Redis服务器连接端口
port: 63799
# Redis服务器连接密码（默认为空）
@ -78,6 +63,7 @@ magic-api:
datasource:
response-code:
success: 10000
exclude:
pathPatterns:
swagger:

9
mosty-yszx/src/main/resources/bootstrap.yml
View File

@ -2,21 +2,19 @@ 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 # 是否将自己注册到配置中心，让其他服务发现调用（本地调试使用）
register-enabled: true
namespace: f23c13d4-0935-42e0-850e-a2216125f2ae
server-addr: 172.20.19.130:18848
server-addr: 192.168.1.129:18848
username: nacosDev1
password: nacosDev1
# 开启健康监控
management:
endpoints:
@ -40,4 +38,3 @@ management:
# 日志
#logging:
# file: /application/applogs/admin.log