wumei-smart-master/.idea/compiler.xml
@@ -15,27 +15,17 @@ <module name="wumei-admin" /> </profile> </annotationProcessing> <bytecodeTargetLevel> <module name="wumei" target="1.8" /> <module name="wumei-admin" target="1.8" /> <module name="wumei-common" target="1.8" /> <module name="wumei-framework" target="1.8" /> <module name="wumei-generator" target="1.8" /> <module name="wumei-iot" target="1.8" /> <module name="wumei-quartz" target="1.8" /> <module name="wumei-system" target="1.8" /> </bytecodeTargetLevel> </component> <component name="JavacSettings"> <option name="ADDITIONAL_OPTIONS_OVERRIDE"> <module name="wumei" options="-bootclasspath "C:/Program Files/Java/jdk1.8.0_131/jre/lib/rt.jar;C:/Program Files/Java/jdk1.8.0_131/jre/lib/jce.jar"" /> <module name="wumei-admin" options="-bootclasspath "C:/Program Files/Java/jdk1.8.0_131/jre/lib/rt.jar;C:/Program Files/Java/jdk1.8.0_131/jre/lib/jce.jar"" /> <module name="wumei-common" options="-bootclasspath "C:/Program Files/Java/jdk1.8.0_131/jre/lib/rt.jar;C:/Program Files/Java/jdk1.8.0_131/jre/lib/jce.jar"" /> <module name="wumei-framework" options="-bootclasspath "C:/Program Files/Java/jdk1.8.0_131/jre/lib/rt.jar;C:/Program Files/Java/jdk1.8.0_131/jre/lib/jce.jar"" /> <module name="wumei-generator" options="-bootclasspath "C:/Program Files/Java/jdk1.8.0_131/jre/lib/rt.jar;C:/Program Files/Java/jdk1.8.0_131/jre/lib/jce.jar"" /> <module name="wumei-iot" options="-bootclasspath "C:/Program Files/Java/jdk1.8.0_131/jre/lib/rt.jar;C:/Program Files/Java/jdk1.8.0_131/jre/lib/jce.jar"" /> <module name="wumei-quartz" options="-bootclasspath "C:/Program Files/Java/jdk1.8.0_131/jre/lib/rt.jar;C:/Program Files/Java/jdk1.8.0_131/jre/lib/jce.jar"" /> <module name="wumei-system" options="-bootclasspath "C:/Program Files/Java/jdk1.8.0_131/jre/lib/rt.jar;C:/Program Files/Java/jdk1.8.0_131/jre/lib/jce.jar"" /> <module name="wumei" options="-bootclasspath "C:/Program Files/Java/jdk1.8.0_144/jre/lib/rt.jar;C:/Program Files/Java/jdk1.8.0_144/jre/lib/jce.jar"" /> <module name="wumei-admin" options="-bootclasspath "C:/Program Files/Java/jdk1.8.0_144/jre/lib/rt.jar;C:/Program Files/Java/jdk1.8.0_144/jre/lib/jce.jar"" /> <module name="wumei-common" options="-bootclasspath "C:/Program Files/Java/jdk1.8.0_144/jre/lib/rt.jar;C:/Program Files/Java/jdk1.8.0_144/jre/lib/jce.jar"" /> <module name="wumei-framework" options="-bootclasspath "C:/Program Files/Java/jdk1.8.0_144/jre/lib/rt.jar;C:/Program Files/Java/jdk1.8.0_144/jre/lib/jce.jar"" /> <module name="wumei-generator" options="-bootclasspath "C:/Program Files/Java/jdk1.8.0_144/jre/lib/rt.jar;C:/Program Files/Java/jdk1.8.0_144/jre/lib/jce.jar"" /> <module name="wumei-iot" options="-bootclasspath "C:/Program Files/Java/jdk1.8.0_144/jre/lib/rt.jar;C:/Program Files/Java/jdk1.8.0_144/jre/lib/jce.jar"" /> <module name="wumei-quartz" options="-bootclasspath "C:/Program Files/Java/jdk1.8.0_144/jre/lib/rt.jar;C:/Program Files/Java/jdk1.8.0_144/jre/lib/jce.jar"" /> <module name="wumei-system" options="-bootclasspath "C:/Program Files/Java/jdk1.8.0_144/jre/lib/rt.jar;C:/Program Files/Java/jdk1.8.0_144/jre/lib/jce.jar"" /> </option> </component> </project> wumei-smart-master/.idea/jarRepositories.xml
@@ -21,5 +21,10 @@ <option name="name" value="JBoss Community repository" /> <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" /> </remote-repository> <remote-repository> <option name="id" value="central" /> <option name="name" value="Central Repository" /> <option name="url" value="https://maven.aliyun.com/repository/public" /> </remote-repository> </component> </project> wumei-smart-master/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_6.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_6.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_alibaba_druid_1_2_8.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_2_8.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_alibaba_fastjson_1_2_78.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_dtflys_forest_forest_core_1_5_19.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_dtflys_forest_forest_spring_1_5_19.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_dtflys_forest_forest_spring_boot_starter_1_5_19.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_12_5.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_12_5.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_12_5.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_12_5.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_12_5.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_12_5.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_4_2.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_github_oshi_oshi_core_5_8_2.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_3_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_4_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_4_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_1.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_5_1.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_google_guava_guava_30_1_1_jre.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_3.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_google_protobuf_protobuf_java_3_14_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_googlecode_juniversalchardet_juniversalchardet_1_0_3.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_15.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_14_9.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_squareup_okio_okio_1_17_2.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_taosdata_jdbc_taos_jdbcdriver_2_0_38.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_xkcoding_http_simple_http_1_0_5.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__commons_codec_commons_codec_1_15.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__commons_io_commons_io_2_11_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__eu_bitwalker_UserAgentUtils_1_21.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_github_classgraph_classgraph_4_8_83.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_9_1.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_lettuce_lettuce_core_6_1_5_RELEASE.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_netty_netty_buffer_4_1_69_Final.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_netty_netty_codec_4_1_69_Final.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_netty_netty_common_4_1_69_Final.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_netty_netty_handler_4_1_69_Final.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_netty_netty_resolver_4_1_69_Final.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_netty_netty_transport_4_1_69_Final.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_projectreactor_reactor_core_3_4_11.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_springfox_springfox_bean_validators_3_0_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_springfox_springfox_boot_starter_3_0_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_springfox_springfox_core_3_0_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_springfox_springfox_data_rest_3_0_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_springfox_springfox_oas_3_0_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_springfox_springfox_schema_3_0_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_springfox_springfox_spi_3_0_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_springfox_springfox_spring_web_3_0_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_springfox_springfox_spring_webflux_3_0_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_springfox_springfox_spring_webmvc_3_0_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_springfox_springfox_swagger2_3_0_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_springfox_springfox_swagger_common_3_0_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_3_0_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_swagger_core_v3_swagger_annotations_2_1_2.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_swagger_core_v3_swagger_models_2_1_2.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_swagger_swagger_annotations_1_6_2.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__io_swagger_swagger_models_1_6_2.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__me_zhyd_oauth_JustAuth_1_16_5.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_27.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_22.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__net_java_dev_jna_jna_5_9_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__net_java_dev_jna_jna_platform_5_9_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_12_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_9_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_13.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_cache_4_5_13.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_14.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_13.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_14_1.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_14_1.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_54.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_54.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_54.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_3.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_7.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_checkerframework_checker_qual_3_8_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_eclipse_paho_org_eclipse_paho_client_mqttv3_1_2_5.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_2_0_Final.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_java_websocket_Java_WebSocket_1_5_2.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_2_Final.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_mapstruct_mapstruct_1_3_1_Final.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_mybatis_mybatis_3_5_7.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_2_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_2_0.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_2.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_32.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_32.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_5_6.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_5_6.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_processor_2_5_6.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_5_6.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_5_6.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_5_6.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_5_6.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_5_6.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_5_6.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_5_6.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_5_6.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_5_6.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_5_6.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_5_6.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_5_6.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_5_6.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_5_6.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_5_6.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_2_0_0_RELEASE.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_2_0_0_RELEASE.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_security_oauth_spring_security_oauth2_2_5_1_RELEASE.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_security_spring_security_config_5_5_3.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_security_spring_security_core_5_5_3.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_5_3.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_security_spring_security_web_5_5_3.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_spring_aop_5_3_12.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_spring_beans_5_3_12.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_spring_context_5_2_3_RELEASE.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_spring_context_5_3_12.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_12.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_spring_core_5_3_12.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_spring_expression_5_3_12.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_12.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_12.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_spring_oxm_5_3_12.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_spring_tx_5_3_12.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_spring_web_5_3_12.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_12.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_12_RELEASE.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_12_RELEASE.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml
File was deleted wumei-smart-master/.idea/libraries/Maven__org_yaml_snakeyaml_1_28.xml
File was deleted wumei-smart-master/.idea/misc.xml
@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ExternalStorageConfigurationManager" enabled="true" /> <component name="MavenProjectsManager"> <option name="originalFiles"> <list> wumei-smart-master/.idea/modules.xml
@@ -2,15 +2,7 @@ <project version="4"> <component name="ProjectModuleManager"> <modules> <module fileurl="file://$PROJECT_DIR$/springboot/wumei.iml" filepath="$PROJECT_DIR$/springboot/wumei.iml" /> <module fileurl="file://$PROJECT_DIR$/springboot/wumei-admin/wumei-admin.iml" filepath="$PROJECT_DIR$/springboot/wumei-admin/wumei-admin.iml" /> <module fileurl="file://$PROJECT_DIR$/springboot/wumei-common/wumei-common.iml" filepath="$PROJECT_DIR$/springboot/wumei-common/wumei-common.iml" /> <module fileurl="file://$PROJECT_DIR$/springboot/wumei-framework/wumei-framework.iml" filepath="$PROJECT_DIR$/springboot/wumei-framework/wumei-framework.iml" /> <module fileurl="file://$PROJECT_DIR$/springboot/wumei-generator/wumei-generator.iml" filepath="$PROJECT_DIR$/springboot/wumei-generator/wumei-generator.iml" /> <module fileurl="file://$PROJECT_DIR$/springboot/wumei-iot/wumei-iot.iml" filepath="$PROJECT_DIR$/springboot/wumei-iot/wumei-iot.iml" /> <module fileurl="file://$PROJECT_DIR$/springboot/wumei-quartz/wumei-quartz.iml" filepath="$PROJECT_DIR$/springboot/wumei-quartz/wumei-quartz.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/wumei-smart-master.iml" filepath="$PROJECT_DIR$/.idea/wumei-smart-master.iml" /> <module fileurl="file://$PROJECT_DIR$/springboot/wumei-system/wumei-system.iml" filepath="$PROJECT_DIR$/springboot/wumei-system/wumei-system.iml" /> </modules> </component> </project> wumei-smart-master/.idea/vcs.xml
New file @@ -0,0 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="VcsDirectoryMappings"> <mapping directory="$PROJECT_DIR$/.." vcs="Git" /> </component> </project> wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/Alert.java
@@ -43,7 +43,11 @@ private String actions; /** 告警状态 （1-启动，2-停止）**/ @Excel(name = "告警状态") private Integer status; @Excel(name = "消息类型") private String messageType; public Integer getStatus() { return status; @@ -117,6 +121,16 @@ return actions; } public void setMessageType(String messageType) { this.messageType = messageType; } public String getMessageType() { return messageType; } @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -132,6 +146,7 @@ .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) .append("remark", getRemark()) .append("messageType", getMessageType()) .toString(); } } wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/Device.java
@@ -111,6 +111,8 @@ /** * 分派时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "分派时间", width = 30, dateFormat = "yyyy-MM-dd") private Date assignTime; public Integer getLocationWay() { wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/model/DeviceShortOutput.java
@@ -87,6 +87,11 @@ @Excel(name = "激活时间", width = 30, dateFormat = "yyyy-MM-dd") private Date activeTime; /** 分派时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "分派时间", width = 30, dateFormat = "yyyy-MM-dd") private Date assignTime; /** 是否自定义位置 **/ private Integer locationWay; @@ -319,4 +324,14 @@ return activeTime; } public void setAssignTime(Date assignTime) { this.assignTime = assignTime; } public Date getAssignTime() { return assignTime; } } wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java
@@ -966,6 +966,7 @@ Device device = new Device(); device.setTenantId(tenantId); device.setSerialNumber(s.trim()); device.setAssignTime(DateUtils.getNowDate()); return device; }).collect(Collectors.toList()); int i = 0; wumei-smart-master/springboot/wumei-iot/src/main/resources/mapper/iot/AlertMapper.xml
@@ -18,10 +18,11 @@ <result property="updateBy" column="update_by" /> <result property="updateTime" column="update_time" /> <result property="remark" column="remark" /> <result property="messageType" column="message_type" /> </resultMap> <sql id="selectAlertVo"> select alert_id, alert_name, alert_level,status, product_id, product_name, triggers, actions, create_by, create_time, update_by, update_time, remark from iot_alert select alert_id, alert_name, alert_level,status, product_id, product_name, triggers, actions, create_by, create_time, update_by, update_time, remark,message_type from iot_alert </sql> <select id="selectAlertList" parameterType="com.ruoyi.iot.domain.Alert" resultMap="AlertResult"> @@ -55,6 +56,7 @@ <if test="updateBy != null">update_by,</if> <if test="updateTime != null">update_time,</if> <if test="remark != null">remark,</if> <if test="messageType != null">message_type,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="alertName != null and alertName != ''">#{alertName},</if> @@ -69,6 +71,7 @@ <if test="updateBy != null">#{updateBy},</if> <if test="updateTime != null">#{updateTime},</if> <if test="remark != null">#{remark},</if> <if test="messageType != null">#{messageType},</if> </trim> </insert> @@ -87,6 +90,7 @@ <if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateTime != null">update_time = #{updateTime},</if> <if test="remark != null">remark = #{remark},</if> <if test="messageType != null">message_type = #{messageType},</if> </trim> where alert_id = #{alertId} </update> wumei-smart-master/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml
@@ -53,6 +53,7 @@ <result property="thingsModelValue" column="things_model_value" /> <result property="imgUrl" column="img_url" /> <result property="isOwner" column="is_owner" /> <result property="assignTime" column="assign_time" /> </resultMap> <resultMap type="com.ruoyi.iot.model.DeviceAllShortOutput" id="DeviceAllShortResult"> @@ -199,7 +200,7 @@ select d.device_id, d.device_name, d.product_id, d.product_name, d.user_id, d.user_name, d.tenant_id, su.nick_name tenant_name, d.serial_number, d.firmware_version, d.status,d.rssi,d.is_shadow ,d.location_way, d.things_model_value, d.active_time,d.img_url,max(u.is_owner) as is_owner d.things_model_value,d.assign_time, d.active_time,d.img_url,max(u.is_owner) as is_owner from iot_device d inner join iot_device_user u on u.device_id = d.device_id inner join sys_user su on su.user_id = d.tenant_id @@ -440,6 +441,7 @@ <if test="remark != null">remark = #{remark},</if> <if test="imgUrl != null">img_url = #{imgUrl},</if> <if test="summary != null">summary = #{summary},</if> <if test="assignTime != null">assign_time = #{assignTime},</if> </trim> where serial_number = #{serialNumber} </update>
