init

.idea/compiler.xml

@@ -12,19 +12,9 @@
         <module name="leisp-generator" />
         <module name="leisp-system" />
         <module name="mybusiness" />
-        <module name="leisp-framework" />
         <module name="leisp-common" />
+        <module name="leisp-framework" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="leisp" target="1.8" />
-      <module name="leisp-admin" target="1.8" />
-      <module name="leisp-common" target="1.8" />
-      <module name="leisp-framework" target="1.8" />
-      <module name="leisp-generator" target="1.8" />
-      <module name="leisp-quartz" target="1.8" />
-      <module name="leisp-system" target="1.8" />
-      <module name="mybusiness" target="1.8" />
-    </bytecodeTargetLevel>
   </component>
 </project>

.idea/encodings.xml

@@ -1,17 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
+    <file url="file://$APPLICATION_HOME_DIR$/jbr/bin/src/main/java" charset="UTF-8" />
+    <file url="file://$APPLICATION_HOME_DIR$/jbr/bin/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/leiSP-admin" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/leiSP-admin/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/leiSP-admin/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/leiSP-common" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/leiSP-common/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/leiSP-common/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/leiSP-framework" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/leiSP-framework/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/leiSP-framework/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/leiSP-generator" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/leiSP-generator/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/leiSP-generator/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/leiSP-quartz" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/leiSP-quartz/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/leiSP-quartz/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/leiSP-system" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/leiSP-system/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/leiSP-system/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/mybusiness" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/mybusiness/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/mybusiness/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
   </component>
 </project>

.idea/jarRepositories.xml

@@ -4,6 +4,16 @@
     <remote-repository>
       <option name="id" value="public" />
       <option name="name" value="aliyun nexus" />
+      <option name="url" value="http://116.142.80.13:43000/repository/maven-public" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="public" />
+      <option name="name" value="aliyun nexus" />
       <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
     </remote-repository>
     <remote-repository>
@@ -12,6 +22,11 @@
       <option name="url" value="https://repo1.maven.org/maven2" />
     </remote-repository>
     <remote-repository>
+      <option name="id" value="maven-snapshots" />
+      <option name="name" value="maven-snapshots" />
+      <option name="url" value="http://116.142.80.13:43000/repository/maven-public" />
+    </remote-repository>
+    <remote-repository>
       <option name="id" value="jboss.community" />
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
@@ -21,5 +36,15 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://116.142.80.13:43000/repository/maven-public" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven-releases" />
+      <option name="name" value="maven-releases" />
+      <option name="url" value="http://116.142.80.13:43000/repository/maven-public" />
+    </remote-repository>
   </component>
 </project>

.idea/misc.xml

@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ASMSmaliIdeaPluginConfiguration">
+    <asm skipDebug="true" skipFrames="true" skipCode="false" expandFrames="false" />
+    <groovy codeStyle="LEGACY" />
+  </component>
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$/leiSP-admin" />
   </component>
@@ -7,8 +12,9 @@
     <option name="originalFiles">
       <list>
         <option value="$PROJECT_DIR$/pom.xml" />
+        <option value="$PROJECT_DIR$/leiSP-admin/pom.xml" />
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
 </project>

.idea/modules.xml

@@ -2,7 +2,6 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/leisp.iml" filepath="$PROJECT_DIR$/leisp.iml" />
       <module fileurl="file://$PROJECT_DIR$/leiSP-admin/leisp-admin.iml" filepath="$PROJECT_DIR$/leiSP-admin/leisp-admin.iml" />
       <module fileurl="file://$PROJECT_DIR$/leiSP-common/leisp-common.iml" filepath="$PROJECT_DIR$/leiSP-common/leisp-common.iml" />
       <module fileurl="file://$PROJECT_DIR$/leiSP-framework/leisp-framework.iml" filepath="$PROJECT_DIR$/leiSP-framework/leisp-framework.iml" />

.idea/workspace.xml

@@ -16,9 +16,149 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="8156d097-e993-444c-b926-c0b4dabf8b50" name="Default Changelist" comment="辅助决策-绩效考核-搜索BUG修复">
-      <change beforePath="$PROJECT_DIR$/.idea/artifacts/leisp_admin_war_exploded.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/leisp_admin_war_exploded.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
+    <list default="true" id="8156d097-e993-444c-b926-c0b4dabf8b50" name="Default Changelist" comment="SQL优化">
+      <change beforePath="$PROJECT_DIR$/.idea/artifacts/leisp_admin_war.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/artifacts/leisp_admin_war_exploded.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_1_1_14.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_14.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_fasterxml_classmate_1_4_0.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_7.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_7.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_7.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_7.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_7.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_0.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_oshi_oshi_core_3_9_1.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_4.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_5.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_5.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_theborakompanioni_thymeleaf_extras_shiro_2_0_0.xml" beforeDir="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_google_guava_guava_20_0.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_11.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_3_2_0.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_5.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__eu_bitwalker_UserAgentUtils_1_19.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_lettuce_lettuce_core_5_1_3_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_buffer_4_1_31_Final.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_4_1_31_Final.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_common_4_1_31_Final.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_handler_4_1_31_Final.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_resolver_4_1_31_Final.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_4_1_31_Final.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_projectreactor_reactor_core_3_2_3_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_21.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_models_1_5_21.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_13.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_5.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_java_dev_jna_jna_4_5_2.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_java_dev_jna_jna_platform_4_5_2.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml" beforeDir="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_lang3_3_8_1.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_6_0.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_1.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_1.xml" beforeDir="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_ooxml_3_17.xml" beforeDir="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_shiro_shiro_cache_1_5_3.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_5_3.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_5_3.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_5_3.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_5_3.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_5_3.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_5_3.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_5_3.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_5_3.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_5_3.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_5_3.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_5_3.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_13.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_13.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_13.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml" beforeDir="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_aspectj_aspectjweaver_1_9_2.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_13_Final.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_4_6.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_2.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_2.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_2.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_owasp_encoder_encoder_1_2_2.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_16_16.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_0.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_1_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_1_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_1_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_1_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_1_1_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_1_1_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_1_1_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_1_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_1_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_1_1_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_1_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_1_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_1_1_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_3_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_1_3_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_1_3_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_1_3_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_1_3_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_1_3_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_3_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_1_3_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_1_3_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_3_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_3_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_messaging_5_1_3_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_oxm_5_1_3_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_1_3_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_1_3_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_3_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_websocket_5_1_3_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_2_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_11_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_11_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2021-10-21_17_05__Default_Changelist_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2021-10-21_17_05__Default_Changelist_.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_3_2_0002_17_02__Default_Changelist_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_3_2_0002_17_02__Default_Changelist_.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_3_4_0004_10_36__Default_Changelist_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_3_4_0004_10_36__Default_Changelist_.xml" afterDir="false" />
@@ -28,19 +168,28 @@
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/leiSP-admin/leisp-admin.iml" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-admin/leisp-admin.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/leiSP-admin/src/main/resources/application-druid.yml" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-admin/src/main/resources/application-druid.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/leiSP-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-admin/src/main/resources/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-admin/src/main/resources/templates/login.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/leiSP-common/leisp-common.iml" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-common/leisp-common.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/leiSP-framework/leisp-framework.iml" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-framework/leisp-framework.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/leiSP-generator/leisp-generator.iml" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-generator/leisp-generator.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/leiSP-quartz/leisp-quartz.iml" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-quartz/leisp-quartz.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/leiSP-system/leisp-system.iml" beforeDir="false" afterPath="$PROJECT_DIR$/leiSP-system/leisp-system.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/leisp.iml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/mybusiness/mybusiness.iml" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/mybusiness.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/zhsq_qk/socket/WebSocketConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/zhsq_qk/socket/WebSocketConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/zhsq_qk/fzjc/fzjc.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/zhsq_qk/fzjc/fzjc.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/zhsq_qk/ksh/ksh.html" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/resources/templates/zhsq_qk/ksh/ksh.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/projectFile/人口信息采集模板.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/projectFile/人口信息采集模板.xlsx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/static/supermap/examples/data/car.csv" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/static/supermap/examples/data/chinaEarthquake.csv" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/static/supermap/examples/data/deck.gl/earthquakes_data.csv" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/static/supermap/examples/data/deck.gl/strees_data.csv" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/static/supermap/examples/data/flightpath.txt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/static/supermap/examples/data/nyc-taxi.csv" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/static/supermap/examples/data/nyc_taxi_18W.csv" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/static/supermap/examples/leaflet/img/getFeatureByAggregation.gif" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/static/supermap/libs/admin-lte/img/photo4.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/static/supermap/libs/iclient8c/examples/images/animationTrain.gif" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mybusiness/src/main/resources/static/supermap/libs/iclient8c/examples/images/utfgridTopic.gif" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/projectFile/项目全部文档/3设计阶段/原型设计/可视化/街道-统计本街道.html" beforeDir="false" afterPath="$PROJECT_DIR$/projectFile/项目全部文档/3设计阶段/原型设计/可视化/街道-统计本街道.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/projectFile/项目全部文档/4编码阶段/使用说明书/智慧社区培训视频.mp4" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/projectFile/项目全部文档/4编码阶段/使用说明书/汽开区智慧社区平台操作手册.docx" beforeDir="false" />
     </list>
     <list id="0e70e3be-bb5d-4567-a470-df825bc58825" name="No Changelist" comment="No Changelist" />
     <option name="SHOW_DIALOG" value="false" />
@@ -64,16 +213,29 @@
     </option>
   </component>
   <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="helingeer" />
+      </map>
+    </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
     <option name="RESET_MODE" value="MIXED" />
   </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
-        <option name="mavenHome" value="D:\JetBrains\IntelliJ IDEA 2020.2.2\plugins\maven\lib\maven3" />
+        <option name="localRepository" value="D:\软件\apache-maven-3.6.0\repo" />
+        <option name="mavenHome" value="$PROJECT_DIR$/../../../../../软件/apache-maven-3.6.0" />
+        <option name="userSettingsFile" value="D:\软件\apache-maven-3.6.0\conf\settings.xml" />
       </MavenGeneralSettings>
     </option>
   </component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 0
+}</component>
   <component name="ProjectId" id="1zhnXRus9cNhsg4ZnOKL7XxKE3R" />
   <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="2" id="Add" />
@@ -82,38 +244,39 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">
-    <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
-    <property name="DefaultHtmlFileTemplate" value="HTML File" />
-    <property name="Downloaded.Files.Path.Enabled" value="false" />
-    <property name="Repository.Attach.Annotations" value="false" />
-    <property name="Repository.Attach.JavaDocs" value="false" />
-    <property name="Repository.Attach.Sources" value="false" />
-    <property name="RequestMappingsPanelOrder0" value="0" />
-    <property name="RequestMappingsPanelOrder1" value="1" />
-    <property name="RequestMappingsPanelWidth0" value="75" />
-    <property name="RequestMappingsPanelWidth1" value="75" />
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="SearchEverywhereHistoryKey" value="Applic&#9;FILE&#9;file://D:/D/Workspaces/workspaces_Idea/zhsq/zhsq_qk/leiSP-admin/src/main/resources/application-druid.yml" />
-    <property name="ToolWindowGit.ShowToolbar" value="false" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../一体化合版/sooka_onest_forestfire_vue_management" />
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
-    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="nodejs_package_manager_path" value="npm" />
-    <property name="project.structure.last.edited" value="Libraries" />
-    <property name="project.structure.proportion" value="0.0" />
-    <property name="project.structure.side.proportion" value="0.3505747" />
-    <property name="restartRequiresConfirmation" value="false" />
-    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
-    <property name="vue.rearranger.settings.migration" value="true" />
-  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RequestMappingsPanelOrder0": "0",
+    "RequestMappingsPanelOrder1": "1",
+    "RequestMappingsPanelWidth0": "75",
+    "RequestMappingsPanelWidth1": "75",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "WebServerToolWindowFactoryState": "false",
+    "git-widget-placeholder": "master",
+    "last_opened_file_path": "D:/项目/运维/汽开区网格化/4编码阶段/zhsq_qk/leiSP-admin/pom.xml",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "project.structure.last.edited": "Facet",
+    "project.structure.proportion": "0.15",
+    "project.structure.side.proportion": "0.27126437",
+    "settings.editor.selected.configurable": "MavenSettings",
+    "vue.rearranger.settings.migration": "true"
+  }
+}]]></component>
   <component name="ReactorSettings">
     <option name="notificationShown" value="true" />
   </component>
   <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\项目\汽开区网格化\200GIT\zhsq_qk\leiSP-admin\src\main\resources\templates\system\mobile" />
+      <recent name="D:\项目\汽开区网格化\200GIT\zhsq_qk\leiSP-admin\src\main\java\com\sooka\web\controller\system" />
+      <recent name="D:\项目\汽开区网格化\200GIT\zhsq_qk\leiSP-system\src\main\resources\mapper\system" />
+      <recent name="D:\项目\汽开区网格化\200GIT\zhsq_qk\leiSP-system\src\main\java\com\sooka\system\mapper" />
+      <recent name="D:\项目\汽开区网格化\200GIT\zhsq_qk\leiSP-system\src\main\java\com\sooka\system\service" />
+    </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="D:\项目\汽开区网格化\200GIT\zhsq_qk\leiSP-admin\src\main\resources\templates\system\mobile" />
       <recent name="D:\项目\汽开区网格化\zhsq_qk\leiSP-admin\src\main\resources\static\bigdata\fzjc\js" />
@@ -128,13 +291,6 @@
       <recent name="com.business.zhsq_qk.eventRank.service.impl" />
       <recent name="com.business.zhsq_qk.eventRank.domain" />
     </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="D:\项目\汽开区网格化\200GIT\zhsq_qk\leiSP-admin\src\main\resources\templates\system\mobile" />
-      <recent name="D:\项目\汽开区网格化\200GIT\zhsq_qk\leiSP-admin\src\main\java\com\sooka\web\controller\system" />
-      <recent name="D:\项目\汽开区网格化\200GIT\zhsq_qk\leiSP-system\src\main\resources\mapper\system" />
-      <recent name="D:\项目\汽开区网格化\200GIT\zhsq_qk\leiSP-system\src\main\java\com\sooka\system\mapper" />
-      <recent name="D:\项目\汽开区网格化\200GIT\zhsq_qk\leiSP-system\src\main\java\com\sooka\system\service" />
-    </key>
   </component>
   <component name="RunManager" selected="Spring Boot.LeispApplication">
     <configuration name="EndTimeUtil" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
@@ -210,22 +366,13 @@
       </method>
     </configuration>
     <list>
-      <item itemvalue="Application.EndTimeUtil" />
-      <item itemvalue="Application.PagerTester" />
-      <item itemvalue="Application.RenderUtil" />
-      <item itemvalue="Application.Test" />
-      <item itemvalue="Application.test" />
       <item itemvalue="Spring Boot.LeispApplication" />
+      <item itemvalue="应用程序.EndTimeUtil" />
+      <item itemvalue="应用程序.PagerTester" />
+      <item itemvalue="应用程序.RenderUtil" />
+      <item itemvalue="应用程序.Test" />
+      <item itemvalue="应用程序.test" />
     </list>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Application.test" />
-        <item itemvalue="Application.PagerTester" />
-        <item itemvalue="Application.RenderUtil" />
-        <item itemvalue="Application.EndTimeUtil" />
-        <item itemvalue="Application.Test" />
-      </list>
-    </recent_temporary>
   </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SvnConfiguration">
@@ -443,76 +590,79 @@
       <workItem from="1664154694613" duration="11000" />
       <workItem from="1664154710704" duration="1824000" />
       <workItem from="1665211570524" duration="1917000" />
-    </task>
-    <task id="LOCAL-00067" summary="绩效考核统计-修改因项目后缀引发的404问题，修改人员和社区统计">
-      <created>1645844589097</created>
-      <option name="number" value="00067" />
-      <option name="presentableId" value="LOCAL-00067" />
-      <option name="project" value="LOCAL" />
-      <updated>1645844589098</updated>
-    </task>
-    <task id="LOCAL-00068" summary="绩效考核统计-修改因项目后缀引发的404问题，修改人员和社区统计">
-      <created>1646010914322</created>
-      <option name="number" value="00068" />
-      <option name="presentableId" value="LOCAL-00068" />
-      <option name="project" value="LOCAL" />
-      <updated>1646010914323</updated>
-    </task>
-    <task id="LOCAL-00069" summary="修复按钮不显示的问题">
-      <created>1646034686280</created>
-      <option name="number" value="00069" />
-      <option name="presentableId" value="LOCAL-00069" />
-      <option name="project" value="LOCAL" />
-      <updated>1646034686280</updated>
-    </task>
-    <task id="LOCAL-00070" summary="数据孪生 弹出页面">
-      <created>1646122851631</created>
-      <option name="number" value="00070" />
-      <option name="presentableId" value="LOCAL-00070" />
-      <option name="project" value="LOCAL" />
-      <updated>1646122851631</updated>
-    </task>
-    <task id="LOCAL-00071" summary="数据孪生 弹出页面">
-      <created>1646122897369</created>
-      <option name="number" value="00071" />
-      <option name="presentableId" value="LOCAL-00071" />
-      <option name="project" value="LOCAL" />
-      <updated>1646122897369</updated>
-    </task>
-    <task id="LOCAL-00072" summary="数据孪生-事件落点BUG修复">
-      <created>1646185904175</created>
-      <option name="number" value="00072" />
-      <option name="presentableId" value="LOCAL-00072" />
-      <option name="project" value="LOCAL" />
-      <updated>1646185904176</updated>
-    </task>
-    <task id="LOCAL-00073" summary="数据孪生-事件落点BUG修复">
-      <created>1646205629278</created>
-      <option name="number" value="00073" />
-      <option name="presentableId" value="LOCAL-00073" />
-      <option name="project" value="LOCAL" />
-      <updated>1646205629278</updated>
-    </task>
-    <task id="LOCAL-00074" summary="党组织活动信息附件BUG修复">
-      <created>1646215330900</created>
-      <option name="number" value="00074" />
-      <option name="presentableId" value="LOCAL-00074" />
-      <option name="project" value="LOCAL" />
-      <updated>1646215330900</updated>
-    </task>
-    <task id="LOCAL-00075" summary="活动宣传信息管理 保存bug修复">
-      <created>1646270796217</created>
-      <option name="number" value="00075" />
-      <option name="presentableId" value="LOCAL-00075" />
-      <option name="project" value="LOCAL" />
-      <updated>1646270796217</updated>
-    </task>
-    <task id="LOCAL-00076" summary="事件导出问题修复">
-      <created>1646298568479</created>
-      <option name="number" value="00076" />
-      <option name="presentableId" value="LOCAL-00076" />
-      <option name="project" value="LOCAL" />
-      <updated>1646298568479</updated>
+      <workItem from="1665218481202" duration="1390000" />
+      <workItem from="1665276797635" duration="597000" />
+      <workItem from="1665294493144" duration="1561000" />
+      <workItem from="1665366634939" duration="5000" />
+      <workItem from="1665473581408" duration="3476000" />
+      <workItem from="1665983438578" duration="634000" />
+      <workItem from="1666005359317" duration="7905000" />
+      <workItem from="1666141129717" duration="591000" />
+      <workItem from="1666590048283" duration="7023000" />
+      <workItem from="1666744533412" duration="16000" />
+      <workItem from="1675233894763" duration="4568000" />
+      <workItem from="1675299450339" duration="640000" />
+      <workItem from="1680245664695" duration="1675000" />
+      <workItem from="1680424128019" duration="1000" />
+      <workItem from="1681095605834" duration="599000" />
+      <workItem from="1681174665820" duration="343000" />
+      <workItem from="1681183761152" duration="1213000" />
+      <workItem from="1681354167952" duration="346000" />
+      <workItem from="1681697763218" duration="252000" />
+      <workItem from="1683179404754" duration="5731000" />
+      <workItem from="1683247530606" duration="14072000" />
+      <workItem from="1683333916453" duration="2759000" />
+      <workItem from="1683349875727" duration="6006000" />
+      <workItem from="1683507463032" duration="150000" />
+      <workItem from="1683514609414" duration="3228000" />
+      <workItem from="1683596734529" duration="4119000" />
+      <workItem from="1683679880360" duration="1696000" />
+      <workItem from="1683695391263" duration="2407000" />
+      <workItem from="1683766543290" duration="14916000" />
+      <workItem from="1684294186044" duration="2025000" />
+      <workItem from="1684552757744" duration="1819000" />
+      <workItem from="1684750195610" duration="1173000" />
+      <workItem from="1684824458847" duration="1245000" />
+      <workItem from="1685681742283" duration="605000" />
+      <workItem from="1692674384410" duration="3684000" />
+      <workItem from="1692751696411" duration="1816000" />
+      <workItem from="1693875001409" duration="2153000" />
+      <workItem from="1693962379065" duration="1300000" />
+      <workItem from="1693971256177" duration="5501000" />
+      <workItem from="1694049703636" duration="594000" />
+      <workItem from="1695777850750" duration="604000" />
+      <workItem from="1695793828548" duration="5042000" />
+      <workItem from="1695862264796" duration="10107000" />
+      <workItem from="1696644659297" duration="19953000" />
+      <workItem from="1696726902825" duration="19820000" />
+      <workItem from="1696820259316" duration="3965000" />
+      <workItem from="1696985303732" duration="3828000" />
+      <workItem from="1696992309798" duration="3395000" />
+      <workItem from="1697159877005" duration="2243000" />
+      <workItem from="1697592804382" duration="1146000" />
+      <workItem from="1697763492296" duration="74000" />
+      <workItem from="1700617021225" duration="2272000" />
+      <workItem from="1702433435811" duration="3074000" />
+      <workItem from="1702529607323" duration="3627000" />
+      <workItem from="1702865320902" duration="1186000" />
+      <workItem from="1702961227778" duration="594000" />
+      <workItem from="1703039127585" duration="594000" />
+      <workItem from="1703817482365" duration="1253000" />
+      <workItem from="1704259358571" duration="588000" />
+      <workItem from="1704423060079" duration="595000" />
+      <workItem from="1704508429541" duration="594000" />
+      <workItem from="1704525800392" duration="594000" />
+      <workItem from="1704676059498" duration="586000" />
+      <workItem from="1705367301117" duration="593000" />
+      <workItem from="1705469703416" duration="1924000" />
+      <workItem from="1712113065592" duration="617000" />
+      <workItem from="1712545421731" duration="777000" />
+      <workItem from="1712799835808" duration="3895000" />
+      <workItem from="1712883284391" duration="2465000" />
+      <workItem from="1713229808099" duration="722000" />
+      <workItem from="1713422942429" duration="599000" />
+      <workItem from="1713487305191" duration="600000" />
+      <workItem from="1717460891754" duration="1721000" />
     </task>
     <task id="LOCAL-00077" summary="事件导出问题修复">
       <created>1646299011038</created>
@@ -787,7 +937,77 @@
       <option name="project" value="LOCAL" />
       <updated>1664154782084</updated>
     </task>
-    <option name="localTasksCounter" value="116" />
+    <task id="LOCAL-00116" summary="修改平台title">
+      <created>1675237897137</created>
+      <option name="number" value="00116" />
+      <option name="presentableId" value="LOCAL-00116" />
+      <option name="project" value="LOCAL" />
+      <updated>1675237897137</updated>
+    </task>
+    <task id="LOCAL-00117" summary="SQL优化">
+      <created>1683270778148</created>
+      <option name="number" value="00117" />
+      <option name="presentableId" value="LOCAL-00117" />
+      <option name="project" value="LOCAL" />
+      <updated>1683270778148</updated>
+    </task>
+    <task id="LOCAL-00118" summary="SQL优化">
+      <created>1683786335194</created>
+      <option name="number" value="00118" />
+      <option name="presentableId" value="LOCAL-00118" />
+      <option name="project" value="LOCAL" />
+      <updated>1683786335194</updated>
+    </task>
+    <task id="LOCAL-00119" summary="SQL优化">
+      <created>1683788365439</created>
+      <option name="number" value="00119" />
+      <option name="presentableId" value="LOCAL-00119" />
+      <option name="project" value="LOCAL" />
+      <updated>1683788365439</updated>
+    </task>
+    <task id="LOCAL-00120" summary="SQL优化">
+      <created>1683791781819</created>
+      <option name="number" value="00120" />
+      <option name="presentableId" value="LOCAL-00120" />
+      <option name="project" value="LOCAL" />
+      <updated>1683791781819</updated>
+    </task>
+    <task id="LOCAL-00121" summary="代码优化">
+      <created>1693977996217</created>
+      <option name="number" value="00121" />
+      <option name="presentableId" value="LOCAL-00121" />
+      <option name="project" value="LOCAL" />
+      <updated>1693977996218</updated>
+    </task>
+    <task id="LOCAL-00122" summary="SQL优化">
+      <created>1693979807226</created>
+      <option name="number" value="00122" />
+      <option name="presentableId" value="LOCAL-00122" />
+      <option name="project" value="LOCAL" />
+      <updated>1693979807226</updated>
+    </task>
+    <task id="LOCAL-00123" summary="BUG修复">
+      <created>1696736144790</created>
+      <option name="number" value="00123" />
+      <option name="presentableId" value="LOCAL-00123" />
+      <option name="project" value="LOCAL" />
+      <updated>1696736144790</updated>
+    </task>
+    <task id="LOCAL-00124" summary="修复 特殊人群数量查询bug">
+      <created>1696992722504</created>
+      <option name="number" value="00124" />
+      <option name="presentableId" value="LOCAL-00124" />
+      <option name="project" value="LOCAL" />
+      <updated>1696992722504</updated>
+    </task>
+    <task id="LOCAL-00125" summary="和林分支">
+      <created>1702434728513</created>
+      <option name="number" value="00125" />
+      <option name="presentableId" value="LOCAL-00125" />
+      <option name="project" value="LOCAL" />
+      <updated>1702434728514</updated>
+    </task>
+    <option name="localTasksCounter" value="126" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -809,7 +1029,6 @@
         <entry key="1">
           <value>
             <State>
-              <option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
               <option name="FILTERS">
                 <map>
                   <entry key="branch">
@@ -828,6 +1047,7 @@
                   </entry>
                 </map>
               </option>
+              <option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
             </State>
           </value>
         </entry>
@@ -860,22 +1080,35 @@
             <State />
           </value>
         </entry>
+        <entry key="cf5d0d5b-9231-473f-ac2e-d6ea609b958d">
+          <value>
+            <State>
+              <option name="FILTERS">
+                <map>
+                  <entry key="branch">
+                    <value>
+                      <list>
+                        <option value="HEAD" />
+                      </list>
+                    </value>
+                  </entry>
+                  <entry key="roots">
+                    <value>
+                      <list>
+                        <option value="$PROJECT_DIR$" />
+                      </list>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+              <option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
+            </State>
+          </value>
+        </entry>
       </map>
     </option>
-    <option name="OPEN_GENERIC_TABS">
-      <map>
-        <entry key="1" value="TOOL_WINDOW" />
-      </map>
-    </option>
-    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="活动宣传信息管理 保存bug修复" />
-    <MESSAGE value="事件导出问题修复" />
-    <MESSAGE value="BUG修复" />
-    <MESSAGE value="楼栋去数据集和建筑物ID" />
-    <MESSAGE value="选择事件坐标" />
-    <MESSAGE value="任务下派可以上传图片" />
     <MESSAGE value="党组织活动图片BUG修复" />
     <MESSAGE value="增加事件落点状态" />
     <MESSAGE value="SOCKET自动更新数据" />
@@ -895,96 +1128,15 @@
     <MESSAGE value="轮播维护" />
     <MESSAGE value="党群通知公告" />
     <MESSAGE value="辅助决策-绩效考核-搜索BUG修复" />
-    <option name="LAST_COMMIT_MESSAGE" value="辅助决策-绩效考核-搜索BUG修复" />
-  </component>
-  <component name="WindowStateProjectService">
-    <state x="488" y="69" key="#com.intellij.ide.util.MemberChooser" timestamp="1657504092163">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state x="488" y="69" key="#com.intellij.ide.util.MemberChooser/0.0.1366.728@0.0.1366.728" timestamp="1657504092163" />
-    <state width="503" height="466" key="DebuggerActiveHint" timestamp="1657506111481">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state width="503" height="466" key="DebuggerActiveHint/0.0.1366.728@0.0.1366.728" timestamp="1657506111481" />
-    <state x="129" y="55" width="1092" height="610" maximized="true" key="DiffContextDialog" timestamp="1664155431256">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state x="129" y="55" width="1092" height="610" maximized="true" key="DiffContextDialog/0.0.1366.728@0.0.1366.728" timestamp="1664155431256" />
-    <state x="463" y="119" key="FileChooserDialogImpl" timestamp="1663985833390">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state x="463" y="119" key="FileChooserDialogImpl/0.0.1366.728@0.0.1366.728" timestamp="1663985833390" />
-    <state width="1323" height="343" key="GridCell.Tab.0.bottom" timestamp="1663991564518">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state width="1323" height="343" key="GridCell.Tab.0.bottom/0.0.1366.728@0.0.1366.728" timestamp="1663991564518" />
-    <state width="1323" height="343" key="GridCell.Tab.0.center" timestamp="1663991564518">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state width="1323" height="343" key="GridCell.Tab.0.center/0.0.1366.728@0.0.1366.728" timestamp="1663991564518" />
-    <state width="1323" height="343" key="GridCell.Tab.0.left" timestamp="1663991564518">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state width="1323" height="343" key="GridCell.Tab.0.left/0.0.1366.728@0.0.1366.728" timestamp="1663991564518" />
-    <state width="1323" height="343" key="GridCell.Tab.0.right" timestamp="1663991564518">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state width="1323" height="343" key="GridCell.Tab.0.right/0.0.1366.728@0.0.1366.728" timestamp="1663991564518" />
-    <state width="1323" height="343" key="GridCell.Tab.1.bottom" timestamp="1663991564518">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state width="1323" height="343" key="GridCell.Tab.1.bottom/0.0.1366.728@0.0.1366.728" timestamp="1663991564518" />
-    <state width="1323" height="343" key="GridCell.Tab.1.center" timestamp="1663991564518">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state width="1323" height="343" key="GridCell.Tab.1.center/0.0.1366.728@0.0.1366.728" timestamp="1663991564518" />
-    <state width="1323" height="343" key="GridCell.Tab.1.left" timestamp="1663991564518">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state width="1323" height="343" key="GridCell.Tab.1.left/0.0.1366.728@0.0.1366.728" timestamp="1663991564518" />
-    <state width="1323" height="343" key="GridCell.Tab.1.right" timestamp="1663991564518">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state width="1323" height="343" key="GridCell.Tab.1.right/0.0.1366.728@0.0.1366.728" timestamp="1663991564518" />
-    <state width="1323" height="252" key="GridCell.Tab.2.bottom" timestamp="1657506438727">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state width="1323" height="252" key="GridCell.Tab.2.bottom/0.0.1366.728@0.0.1366.728" timestamp="1657506438727" />
-    <state width="1323" height="252" key="GridCell.Tab.2.center" timestamp="1657506438727">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state width="1323" height="252" key="GridCell.Tab.2.center/0.0.1366.728@0.0.1366.728" timestamp="1657506438727" />
-    <state width="1323" height="252" key="GridCell.Tab.2.left" timestamp="1657506438727">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state width="1323" height="252" key="GridCell.Tab.2.left/0.0.1366.728@0.0.1366.728" timestamp="1657506438727" />
-    <state width="1323" height="252" key="GridCell.Tab.2.right" timestamp="1657506438727">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state width="1323" height="252" key="GridCell.Tab.2.right/0.0.1366.728@0.0.1366.728" timestamp="1657506438727" />
-    <state x="275" y="97" key="Vcs.Push.Dialog.v2" timestamp="1664155784713">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state x="275" y="97" key="Vcs.Push.Dialog.v2/0.0.1366.728@0.0.1366.728" timestamp="1664155784713" />
-    <state x="385" y="96" width="849" height="560" key="find.popup" timestamp="1663985531912">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state x="385" y="96" width="849" height="560" key="find.popup/0.0.1366.728@0.0.1366.728" timestamp="1663985531912" />
-    <state x="466" y="263" key="git4idea.remote.GitConfigureRemotesDialog" timestamp="1665211587814">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state x="466" y="263" key="git4idea.remote.GitConfigureRemotesDialog/0.0.1366.728@0.0.1366.728" timestamp="1665211587814" />
-    <state x="346" y="49" width="672" height="678" key="search.everywhere.popup" timestamp="1663986857409">
-      <screen x="0" y="0" width="1366" height="728" />
-    </state>
-    <state x="346" y="49" width="672" height="678" key="search.everywhere.popup/0.0.1366.728@0.0.1366.728" timestamp="1663986857409" />
+    <MESSAGE value="修改平台title" />
+    <MESSAGE value="代码优化" />
+    <MESSAGE value="SQL优化" />
+    <MESSAGE value="BUG修复" />
+    <MESSAGE value="修复 特殊人群数量查询bug" />
+    <MESSAGE value="和林分支" />
+    <option name="LAST_COMMIT_MESSAGE" value="和林分支" />
   </component>
   <component name="XDebuggerManager">
-    <pin-to-top-manager>
-      <pinned-members>
-        <PinnedItemInfo parentTag="org.apache.shiro.subject.support.DelegatingSubject$StoppingAwareProxiedSession" memberName="delegate" />
-      </pinned-members>
-    </pin-to-top-manager>
     <watches-manager>
       <configuration name="SpringBootApplicationConfigurationType">
         <watch expression="list.get(0).rulelogDeptName" />
@@ -993,4 +1145,7 @@
       </configuration>
     </watches-manager>
   </component>
+  <component name="com.intellij.coverage.CoverageDataManagerImpl">
+    <SUITE FILE_PATH="coverage/zhsq_qk$LeispApplication.ic" NAME="LeispApplication Coverage Results" MODIFIED="1665219728400" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
+  </component>
 </project>

leiSP-admin/src/main/resources/application-druid.yml

@@ -21,16 +21,9 @@ spring:
         druid:
             # 主库数据源
             master:
-#                url: jdbc:mysql://121.37.83.100:53306/zhsq_qk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8&useSSL=false
-#                username: limeng
-#                password: limeng123456
-                url: jdbc:mysql://127.0.0.1:3306/zhsq_qk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8&useSSL=false
+                url: jdbc:mysql://192.168.10.15:63306/zhsq_qk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8&useSSL=false
                 username: root
-#                pasword: sys200888
-#                password: 1a2b3c!
-#                url: jdbc:mysql://192.168.0.144:3306/zhsq_qk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8&useSSL=false
-#                username: root
-                password: 123456
+                password: sooka1a2b3c4d%...
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

mybusiness/pom.xml

@@ -78,18 +78,13 @@
             <artifactId>leisp-quartz</artifactId>
         </dependency>
 
+
         <!-- 代码生成-->
         <dependency>
             <groupId>com.leisp</groupId>
             <artifactId>leisp-generator</artifactId>
         </dependency>
 
-        <!-- 业务依赖 -->
-        <dependency>
-            <groupId>com.leisp</groupId>
-            <artifactId>mybusiness</artifactId>
-        </dependency>
-
         <!-- lombok-->
         <dependency>
             <groupId>org.projectlombok</groupId>