From 2f78ef164653d5d30732d6e2e3f822a68de63010 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 30 十一月 2023 09:41:39 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_2_RELEASE.xml | 24
springboot-vue3/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_1.xml | 24
springboot-vue3/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_13.xml | 24
springboot-vue3/src/main/java/com/example/springboot/component/PLCManualJog.java | 173
springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_ext_1_14.xml | 24
springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_1.xml | 24
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java | 20
springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_8_0.xml | 24
springboot-vue3/.idea/libraries/Maven__io_jsonwebtoken_jjwt_jackson_0_10_7.xml | 24
springboot-vue3/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_3_3.xml | 24
springboot-vue3/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml | 24
springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java | 281 +
springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_shared_resources_1_14.xml | 24
springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_2_RELEASE.xml | 24
springboot-vue3/.idea/libraries/Maven__org_springframework_spring_websocket_5_2_8_RELEASE.xml | 24
springboot-vue3/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_13_3.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_spring_boot_starter_1_8_0.xml | 24
springboot-vue3/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml | 24
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 40
springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_8_0.xml | 24
springboot-vue3/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_2.xml | 24
springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_3_2_RELEASE.xml | 24
springboot-vue3/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml | 24
springboot-vue3/.idea/libraries/Maven__commons_io_commons_io_2_11_0.xml | 24
springboot-vue3/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml | 24
springboot-vue3/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml | 24
springboot-vue3/.idea/libraries/Maven__com_github_xingshuangs_iot_communication_1_4_2.xml | 24
springboot-vue3/.idea/vcs.xml | 10
springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java | 30
springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_8_0.xml | 24
springboot-vue3/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_5.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_8_0.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_dom_1_14.xml | 24
CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue | 4
springboot-vue3/.idea/artifacts/springboot_vue3_war_exploded.xml | 298
springboot-vue3/.idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml | 24
CanadaMes-ui/src/views/Electrical/Sign.vue | 2
CanadaMes-ui/src/configuration/Parameter.json | 20
springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svggen_1_14.xml | 24
CanadaMes-ui/src/configuration/ServoManualone.json | 593 +-
springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_awt_util_1_14.xml | 24
springboot-vue3/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml | 24
springboot-vue3/.idea/modules.xml | 14
springboot-vue3/.idea/libraries/Maven__commons_codec_commons_codec_1_14.xml | 24
springboot-vue3/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_util_1_14.xml | 24
springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml | 24
springboot-vue3/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_8_0.xml | 24
springboot-vue3/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml | 24
springboot-vue3/.idea/libraries/Maven__org_springframework_spring_tx_5_2_8_RELEASE.xml | 24
springboot-vue3/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml | 24
springboot-vue3/.idea/libraries/Maven__org_springframework_spring_web_5_2_8_RELEASE.xml | 24
springboot-vue3/.idea/libraries/Maven__io_jsonwebtoken_jjwt_api_0_10_7.xml | 24
springboot-vue3/.idea/libraries/Maven__junit_junit_4_13.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_css_1_14.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_37.xml | 24
springboot-vue3/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml | 24
springboot-vue3/.idea/libraries/Maven__org_springframework_spring_expression_5_2_8_RELEASE.xml | 24
springboot-vue3/.idea/misc.xml | 26
springboot-vue3/src/main/java/MyGenerator.java | 352
springboot-vue3/.idea/libraries/Maven__com_google_guava_guava_20_0.xml | 24
springboot-vue3/.idea/libraries/Maven__org_assertj_assertj_core_3_16_1.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml | 24
springboot-vue3/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml | 24
springboot-vue3/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml | 24
springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_1.xml | 24
springboot-vue3/.idea/compiler.xml | 42
springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_2_0.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_transcoder_1_14.xml | 24
springboot-vue3/src/main/java/com/example/springboot/service/OutSlice.java | 22
springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_anim_1_14.xml | 24
springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java | 26
springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_gvt_1_14.xml | 24
springboot-vue3/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml | 24
springboot-vue3/.idea/libraries/Maven__org_mockito_mockito_core_3_3_3.xml | 24
springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java | 242
CanadaMes-ui/src/views/Electrical/Parameter2.vue | 329
springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_2_0.xml | 24
springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_3_2_RELEASE.xml | 24
springboot-vue3/springboot-vue3.iml | 370
springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svg_dom_1_14.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml | 24
springboot-vue3/.idea/.gitignore | 16
springboot-vue3/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_13.xml | 24
springboot-vue3/.idea/libraries/Maven__com_deepoove_poi_tl_1_12_1.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_poi_poi_ooxml_lite_5_2_2.xml | 24
springboot-vue3/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml | 24
springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_2_0.xml | 24
springboot-vue3/.idea/libraries/Maven__org_springframework_spring_aop_5_2_8_RELEASE.xml | 24
springboot-vue3/.idea/libraries/Maven__io_jsonwebtoken_jjwt_impl_0_10_7.xml | 24
springboot-vue3/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_2.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_8_0.xml | 24
springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_2_0.xml | 24
springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java | 10
springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_i18n_1_14.xml | 24
springboot-vue3/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_5_0_3.xml | 24
springboot-vue3/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_8_RELEASE.xml | 24
CanadaMes-ui/src/views/Electrical/ServoManualone.vue | 388 +
springboot-vue3/.idea/libraries/Maven__org_apache_poi_poi_5_2_2.xml | 24
CanadaMes-ui/src/configuration/Sign.json | 2
springboot-vue3/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml | 24
springboot-vue3/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml | 24
CanadaMes-ui/src/views/Electrical/Positioning2.vue | 4
CanadaMes-ui/src/router/index.js | 27
springboot-vue3/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_constants_1_14.xml | 24
springboot-vue3/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml | 24
springboot-vue3/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml | 24
CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue | 679 +-
springboot-vue3/.idea/libraries/Maven__cn_hutool_hutool_all_5_5_4.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_8_0.xml | 24
CanadaMes-ui/src/views/Electrical/ManualonePosition.vue | 2
springboot-vue3/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_10.xml | 24
springboot-vue3/.idea/encodings.xml | 12
CanadaMes-ui/src/configuration/Manualoneposition2.json | 12
springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_1.xml | 24
springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_3_2_RELEASE.xml | 24
springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_2_0.xml | 24
springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml | 24
springboot-vue3/.idea/libraries/Maven__org_springframework_spring_context_5_2_8_RELEASE.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_xml_1_14.xml | 24
springboot-vue3/.idea/libraries/Maven__org_mybatis_mybatis_3_5_2.xml | 24
springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_3_2_RELEASE.xml | 24
springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml | 24
springboot-vue3/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml | 24
springboot-vue3/src/main/java/com/example/springboot/component/S7control.java | 157
springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java | 294
springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_3_2_RELEASE.xml | 24
springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml | 24
springboot-vue3/.idea/libraries/Maven__org_freemarker_freemarker_2_3_30.xml | 24
springboot-vue3/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml | 24
springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java | 16
springboot-vue3/.idea/libraries/Maven__org_springframework_spring_messaging_5_2_8_RELEASE.xml | 24
springboot-vue3/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_8_RELEASE.xml | 24
springboot-vue3/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml | 24
springboot-vue3/.idea/libraries/Maven__org_springframework_spring_beans_5_2_8_RELEASE.xml | 24
springboot-vue3/src/main/resources/sql/canadames.sql | 2708 +++++++-------
CanadaMes-ui/src/views/Electrical/Parameter1.vue | 8
springboot-vue3/.idea/artifacts/springboot_vue3_war.xml | 26
springboot-vue3/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_8_RELEASE.xml | 24
springboot-vue3/.idea/libraries/Maven__org_springframework_spring_core_5_2_8_RELEASE.xml | 24
springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_3_2_RELEASE.xml | 24
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java | 91
springboot-vue3/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_07.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_parser_1_14.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_script_1_14.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_commons_commons_compress_1_21.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_bridge_1_14.xml | 24
springboot-vue3/.idea/libraries/Maven__org_projectlombok_lombok_1_18_12.xml | 24
springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_3_2_RELEASE.xml | 24
springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml | 24
CanadaMes-ui/src/views/Electrical/Positioning1.vue | 6
springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_3_2_RELEASE.xml | 24
springboot-vue3/.idea/jarRepositories.xml | 48
springboot-vue3/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml | 24
springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_1.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml | 24
springboot-vue3/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_1_5_Final.xml | 24
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1.java | 51
springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_2_0.xml | 24
springboot-vue3/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml | 24
springboot-vue3/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_codec_1_14.xml | 24
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java | 11
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 4
springboot-vue3/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml | 24
springboot-vue3/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml | 24
springboot-vue3/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml | 24
springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_1.xml | 24
springboot-vue3/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml | 24
springboot-vue3/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml | 24
springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml | 24
springboot-vue3/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_21.xml | 24
springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_8_0.xml | 24
springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_2_RELEASE.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_8_0.xml | 24
springboot-vue3/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml | 24
springboot-vue3/.idea/libraries/Maven__xml_apis_xml_apis_ext_1_3_04.xml | 24
springboot-vue3/.idea/libraries/Maven__org_springframework_spring_test_5_2_8_RELEASE.xml | 24
CanadaMes-ui/src/views/Electrical/Parameter.vue | 101
springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_8_0.xml | 24
springboot-vue3/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_37.xml | 24
springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_3_2_RELEASE.xml | 24
springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java | 14
springboot-vue3/.idea/libraries/Maven__org_junit_vintage_junit_vintage_engine_5_6_2.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_poi_poi_ooxml_5_2_2.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_8_0.xml | 24
springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_xmlgraphics_commons_2_6.xml | 24
springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_3_2_RELEASE.xml | 24
springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_1.xml | 24
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 122
springboot-vue3/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_8_RELEASE.xml | 24
springboot-vue3/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml | 24
/dev/null | 101
springboot-vue3/.idea/libraries/Maven__org_owasp_encoder_encoder_1_2_2.xml | 24
CanadaMes-ui/src/configuration/Manualoneposition.json | 32
202 files changed, 6,062 insertions(+), 5,494 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/Manualoneposition.json b/CanadaMes-ui/src/configuration/Manualoneposition.json
index 652a959..69edafb 100644
--- a/CanadaMes-ui/src/configuration/Manualoneposition.json
+++ b/CanadaMes-ui/src/configuration/Manualoneposition.json
@@ -2,7 +2,7 @@
[
{
"name": "A01鎵嬪姩鏍煎瓙",
- "value": 33,
+ "value": 0,
"sending": 0,
"type": "0",
"address": "DB100.0",
@@ -11,7 +11,7 @@
},
{
"name": "A01瀹氫綅閫熷害",
- "value": 11,
+ "value": 0,
"sending": 0,
"address": "DB100.0",
"type": "0",
@@ -19,7 +19,7 @@
},
{
"name": "A01褰撳墠鏍煎瓙",
- "value": 22,
+ "value": 0,
"sending": 0,
"address": "DB100.0",
"type": "0",
@@ -69,7 +69,7 @@
[
{
"name": "A02鎵嬪姩鏍煎瓙",
- "value": 33,
+ "value": 0,
"sending": 0,
"type": "0",
"address": "DB100.0",
@@ -78,7 +78,7 @@
},
{
"name": "A02瀹氫綅閫熷害",
- "value": 11,
+ "value": 0,
"sending": 0,
"address": "DB100.0",
"type": "0",
@@ -86,7 +86,7 @@
},
{
"name": "A02褰撳墠鏍煎瓙",
- "value": 22,
+ "value": 0,
"sending": 0,
"address": "DB100.0",
"type": "0",
@@ -136,7 +136,7 @@
[
{
"name": "B01鎵嬪姩鏍煎瓙",
- "value": 33,
+ "value": 0,
"sending": 0,
"type": "0",
"address": "DB100.0",
@@ -145,7 +145,7 @@
},
{
"name": "B01瀹氫綅閫熷害",
- "value": 11,
+ "value": 0,
"sending": 0,
"address": "DB100.0",
"type": "0",
@@ -153,7 +153,7 @@
},
{
"name": "B01褰撳墠鏍煎瓙",
- "value": 22,
+ "value": 0,
"sending": 0,
"address": "DB100.0",
"type": "0",
@@ -203,7 +203,7 @@
[
{
"name": "B02鎵嬪姩鏍煎瓙",
- "value": 33,
+ "value": 0,
"sending": 0,
"type": "0",
"address": "DB100.0",
@@ -212,7 +212,7 @@
},
{
"name": "B02瀹氫綅閫熷害",
- "value": 11,
+ "value": 0,
"sending": 0,
"address": "DB100.0",
"type": "0",
@@ -220,7 +220,7 @@
},
{
"name": "B02褰撳墠鏍煎瓙",
- "value": 22,
+ "value": 0,
"sending": 0,
"address": "DB100.0",
"type": "0",
@@ -270,7 +270,7 @@
[
{
"name": "A01瀹炴椂浣嶇疆",
- "value": 33,
+ "value": 0,
"sending": 4,
"type": "0",
"address": "DB100.0",
@@ -281,7 +281,7 @@
[
{
"name": "A02瀹炴椂浣嶇疆",
- "value": 33,
+ "value": 0,
"sending": 5,
"type": "0",
"address": "DB100.0",
@@ -292,7 +292,7 @@
[
{
"name": "B01瀹炴椂浣嶇疆",
- "value": 33,
+ "value": 0,
"sending": 6,
"type": "0",
"address": "DB100.0",
@@ -303,7 +303,7 @@
[
{
"name": "B02瀹炴椂浣嶇疆",
- "value": 33,
+ "value": 0,
"sending": 7,
"type": "0",
"address": "DB100.0",
diff --git a/CanadaMes-ui/src/configuration/Manualoneposition2.json b/CanadaMes-ui/src/configuration/Manualoneposition2.json
index 5939f8e..4f43f7c 100644
--- a/CanadaMes-ui/src/configuration/Manualoneposition2.json
+++ b/CanadaMes-ui/src/configuration/Manualoneposition2.json
@@ -2,7 +2,7 @@
[
{
"name": "鎵嬪姩浣嶇疆",
- "value": 33,
+ "value": 0,
"sending": 0,
"type": "0",
"address": "DB100.0",
@@ -10,14 +10,14 @@
},
{
"name": "瀹氫綅閫熷害",
- "value": 11,
+ "value": 0,
"sending": 0,
"address": "DB100.0",
"type": "0"
},
{
"name": "A01缈昏浆瀹炴椂浣嶇疆",
- "value": 22,
+ "value": 0,
"sending": 0,
"address": "DB100.0",
"type": "0"
@@ -66,7 +66,7 @@
[
{
"name": "鎵嬪姩浣嶇疆",
- "value": 33,
+ "value": 0,
"sending": 0,
"type": "0",
"address": "DB100.0",
@@ -74,14 +74,14 @@
},
{
"name": "瀹氫綅閫熷害",
- "value": 11,
+ "value": 0,
"sending": 0,
"address": "DB100.0",
"type": "0"
},
{
"name": "A02缈昏浆瀹炴椂浣嶇疆",
- "value": 22,
+ "value": 0,
"sending": 0,
"address": "DB100.0",
"type": "0"
diff --git a/CanadaMes-ui/src/configuration/Parameter.json b/CanadaMes-ui/src/configuration/Parameter.json
index 193851f..a473bee 100644
--- a/CanadaMes-ui/src/configuration/Parameter.json
+++ b/CanadaMes-ui/src/configuration/Parameter.json
@@ -1,5 +1,4 @@
-{
- "para": [
+ [
{
"name": "D01-D06 conveyor Velocity(Auto FAST)",
"value": 123,
@@ -648,19 +647,4 @@
"type": "1",
"page": "1"
}
- ],
- "address": [
- {
- "name": "DB100.0",
- "count": 72
- },
- {
- "name": "DB101.0",
- "count": 22
- },
- {
- "name": "DB102.0",
- "count": 33
- }
- ]
-}
\ No newline at end of file
+ ]
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/ServoManualone.json b/CanadaMes-ui/src/configuration/ServoManualone.json
index 6c558bd..d0a65e1 100644
--- a/CanadaMes-ui/src/configuration/ServoManualone.json
+++ b/CanadaMes-ui/src/configuration/ServoManualone.json
@@ -1,319 +1,342 @@
[
- [
- {
- "name": "A01 鎵�鍦ㄦ牸瀛�",
- "read": 33,
- "sending": 0,
- "type": "0",
- "address": "DB100.0",
- "value": 1
- },
- {
- "name": "鏁伴噺",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value": 1
- },
- {
- "name": "杩涚墖ID",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value": 1
- },
- {
- "name": "闀垮害",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value": 1
- },
- {
- "name": "楂樺害",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value": 1
- },
- {
- "name": "鍙栫墖鏍煎瓙",
- "read": 11,
- "sending": 0,
- "type": "0",
- "value": 1
- },
- {
- "name": "瀛樼墖鏍煎瓙",
- "read": 22,
- "sending": 0,
- "type": "0",
- "value": 1
- },
- {
- "button": {
- "name": "鏁呴殰",
- "value": 0,
- "address": "DB10.0"
+
+ [
+ {
+ "name": "A01 鎵�鍦ㄦ牸瀛�",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address":"DB100.0",
+ "value":0
+
+ },
+ {
+ "name": "鏁伴噺",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+
+ },
+ {
+ "name": "杩涚墖ID",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+
+ },
+ {
+ "name": "闀垮害",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+
+ },
+ {
+ "name": "楂樺害",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+
+ },
+ {
+ "name": "鍙栫墖鏍煎瓙",
+ "read": 11,
+ "sending": 0,
+ "type": "0",
+ "value":0
+ },
+ {
+ "name": "瀛樼墖鏍煎瓙",
+ "read": 22,
+ "sending": 0,
+ "type": "0",
+ "value":0
+ },
+ {
+ "button": {
+ "name": "鏁呴殰",
+ "value":0,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "澶嶄綅",
+ "value":0,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "A01鍗婅嚜鍔�",
+ "value":0,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "A01鍗婅嚜鍔ㄥ惎鍔�",
+ "value":0,
+ "address":"DB10.0"
+ }
}
- },
+ ],
+ [
+ {
+ "name": "A02 鎵�鍦ㄦ牸瀛�",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address":"DB100.1",
+ "count":3,
+ "value":0
+ },
+ {
+ "name": "鍙栫墖鏍煎瓙",
+ "read": 11,
+ "sending": 0,
+ "type": "0",
+ "value":0
+ },
+ {
+ "name": "瀛樼墖鏍煎瓙",
+ "read": 22,
+ "sending": 0,
+ "type": "0",
+ "value":0
+ },
+ {
+ "name": "鏁伴噺",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+
+ },
+ {
+ "name": "鍙栫墖ID",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+
+ },
+ {
+ "button": {
+ "name": "鏁呴殰",
+ "value":0,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "澶嶄綅",
+ "value":0,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "A02鍗婅嚜鍔�",
+ "value":0,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "A02鍗婅嚜鍔ㄥ惎鍔�",
+ "value":0,
+ "address":"DB10.0"
+ }
+ }
+ ],
+
+ [
+ {
+ "name": "A01缈昏浆瀹炴椂浣嶇疆",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address":"DB100.2",
+ "count":3,
+ "value":0
+ },
+
+
+ {
+ "button": {
+ "name": "鏁呴殰",
+ "value":0,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "澶嶄綅",
+ "value":0,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "鏈洖闆�",
+ "value":0,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "鍥為浂",
+ "value":0,
+ "address":"DB10.0"
+ }
+ }
+ ],[
{
- "button": {
- "name": "澶嶄綅",
- "value": 0,
- "address": "DB10.0"
+ "name": "A02缈昏浆瀹炴椂浣嶇疆",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address":"DB100.2",
+ "count":3,
+ "value":0
+ },
+
+
+ {
+ "button": {
+ "name": "鏁呴殰",
+ "value":0,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "澶嶄綅",
+ "value":0,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "鏈洖闆�",
+ "value":0,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "鍥為浂",
+ "value":0,
+ "address":"DB10.0"
+ }
}
- },
- {
- "button": {
- "name": "A01鍗婅嚜鍔�",
- "value": 0,
- "address": "DB10.0"
- }
- },
- {
- "button": {
- "name": "鍗婅嚜鍔ㄥ惎鍔�",
- "value": 0,
- "address": "DB10.0"
- }
- }
- ],
- [
- {
- "name": "A02 鎵�鍦ㄦ牸瀛�",
- "read": 33,
- "sending": 0,
- "type": "0",
- "address": "DB100.1",
- "count": 3,
- "value": 0
- },
- {
- "name": "鍙栫墖鏍煎瓙",
- "read": 11,
- "sending": 0,
- "type": "0",
- "value": 0
- },
- {
- "name": "瀛樼墖鏍煎瓙",
- "read": 22,
- "sending": 0,
- "type": "0",
- "value": 0
- },
- {
- "name": "鏁伴噺",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value": 0
- },
- {
- "name": "鍙栫墖ID",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value": 0
- },
- {
- "button": {
- "name": "鏁呴殰",
- "value": 0,
- "address": "DB10.0"
- }
- },
- {
- "button": {
- "name": "澶嶄綅",
- "value": 0,
- "address": "DB10.0"
- }
- },
- {
- "button": {
- "name": "A02鍗婅嚜鍔�",
- "value": 0,
- "address": "DB10.0"
- }
- },
- {
- "button": {
- "name": "鍗婅嚜鍔ㄥ惎鍔�",
- "value": 0,
- "address": "DB10.0"
- }
- }
- ],
- [
- {
- "name": "A01缈昏浆瀹炴椂浣嶇疆",
- "read": 33,
- "sending": 0,
- "type": "0",
- "address": "DB100.2",
- "count": 3,
- "value": 0
- },
- {
- "button": {
- "name": "鏁呴殰",
- "value": 0,
- "address": "DB10.0"
- }
- },
- {
- "button": {
- "name": "澶嶄綅",
- "value": 0,
- "address": "DB10.0"
- }
- },
- {
- "button": {
- "name": "鏈洖闆�",
- "value": 0,
- "address": "DB10.0"
- }
- },
- {
- "button": {
- "name": "鍥為浂",
- "value": 0,
- "address": "DB10.0"
- }
- }
- ],
- [
- {
- "name": "A02缈昏浆瀹炴椂浣嶇疆",
- "read": 33,
- "sending": 0,
- "type": "0",
- "address": "DB100.2",
- "count": 3,
- "value": 0
- },
- {
- "button": {
- "name": "鏁呴殰",
- "value": 0,
- "address": "DB10.0"
- }
- },
- {
- "button": {
- "name": "澶嶄綅",
- "value": 0,
- "address": "DB10.0"
- }
- },
- {
- "button": {
- "name": "鏈洖闆�",
- "value": 0,
- "address": "DB10.0"
- }
- },
- {
- "button": {
- "name": "鍥為浂",
- "value": 0,
- "address": "DB10.0"
- }
- }
- ],
- [
- {
+], [
+ {
"name": "B01 鎵�鍦ㄦ牸瀛�",
"read": 33,
"sending": 0,
"type": "0",
- "address": "DB100.2",
- "count": 3,
- "value": 0
+ "address":"DB100.2",
+ "count":3,
+ "value":0
},
{
"name": "鐩爣鏍煎瓙",
"read": 11,
"sending": 0,
"type": "0",
- "value": 0
+ "value":0
},
+
{
"button": {
"name": "鏁呴殰",
- "value": 0,
- "address": "DB10.0"
+ "value":0,
+ "address":"DB10.0"
}
},
{
"button": {
"name": "澶嶄綅",
- "value": 0,
- "address": "DB10.0"
+ "value":0,
+ "address":"DB10.0"
}
- },
- {
+ } ,{
"button": {
"name": "鏈洖闆�",
- "value": 0,
- "address": "DB10.0"
+ "value":0,
+ "address":"DB10.0"
}
},
{
"button": {
"name": "鍥為浂",
- "value": 0,
- "address": "DB10.0"
+ "value":0,
+ "address":"DB10.0"
}
}
- ],
- [
- {
- "name": "B02 鎵�鍦ㄦ牸瀛�",
- "read": 33,
- "sending": 0,
- "type": "0",
- "address": "DB100.3",
- "count": 3,
- "value": 0
- },
- {
- "name": "鐩爣鏍煎瓙",
- "read": 11,
- "sending": 0,
- "type": "0",
- "value": 0
- },
- {
- "button": {
- "name": "鏁呴殰",
- "value": 0,
- "address": "DB10.0"
- }
- },
- {
- "button": {
- "name": "澶嶄綅",
- "value": 0,
- "address": "DB10.0"
- }
- },
- {
- "button": {
- "name": "鏈洖闆�",
- "value": 0,
- "address": "DB10.0"
- }
- },
- {
- "button": {
- "name": "鍥為浂",
- "value": 0,
- "address": "DB10.0"
- }
- }
+],
+
+ [
+ {
+ "name": "B02 鎵�鍦ㄦ牸瀛�",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address":"DB100.3",
+ "count":3,
+ "value":0
+ },
+ {
+ "name": "鐩爣鏍煎瓙",
+ "read": 11,
+ "sending": 0,
+ "type": "0",
+ "value":0
+ },
+
+ {
+ "button": {
+ "name": "鏁呴殰",
+ "value":0,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "澶嶄綅",
+ "value":0,
+ "address":"DB10.0"
+
+ }
+ } ,{
+ "button": {
+ "name": "鏈洖闆�",
+ "value":0,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "鍥為浂",
+ "value":0,
+ "address":"DB10.0"
+ }
+ }
+
+ ]
+
+
]
-]
\ No newline at end of file
+
\ No newline at end of file
diff --git a/CanadaMes-ui/src/configuration/Sign.json b/CanadaMes-ui/src/configuration/Sign.json
index b5cb818..3401be1 100644
--- a/CanadaMes-ui/src/configuration/Sign.json
+++ b/CanadaMes-ui/src/configuration/Sign.json
@@ -445,7 +445,7 @@
"address": [
{
"name": "DB102.0.0",
- "count": 58
+ "count": 64
}
]
}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/router/index.js b/CanadaMes-ui/src/router/index.js
index 5171c05..27246f5 100644
--- a/CanadaMes-ui/src/router/index.js
+++ b/CanadaMes-ui/src/router/index.js
@@ -33,7 +33,7 @@
path: '/home',
component: () => import('../views/home')
},
-
+
{
@@ -49,7 +49,7 @@
component: () => import('../views/device/parameter'),
},
-
+
{
path: '/device/alarm',
component: () => import('../views/device/alarm')
@@ -58,7 +58,7 @@
path: '/device/iostate',
component: () => import('../views/device/iostate')
},
-
+
{
path: '/device/control',
component: () => import('../views/device/control')
@@ -107,23 +107,6 @@
path: '/Electrical/Positioning2',
component: () => import('../views/Electrical/Positioning2')
},
- {
- path: '/Electrical/ManualonePosition',
- component: () => import('../views/Electrical/ManualonePosition')
- },
- {
- path: '/Electrical/ManualonePosition2',
- component: () => import('../views/Electrical/ManualonePosition2')
- },
- {
- path: '/Electrical/AutomaticParameterSetting',
- component: () => import('../views/Electrical/AutomaticParameterSetting')
- },
- {
- path: '/Electrical/ManualJog',
- component: () => import('../views/Electrical/ManualJog')
- }
-
@@ -139,13 +122,15 @@
});
// 璺敱鎺у埗瀹堝崼,瑙ｅ喅闇�瑕佺櫥褰曟墠鍙互璁块棶鐨勯〉闈�
+
+
router.beforeEach((to, from, next) => {
// 濡傛灉璁块棶鐨勬槸鐧诲綍鎴栨敞鍐岄〉闈㈢洿鎺ユ斁琛�
if (to.path === '/login' || to.path === '/register') return next();
// 鑾峰彇token
const hasToken = getToken();
-
+
diff --git a/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue b/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
index 8ea34da..64b71e0 100644
--- a/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
+++ b/CanadaMes-ui/src/views/Electrical/AutomaticParameterSetting.vue
@@ -146,7 +146,7 @@
let obj = JSON.parse(msg.data);
const jsonData2 = this.jsonData;
-
+console.log(obj);
const handleMouseMove = throttle(function (event) {
const inputBox = document.querySelectorAll('.el-card__body');
@@ -186,7 +186,7 @@
jsonData2[2][0]['value'] = dache[0][0];
}
}
- }, 50);
+ }, 200);
document.addEventListener('mouseover', handleMouseMove);
};
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
index 516bf6c..dbd4dc2 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
@@ -294,7 +294,7 @@
}
let obj = JSON.parse(msg.data);
- //console.log(obj)
+ // console.log(obj)
const jsonData2 = this.jsonData;
const handleMouseMove = throttle(function (event) {
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
index 8461e7e..a79506e 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
@@ -1,330 +1,351 @@
-<template>
- <div class="app">
- <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
- <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
- }}</router-link>
- <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
- }}</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
- }}</router-link>
- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
- }}</router-link>
- <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
- }}</router-link>
- <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{
- $t('ServoManual')
- }}</router-link>
- </el-breadcrumb>
-
- <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
-
- <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{
- $t('Servomanualone')
- }}</router-link>
- <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
- }}</router-link>
- <!-- <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
- }}</router-link> -->
- <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{
- $t('Positioning1')
- }}</router-link>
- <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
- $t('Positioning2')
- }}</router-link>
- <router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{
- $t('ManualonePosition')
- }}</router-link>
- <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
- $t('ManualonePosition2')
- }}</router-link>
- <router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
- $t('AutomaticParameterSetting')
- }}</router-link>
- <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
- $t('ManualJog')
- }}</router-link>
- </el-breadcrumb>
-
- <el-row :gutter="20">
- <el-col :span="12" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
- <el-card class="json-block" style="width:485px;">
- <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
- <div class="item-row">
- <span class="name" style="width:100px;">{{ item.name }}</span>
- <el-input style="width:250px;" v-if="item.state != 0 && item.type === '0'" v-model="item.value"
- class="input-box"></el-input>
- </div>
- </div>
- <div class="button-row" style="display: flex; justify-content: space-between;">
- <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
- <el-button v-if="item.button && item.button.state != 0" :name="item.button.name" v-model="item.button.value"
- :class="{ 'action-button': true, 'error-button': item.button.name === '鏁呴殰' && item.button.value === 1 }"
- @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend(item.button.name);">{{
- item.button.name }}</el-button>
- </div>
- </div>
- </el-card>
- </el-col>
- </el-row>
- <!-- <el-button @click="submitDataToBackend">鎻愪氦鏁版嵁鍒板悗绔�</el-button> -->
- </div>
-</template>
-
-<script>
-import LanguageMixin from '../../lang/LanguageMixin'
-import data from '../../configuration/Manualoneposition2'
-import { throttle } from 'lodash';
-let socket;
-export default {
- name: "ManualonePosition2",
- mixins: [LanguageMixin],
- data () {
- return {
- jsonData: data // 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
- }
- },
- created () {
- this.initWebSocket();
- // console.log('jsonData:', this.jsonData);
-
- },
- methods: {
- updateButtonValue (dataGroup, itemIndex) {
- // 灏嗗綋鍓嶆寜閽殑鍊艰涓�1
-
- this.$set(dataGroup[itemIndex].button, 'value', 1);
-
-
-
- },
- submitDataToBackend (currentButtonName) {
- if (currentButtonName === 'A01缈昏浆鍚姩') {
- const data = [];
-
- for (let i = 0; i < 1; i++) {
- const inputData = this.jsonData[i].filter(item => item.type === '0').map(item => {
- return { value: item.value };
- });
-
- const values = inputData.map(item => item.value);
-
- data.push(values);
- }
-
-
-
- const jsonObject = { data };
-
- // 鎻愪氦鏁版嵁鍒板悗绔�
- const jsonString = JSON.stringify(jsonObject);
- console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
- socket?.send(jsonString);
-
- }
-
- if (currentButtonName === 'A02缈昏浆鍚姩') {
- const data = [];
-
- for (let i = 1; i < 2; i++) {
- const inputData = this.jsonData[i].filter(item => item.type === '0').map(item => {
- return { value: item.value };
- });
-
- const values = inputData.map(item => item.value);
- data.unshift([]);
- data.push(values);
- }
-
-
-
- const jsonObject = { data };
-
- // 鎻愪氦鏁版嵁鍒板悗绔�
- const jsonString = JSON.stringify(jsonObject);
- console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
- socket?.send(jsonString);
-
- }
-
- if (currentButtonName === '鏁呴殰') {
-
- const data2 = [];
- const resetButtonValues = this.jsonData.map(item => {
- const buttonItem = item.find(subItem => subItem.button && subItem.button.name === '鏁呴殰');
- return buttonItem ? buttonItem.button.value : null;
- }).filter(value => value !== null);
-
- // 灏嗗緱鍒扮殑鍊兼坊鍔犲埌 data 鏁扮粍涓�
- data2.push(...resetButtonValues);
- data2.unshift([], []);
- const jsonObject2 = { data2 };
-
- // 鎻愪氦鏁版嵁鍒板悗绔�
- const jsonString2 = JSON.stringify(jsonObject2);
- console.log('鎵�鏈夋晠闅滅殑value:', jsonString2);
- socket?.send(jsonString2);
-
-
- }
-
- if (currentButtonName === '澶嶄綅') {
-
- const data2 = [];
- const resetButtonValues = this.jsonData.map(item => {
- const buttonItem = item.find(subItem => subItem.button && subItem.button.name === '澶嶄綅');
- return buttonItem ? buttonItem.button.value : null;
- }).filter(value => value !== null);
-
- // 灏嗗緱鍒扮殑鍊兼坊鍔犲埌 data 鏁扮粍涓�
- data2.push(...resetButtonValues);
- data2.unshift([], [], []);
- const jsonObject2 = { data2 };
-
- // 鎻愪氦鏁版嵁鍒板悗绔�
- const jsonString2 = JSON.stringify(jsonObject2);
- console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString2);
- socket?.send(jsonString2);
-
-
- }
-
-
- },
-
-
- initWebSocket () {
-
- let viewname = "ManualonePosition2";
-
- if (typeof WebSocket === "undefined") {
- console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
- } else {
- let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname;
-
- if (socket != null) {
- socket.close();
- socket = null;
- }
-
- // 寮�鍚竴涓獁ebsocket鏈嶅姟
- socket = new WebSocket(socketUrl);
-
- // 鎵撳紑浜嬩欢
- socket.onopen = function () {
- console.log("websocket宸叉墦寮�");
- };
-
- // 鏀跺埌娑堟伅
- socket.onmessage = (msg) => {
- if (!msg.data) {
- return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
- }
-
- let obj = JSON.parse(msg.data);
- console.log(obj)
- const jsonData2 = this.jsonData;
-
- const handleMouseMove = throttle(function (event) {
- const inputBox = document.querySelectorAll('.el-card__body');
- const target = event.target;
- if (inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
- // 鎵ц鏇存柊閫昏緫
- for (let i = 0; i < 2; i++) {
- jsonData2[i].forEach((item, index) => {
- if (typeof item.value !== 'undefined' && typeof obj[`zuhe${i + 1}`][0][index] !== 'undefined') {
- item.value = obj[`zuhe${i + 1}`][0][index];
- }
- });
- }
-
- jsonData2.forEach((item) => {
- item.forEach((subItem) => {
- if (subItem.sending === 4) {
- subItem.value = obj.shishi1[0][0];
- }
- if (subItem.sending === 5) {
- subItem.value = obj.shishi1[0][1];
- }
- if (subItem.sending === 6) {
- subItem.value = obj.shishi1[0][2];
- }
- if (subItem.sending === 7) {
- subItem.value = obj.shishi1[0][3];
- }
- });
- });
-
- // 閬嶅巻guzhang鏁扮粍
- for (let i = 0; i < obj.guzhang[0].length; i++) {
- const guzhangValue = obj.guzhang[0][i];
-
- // 鏌ユ壘jsonData2涓甫鏈�"button"鐨勫璞★紝骞朵笖name绛変簬"鏁呴殰"
- for (let j = 0; j < jsonData2.length; j++) {
- const section = jsonData2[j];
-
- for (let k = 0; k < section.length; k++) {
- const item = section[k];
-
- if (item.button && item.button.name === "鏁呴殰") {
- // 鏇存柊value灞炴��
- item.button.value = guzhangValue;
- break;
- }
- }
-
-
- }
- }
-
-
-
-
- }
- }, 200);
-
- document.addEventListener('mouseover', handleMouseMove);
- };
-
-
-
-
- // 鍏抽棴浜嬩欢
- socket.onclose = function () {
- console.log("websocket宸插叧闂�");
- };
-
- // 鍙戠敓閿欒浜嬩欢
- socket.onerror = function () {
- console.log("websocket鍙戠敓浜嗛敊璇�");
- };
-
- }
- },
- send () {
-
-
- socket?.send(JSON.stringify(this.messagepack));
- }
-
- }
-}
-</script>
-
-<style scoped>
-.item-row {
- display: flex;
- align-items: center;
- margin-bottom: 2px;
- /* 璋冩暣姣忎釜椤圭洰涔嬮棿鐨勯棿璺� */
-}
-
-.action-button {
- margin-right: 10px;
- background: #66b1ff;
- color: #FFF;
-}
-
-.blue-button {
- background-color: skyblue;
-}
+<template>
+ <div class="app">
+ <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
+ <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
+ }}</router-link>
+ <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
+ }}</router-link>
+ <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+ }}</router-link>
+ <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
+ }}</router-link>
+ <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
+ }}</router-link>
+ <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ServoManual')
+ }}</router-link>
+ </el-breadcrumb>
+
+ <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
+
+ <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{
+ $t('Servomanualone')
+ }}</router-link>
+ <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
+ }}</router-link>
+ <!-- <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
+ }}</router-link> -->
+ <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{
+ $t('Positioning1')
+ }}</router-link>
+ <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
+ $t('Positioning2')
+ }}</router-link>
+ <router-link to="/Electrical/ManualonePosition" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualonePosition')
+ }}</router-link>
+ <router-link to="/Electrical/ManualonePosition2" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualonePosition2')
+ }}</router-link>
+ <router-link to="/Electrical/AutomaticParameterSetting" tag="el-button" type="text" active-class="blue-button">{{
+ $t('AutomaticParameterSetting')
+ }}</router-link>
+ <router-link to="/Electrical/ManualJog" tag="el-button" type="text" active-class="blue-button">{{
+ $t('ManualJog')
+ }}</router-link>
+ </el-breadcrumb>
+
+ <el-row :gutter="20">
+ <el-col :span="12" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
+ <el-card class="json-block" style="width:485px;">
+ <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
+ <div class="item-row">
+ <span class="name" style="width:100px;">{{ item.name }}</span>
+ <el-input style="width:250px;" v-if="item.state != 0 && item.type === '0'" v-model="item.value"
+ class="input-box"></el-input>
+ </div>
+ </div>
+ <div class="button-row" style="display: flex; justify-content: space-between;">
+ <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
+ <el-button v-if="item.button && item.button.state != 0" :name="item.button.name" v-model="item.button.value"
+ :class="{ 'action-button': true, 'error-button': item.button.name === '鏁呴殰' && item.button.value === 1 }"
+ @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend(item.button.name);">{{
+ item.button.name }}</el-button>
+ </div>
+ </div>
+ </el-card>
+ </el-col>
+ </el-row>
+ <!-- <el-button @click="submitDataToBackend">鎻愪氦鏁版嵁鍒板悗绔�</el-button> -->
+ </div>
+</template>
+
+<script>
+import LanguageMixin from '../../lang/LanguageMixin'
+import data from '../../configuration/Manualoneposition2'
+import { throttle } from 'lodash';
+let socket;
+export default {
+ name: "ManualonePosition2",
+ mixins: [LanguageMixin],
+ data () {
+ return {
+ jsonData: data // 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
+ }
+ },
+ created () {
+ this.initWebSocket();
+ // console.log('jsonData:', this.jsonData);
+
+ },
+ methods: {
+ updateButtonValue (dataGroup, itemIndex) {
+ // 灏嗗綋鍓嶆寜閽殑鍊艰涓�1
+
+ this.$set(dataGroup[itemIndex].button, 'value', 1);
+
+
+
+ },
+ submitDataToBackend (currentButtonName) {
+ if (currentButtonName === 'A01缈昏浆鍚姩') {
+ const data = [];
+
+ for (let i = 0; i < 1; i++) {
+ const inputData = this.jsonData[i].filter(item => item.type === '0').map(item => {
+ return { value: item.value };
+ });
+
+ const values = inputData.map(item => item.value);
+
+ data.push(values);
+ }
+
+
+
+ const jsonObject = { data };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const jsonString = JSON.stringify(jsonObject);
+ console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
+ socket?.send(jsonString);
+
+ }
+
+ if (currentButtonName === 'A02缈昏浆鍚姩') {
+ const data = [];
+
+ for (let i = 1; i < 2; i++) {
+ const inputData = this.jsonData[i].filter(item => item.type === '0').map(item => {
+ return { value: item.value };
+ });
+
+ const values = inputData.map(item => item.value);
+ data.unshift([]);
+ data.push(values);
+ }
+
+
+
+ const jsonObject = { data };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const jsonString = JSON.stringify(jsonObject);
+ console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
+ socket?.send(jsonString);
+
+ }
+
+ if (currentButtonName === '鏁呴殰') {
+
+ const data2 = [];
+ const resetButtonValues = this.jsonData.map(item => {
+ const buttonItem = item.find(subItem => subItem.button && subItem.button.name === '鏁呴殰');
+ return buttonItem ? buttonItem.button.value : null;
+ }).filter(value => value !== null);
+
+ // 灏嗗緱鍒扮殑鍊兼坊鍔犲埌 data 鏁扮粍涓�
+ data2.push(...resetButtonValues);
+ data2.unshift([], []);
+ const jsonObject2 = { data2 };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const jsonString2 = JSON.stringify(jsonObject2);
+ console.log('鎵�鏈夋晠闅滅殑value:', jsonString2);
+ socket?.send(jsonString2);
+
+
+ }
+
+ if (currentButtonName === '澶嶄綅') {
+
+ const data2 = [];
+ const resetButtonValues = this.jsonData.map(item => {
+ const buttonItem = item.find(subItem => subItem.button && subItem.button.name === '澶嶄綅');
+ return buttonItem ? buttonItem.button.value : null;
+ }).filter(value => value !== null);
+
+ // 灏嗗緱鍒扮殑鍊兼坊鍔犲埌 data 鏁扮粍涓�
+ data2.push(...resetButtonValues);
+ data2.unshift([], [], []);
+ const jsonObject2 = { data2 };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const jsonString2 = JSON.stringify(jsonObject2);
+ console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString2);
+ socket?.send(jsonString2);
+
+
+ }
+
+ if (currentButtonName === '鍥為浂') {
+
+ const data2 = [];
+ const resetButtonValues = this.jsonData.map(item => {
+ const buttonItem = item.find(subItem => subItem.button && subItem.button.name === '鍥為浂');
+ return buttonItem ? buttonItem.button.value : null;
+ }).filter(value => value !== null);
+
+ // 灏嗗緱鍒扮殑鍊兼坊鍔犲埌 data 鏁扮粍涓�
+ data2.push(...resetButtonValues);
+ data2.unshift([], [], [], []);
+ const jsonObject2 = { data2 };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const jsonString2 = JSON.stringify(jsonObject2);
+ console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString2);
+ socket?.send(jsonString2);
+
+
+ }
+
+
+ },
+
+
+ initWebSocket () {
+
+ let viewname = "ManualonePosition2";
+
+ if (typeof WebSocket === "undefined") {
+ console.log("鎮ㄧ殑娴忚鍣ㄤ笉鏀寔WebSocket");
+ } else {
+ let socketUrl = "ws://" + "localhost:8888" + "/springboot-vue3/api/talk/" + viewname;
+
+ if (socket != null) {
+ socket.close();
+ socket = null;
+ }
+
+ // 寮�鍚竴涓獁ebsocket鏈嶅姟
+ socket = new WebSocket(socketUrl);
+
+ // 鎵撳紑浜嬩欢
+ socket.onopen = function () {
+ console.log("websocket宸叉墦寮�");
+ };
+
+ // 鏀跺埌娑堟伅
+ socket.onmessage = (msg) => {
+ if (!msg.data) {
+ return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
+ }
+
+ let obj = JSON.parse(msg.data);
+ // console.log(obj)
+ const jsonData2 = this.jsonData;
+
+ const handleMouseMove = throttle(function (event) {
+ const inputBox = document.querySelectorAll('.el-card__body');
+ const target = event.target;
+ if (inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
+ // 鎵ц鏇存柊閫昏緫
+ for (let i = 0; i < 2; i++) {
+ jsonData2[i].forEach((item, index) => {
+ if (typeof item.value !== 'undefined' && typeof obj[`zuhe${i + 1}`][0][index] !== 'undefined') {
+ item.value = obj[`zuhe${i + 1}`][0][index];
+ }
+ });
+ }
+
+ jsonData2.forEach((item) => {
+ item.forEach((subItem) => {
+ if (subItem.sending === 4) {
+ subItem.value = obj.shishi1[0][0];
+ }
+ if (subItem.sending === 5) {
+ subItem.value = obj.shishi1[0][1];
+ }
+ if (subItem.sending === 6) {
+ subItem.value = obj.shishi1[0][2];
+ }
+ if (subItem.sending === 7) {
+ subItem.value = obj.shishi1[0][3];
+ }
+ });
+ });
+
+ // 閬嶅巻guzhang鏁扮粍
+ for (let i = 0; i < obj.guzhang[0].length; i++) {
+ const guzhangValue = obj.guzhang[0][i];
+
+ // 鏌ユ壘jsonData2涓甫鏈�"button"鐨勫璞★紝骞朵笖name绛変簬"鏁呴殰"
+ for (let j = 0; j < jsonData2.length; j++) {
+ const section = jsonData2[j];
+
+ for (let k = 0; k < section.length; k++) {
+ const item = section[k];
+
+ if (item.button && item.button.name === "鏁呴殰") {
+ // 鏇存柊value灞炴��
+ item.button.value = guzhangValue;
+ break;
+ }
+ }
+
+
+ }
+ }
+
+
+
+
+ }
+ }, 200);
+
+ document.addEventListener('mouseover', handleMouseMove);
+ };
+
+
+
+
+ // 鍏抽棴浜嬩欢
+ socket.onclose = function () {
+ console.log("websocket宸插叧闂�");
+ };
+
+ // 鍙戠敓閿欒浜嬩欢
+ socket.onerror = function () {
+ console.log("websocket鍙戠敓浜嗛敊璇�");
+ };
+
+ }
+ },
+ send () {
+
+
+ socket?.send(JSON.stringify(this.messagepack));
+ }
+
+ }
+}
+</script>
+
+<style scoped>
+.item-row {
+ display: flex;
+ align-items: center;
+ margin-bottom: 2px;
+ /* 璋冩暣姣忎釜椤圭洰涔嬮棿鐨勯棿璺� */
+}
+
+.action-button {
+ margin-right: 10px;
+ background: #66b1ff;
+ color: #FFF;
+}
+
+.blue-button {
+ background-color: skyblue;
+}
</style>
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter.vue b/CanadaMes-ui/src/views/Electrical/Parameter.vue
index 94a34d4..0cbb804 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter.vue
@@ -12,26 +12,26 @@
}}</router-link>
<router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
}}</router-link>
- <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{
- $t('ServoManual')
- }}</router-link>
+ <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual')
+ }}</router-link>
</el-breadcrumb>
<div>Parameter</div>
<el-form label-width="100px" style="display: flex; flex-wrap: wrap;" :model="messagepack.data">
<div id="btn_div">
- <el-button type="primary" @click="send()" id="xiafa" :disabled="isButtonDisabled">{{ $t('Distribute parameters')
- }}</el-button>
+ <!-- <el-button type="primary" @click="send()" id="xiafa" :disabled="isButtonDisabled">{{ $t('Distribute parameters')
+ }}</el-button> -->
</div>
- <div class="kuai_div" v-for="(item, index) in record.xyData" :key="index">
+ <div class="kuai_div" v-for="(item, index) in jsonData" :key="index">
<el-input style="width: 280px; border:none;" class="in_mc" v-model="item.name" readonly></el-input>
-
- <span style="margin-right: 5px; width: 50px;">{{ item.value }}</span>
- <span style="margin-right: 5px; font-size: 14px;color: red;">|</span>
- <input type="number" style="width: 43px; margin-right: 5px; margin-top: 5px; font-size: 16px;">
- <span style="margin-right: 5px; width: 50px;">{{ item.unit }}</span>
+ <!-- <span style="margin-right: 5px; width: 50px;">{{ item.value }}</span> -->
+ <!-- <span style="margin-right: 5px; font-size: 14px;color: red;">|</span> -->
+ <el-input v-model="item.value" type="number"
+ style="width: 143px; margin-right: 5px; margin-top: 5px; font-size: 16px;border:none" class="input-box"
+ @keyup.enter.native="send"></el-input>
+ <span style="margin-right: 5px; width: 50px;" >{{ item.unit }}</span>
</div>
</el-form>
@@ -47,22 +47,18 @@
let socket;
import LanguageMixin from '../../lang/LanguageMixin'
import data from '../../configuration/Parameter'
+import { throttle } from 'lodash';
export default {
name: "Parameter",
mixins: [LanguageMixin],
data () {
return {
jsonData: data,
+
dialogVisible: true,
password: '',
activeButton: '',
- record: {
- params: [100, 200, 10, 10, 10, 10],
- xyData: [
-
- ],
- canshu: []
- },
+
messagepack: {
data: { taskname: "" }
},
@@ -78,9 +74,12 @@
this.initWebSocket();
this.isButtonDisabled = true;
-
},
methods: {
+ showdata () {
+
+
+ },
setActiveButton (buttonName) {
@@ -114,41 +113,39 @@
}
let obj = JSON.parse(msg.data);
-
-
+ // console.log(obj);
+ const jsonData2=this.jsonData;
+ // console.log(jsonData2);
+ const handleMouseMove = throttle(function (event) {
+ const inputBox = document.querySelectorAll('.input-box');
+ const target = event.target;
+ if (inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
if (obj.params && obj.state) {
-
- this.record.params[0] = obj.params[0];
- this.record.state = obj.state[0];
+
if (obj.state && obj.state.length > 0) {
- let isButtonDisabled = this.record.state.includes(1);
- this.isButtonDisabled = isButtonDisabled;
+
+// console.log( Array.isArray(jsonData2));
+
+
+// 灏� obj 涓殑 params 鍊兼洿鏂板埌 jsonData 涓殑 value 涓�
+for (let i = 0; i < obj.params[0].length; i++) {
+ jsonData2[i].value = obj.params[0][i];
+}
- this.record.xyData = this.jsonData.para;
-
- for (let a = 0; a < this.record.xyData.length; a++) {
- this.record.xyData[a].value = this.record.params[0][a];
-
- }
-
- this.record.xyData = this.jsonData.para.filter(item => {
- return item.state != 0;
- }
-
- );
- const language = this.$i18n.locale;
- if (language === 'en-US') {
- this.replaceChineseWithEnglish();
- } else {
- this.localizedRoles = [...this.record.xyData];
- }
+
+
}
}
- this.$forceUpdate();
- this.replaceChineseWithEnglish();
- };
+ // this.$forceUpdate();
+ // this.replaceChineseWithEnglish();
+ }
+ }, 200);
+
+document.addEventListener('mouseover', handleMouseMove);
+
+};
// 鍏抽棴浜嬩欢
socket.onclose = function () {
@@ -162,8 +159,8 @@
}
},
send () {
- this.messagepack.data = this.record.xyData.map((item) => parseInt(item.value2)); // 杞崲涓烘暣鏁版暟缁�
- //console.log(this.messagepack);
+ this.messagepack.data = this.jsonData.map((item) => parseInt(item.value)); // 杞崲涓烘暣鏁版暟缁�
+ console.log(this.messagepack);
socket?.send(JSON.stringify(this.messagepack));
},
handleChange (index, value) {
@@ -172,7 +169,7 @@
//璇█杞崲
replaceChineseWithEnglish () {
const translation = this.$t('langparameter');
- this.record.xyData = this.record.xyData.map(item => { return { name: translation[item.name] || item.name, value: item.value, unit: item.unit }; });
+ this.jsonData.para = this.jsonData.para.map(item => { return { name: translation[item.name] || item.name, value: item.value, unit: item.unit }; });
//console.log(translation);
},
}
@@ -189,8 +186,10 @@
border: 1px solid black;
border: none;
}
+.special-class{
-.special-class {}
+
+}
.in_mc {
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter1.vue b/CanadaMes-ui/src/views/Electrical/Parameter1.vue
index 3a3613c..5455274 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter1.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter1.vue
@@ -155,10 +155,10 @@
const parms = obj.params;
const fanzhuan = obj.fanzhuan;
const xiaoche = obj.xiaoche;
-
- console.log('parms:', parms);
- console.log('fanzhuan:', fanzhuan);
- console.log('xiaoche:', xiaoche);
+ console.log(obj);
+ // console.log('parms:', parms);
+ // console.log('fanzhuan:', fanzhuan);
+ // console.log('xiaoche:', xiaoche);
let index = 0;
for (let i = 0; i < jsonData2.length; i++) {
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter2.vue b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
index ada201c..8856286 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter2.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter2.vue
@@ -1,79 +1,77 @@
<template>
- <div class="app">
+ <div class="app">
<el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
- <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
- }}</router-link>
- <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
- }}</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
- }}</router-link>
- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
- }}</router-link>
- <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
- }}</router-link>
- <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{
- $t('ServoManual') }}</router-link>
+ <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
+ }}</router-link>
+ <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
+ }}</router-link>
+ <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+ }}</router-link>
+ <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
+ }}</router-link>
+ <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
+ }}</router-link>
+ <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual')
+ }}</router-link>
+ </el-breadcrumb>
+
+ <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
+ <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{ $t('Servomanualone')
+ }}</router-link>
+ <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
+ }}</router-link>
+ <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
+ }}</router-link>
+ <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning1')
+ }}</router-link>
+ <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning2')
+ }}</router-link>
</el-breadcrumb>
-
- <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
- <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{
- $t('Servomanualone')
- }}</router-link>
- <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
- }}</router-link>
- <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
- }}</router-link>
- <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{
- $t('Positioning1')
- }}</router-link>
- <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
- $t('Positioning2')
- }}</router-link>
- </el-breadcrumb>
-
+
<el-row :gutter="40">
- <el-col :span="6" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
- <el-card class="json-block" style="width:260px;">
+ <el-col :span="6" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex" style="margin-bottom: -20px;">
+ <el-card class="json-block" style="width:260px;margin-bottom: 2px;">
<div class="button-row" style="display: flex; justify-content: space-between;">
<div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
- <span v-if="item.title" :name="item.title.name" class="action-button">{{ item.title.name }}</span>
+ <span v-if="item.title" :name="item.title.name" class="action-button" >{{ item.title.name }}</span>
</div>
</div>
<div class="button-row" style="display: flex; justify-content: space-between;">
<div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
<el-button v-if="item.button" :name="item.button.name" v-model="item.button.value" class="action-button"
- @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend(item.button.name)"
- :class="{ 'green-button': item.button.value === 0 && item.button.name !== '娓呴櫎ID', 'red-button': item.button.value === 1 && item.button.name !== '娓呴櫎ID' }">{{
- item.button.name }}</el-button>
+ @click="updateButtonValue(dataGroup, itemIndex);submitDataToBackend(item.button.name)"
+ :class="{ 'green-button': item.button.value === 0 && item.button.name !== '娓呴櫎ID','red-button': item.button.value === 2 && item.button.name !== '娓呴櫎ID' ,'yellow-button': item.button.value === 1 && item.button.name !== '娓呴櫎ID' }">{{ item.button.name }}</el-button>
</div>
</div>
<div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
<div class="item-row">
<span class="name" style="width:150px;">{{ item.name }}</span>
- <el-input v-if="item.type === '0'" v-model="item.value" readonly="readonly" style="width:150px;"
- class="input-box"></el-input>
+ <el-input v-if="item.type === '0'" v-model="item.value" readonly="readonly" style="width:400px;" class="input-box"></el-input>
</div>
</div>
-
+
</el-card>
</el-col>
</el-row>
<!-- <el-button @click="submitDataToBackend">鎻愪氦鏁版嵁鍒板悗绔�</el-button> -->
</div>
-</template>
+ </template>
-<script>
-import LanguageMixin from '../../lang/LanguageMixin'
-import data from '../../configuration/parameter2'
-let socket;
-export default {
+ <script>
+ import LanguageMixin from '../../lang/LanguageMixin'
+ import data from '../../configuration/parameter2'
+ let socket;
+ export default {
+ destroyed() {
+ socket.close();
+ },
name: "Parameter2",
mixins: [LanguageMixin],
- data () {
+ data() {
return {
- jsonData: data,
+ jsonData: data ,
// 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
}
@@ -84,38 +82,38 @@
},
methods: {
- updateButtonValue (dataGroup, itemIndex) {
- // 灏嗗綋鍓嶆寜閽殑鍊艰涓�1
+ updateButtonValue(dataGroup, itemIndex) {
+ // 灏嗗綋鍓嶆寜閽殑鍊艰涓�1
+
+ this.$set(dataGroup[itemIndex].button, 'value', 1);
+
- this.$set(dataGroup[itemIndex].button, 'value', 1);
+ // 灏嗗叾浠栨寜閽殑鍊煎叏閮ㄨ涓�0
+},
+ submitDataToBackend(currentButtonName) {
+ if (currentButtonName === '娓呴櫎ID') {
+ const inputData = this.jsonData.map(dataGroup => {
+ return dataGroup.map(item => {
+ if (item.type === '3') {
+ return { value: item.button.value };
+ }
+ return null;
+ });
+ });
- // 灏嗗叾浠栨寜閽殑鍊煎叏閮ㄨ涓�0
-
- },
- submitDataToBackend (currentButtonName) {
- if (currentButtonName === '娓呴櫎ID') {
- const inputData = this.jsonData.map(dataGroup => {
- return dataGroup.map(item => {
- if (item.type === '3') {
- return { value: item.button.value };
- }
- return null;
- });
- });
-
- const values = inputData.flat().filter(item => item !== null).map(item => item.value);
-
- const jsonObject = { data: values };
-
- // 鎻愪氦鏁版嵁鍒板悗绔�
- const jsonString = JSON.stringify(jsonObject);
- console.log('Type涓�3鐨剉alue:', jsonString);
- socket?.send(jsonString);
- }
- },
+ const values = inputData.flat().filter(item => item !== null).map(item => item.value);
+ const jsonObject = { data: values };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const jsonString = JSON.stringify(jsonObject);
+ console.log('Type涓�3鐨剉alue:', jsonString);
+ socket?.send(jsonString);
+ window.location.reload();
+ }
+},
initWebSocket () {
-
+
let viewname = "Parameter2";
if (typeof WebSocket === "undefined") {
@@ -138,90 +136,92 @@
// 鏀跺埌娑堟伅
socket.onmessage = (msg) => {
- if (!msg.data) {
- return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
- }
+ if (!msg.data) {
+ return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
+ }
- let obj = JSON.parse(msg.data);
+ let obj = JSON.parse(msg.data);
+
+ const jsonData2 = this.jsonData;
+
+ // 濡傛灉榧犳爣涓嶅湪杈撳叆妗嗗唴锛屾洿鏂拌緭鍏ユ鐨勫��
+ // this.submitDataToBackend()
+ const parms = obj.params;
+ // const xiaoche = obj.params[3];
+
+ // console.log(parms);
+//娓呴櫎id
+ for (let i = 0; i < jsonData2.length; i++) {
+ let arr = jsonData2[i];
+ for (let j = 0; j < arr.length; j++) {
+ let obj = arr[j];
+ if (obj.type === '3') {
+ obj.button.value = parms[0][i];
+ }
+ }
- const jsonData2 = this.jsonData;
+
+}
+//ID
+ for (let i = 0; i < jsonData2.length; i++) {
+ let arr = jsonData2[i];
+ for (let j = 0; j < arr.length; j++) {
+ let obj = arr[j];
+ if (obj.type === '0') {
+ obj.value = parms[1][i];
+ }
+ }
- // 濡傛灉榧犳爣涓嶅湪杈撳叆妗嗗唴锛屾洿鏂拌緭鍏ユ鐨勫��
- // this.submitDataToBackend()
- const parms = obj.params;
- // const xiaoche = obj.params[3];
+
+}
+//鎵嬪姩鐘舵��
+for (let i = 0; i < jsonData2.length; i++) {
+ let arr = jsonData2[i];
+ for (let j = 0; j < arr.length; j++) {
+ let obj = arr[j];
+ if (obj.type === '4') {
+ obj.button.value = parms[2][i];
+ }
+ }
- console.log(parms);
+
+}
+//鎵弿鏋壂鐮佺殑ID
+jsonData2.forEach((item) => {
+ item.forEach((subItem) => {
+ if (subItem.read === 66) {
+ subItem.value = parms[3][0];
+ }
+ });
+});
- for (let i = 0; i < jsonData2.length; i++) {
- let arr = jsonData2[i];
- for (let j = 0; j < arr.length; j++) {
- let obj = arr[j];
- if (obj.type === '3') {
- obj.button.value = parms[0][i];
- }
+
+
+//A01褰撳墠鏍煎瓙
+let lastParmsArray = parms[parms.length - 1];
+
+let lastParmsIndex = 0;
+
+for (let i = 0; i < jsonData2.length; i++) {
+ for (let j = 0; j < jsonData2[i].length; j++) {
+ if (jsonData2[i][j].read === 333) {
+ jsonData2[i][j].value = lastParmsArray[lastParmsIndex];
+ lastParmsIndex++;
+ if (lastParmsIndex === lastParmsArray.length) {
+ lastParmsIndex = 0;
}
-
-
- }
-
- for (let i = 0; i < jsonData2.length; i++) {
- let arr = jsonData2[i];
- for (let j = 0; j < arr.length; j++) {
- let obj = arr[j];
- if (obj.type === '0') {
- obj.value = parms[1][i];
- }
- }
-
-
- }
-
- for (let i = 0; i < jsonData2.length; i++) {
- let arr = jsonData2[i];
- for (let j = 0; j < arr.length; j++) {
- let obj = arr[j];
- if (obj.type === '4') {
- obj.button.value = parms[2][i];
- }
- }
-
-
- }
-
- jsonData2.forEach((item) => {
- item.forEach((subItem) => {
- if (subItem.read === 66) {
- subItem.value = parms[3][0];
- }
- });
- });
-
-
- let lastParmsArray = parms[parms.length - 1];
-
- let lastParmsIndex = 0;
-
- for (let i = 0; i < jsonData2.length; i++) {
- for (let j = 0; j < jsonData2[i].length; j++) {
- if (jsonData2[i][j].read === 333) {
- jsonData2[i][j].value = lastParmsArray[lastParmsIndex];
- lastParmsIndex++;
- if (lastParmsIndex === lastParmsArray.length) {
- lastParmsIndex = 0;
- }
- }
- }
- }
+ }
+ }
+}
- // console.log(jsonData2);
+// console.log(jsonData2);
-
- };
+
+};
@@ -235,34 +235,33 @@
socket.onerror = function () {
console.log("websocket鍙戠敓浜嗛敊璇�");
};
+
}
},
send () {
-
-
+
+
socket?.send(JSON.stringify(this.messagepack));
}
}
-}
-</script>
+ }
+ </script>
-<style scoped>
-.item-row {
+ <style scoped>
+ .item-row {
display: flex;
align-items: center;
- margin-bottom: 5px;
- /* 璋冩暣姣忎釜椤圭洰涔嬮棿鐨勯棿璺� */
-}
-
-.action-button {
+ margin-bottom: 5px; /* 璋冩暣姣忎釜椤圭洰涔嬮棿鐨勯棿璺� */
+ }
+
+ .action-button {
margin-right: 30px;
background: #66b1ff;
color: #FFF;
-}
-
-.blue-button {
+ }
+ .blue-button {
background-color: skyblue;
}
@@ -270,7 +269,11 @@
background-color: green;
}
-.red-button {
+.red-button{
background-color: red;
}
-</style>
\ No newline at end of file
+.yellow-button{
+ background-color: blue;
+}
+
+ </style>
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/Electrical/Positioning1.vue b/CanadaMes-ui/src/views/Electrical/Positioning1.vue
index 26dd5ec..81621ee 100644
--- a/CanadaMes-ui/src/views/Electrical/Positioning1.vue
+++ b/CanadaMes-ui/src/views/Electrical/Positioning1.vue
@@ -55,13 +55,13 @@
<div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
<div class="item-row">
<span class="name" style="width:250px;">{{ item.name }}</span>
- <el-input v-if="item.type === '0'" v-model="item.value" class="input-box"></el-input>
+ <el-input v-if="item.type === '0'" v-model="item.value" class="input-box" @keyup.enter.native="submitDataToBackend" ></el-input>
- <el-button
+ <!-- <el-button
v-if="item.type === '0' && item.name !== '鏍煎瓙闂磋窛' && item.name !== '鍑虹墖鎺ョ墖鍦板潃' && item.name !== '瀛樼墖鎺ョ墖鍦板潃'"
- class="input-box" @click="submitDataToBackend();">鍙栧湴鍧�</el-button>
+ class="input-box" @click="submitDataToBackend();">鍙栧湴鍧�</el-button> -->
</div>
</div>
diff --git a/CanadaMes-ui/src/views/Electrical/Positioning2.vue b/CanadaMes-ui/src/views/Electrical/Positioning2.vue
index 553a123..56a5093 100644
--- a/CanadaMes-ui/src/views/Electrical/Positioning2.vue
+++ b/CanadaMes-ui/src/views/Electrical/Positioning2.vue
@@ -55,8 +55,8 @@
<div v-for="(item, itemIndex) in dataGroup" :key="itemIndex" class="item-container">
<div class="item-row">
<span class="name" style="width:250px;">{{ item.name }}</span>
- <el-input v-if="item.type === '0'" v-model="item.value" class="input-box"></el-input>
- <el-button v-if="item.type === '0'" class="input-box" @click="submitDataToBackend();">鍙栧湴鍧�</el-button>
+ <el-input v-if="item.type === '0'" v-model="item.value" class="input-box" @keyup.enter.native="submitDataToBackend"></el-input>
+ <!-- <el-button v-if="item.type === '0'" class="input-box" @click="submitDataToBackend();">鍙栧湴鍧�</el-button> -->
</div>
</div>
diff --git a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
index 5e5c1b6..dbee303 100644
--- a/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
+++ b/CanadaMes-ui/src/views/Electrical/ServoManualone.vue
@@ -1,66 +1,56 @@
<template>
- <div class="app">
+ <div class="app">
<el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
- <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
- }}</router-link>
- <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
- }}</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
- }}</router-link>
- <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
- }}</router-link>
- <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
- }}</router-link>
- <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{
- $t('ServoManual')
- }}</router-link>
+ <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm')
+ }}</router-link>
+ <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State')
+ }}</router-link>
+ <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action')
+ }}</router-link>
+ <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter')
+ }}</router-link>
+ <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign')
+ }}</router-link>
+ <router-link to="/Electrical/Servomanual" tag="el-button" type="text" active-class="blue-button">{{ $t('Servo Manual')
+ }}</router-link>
+ </el-breadcrumb>
- </el-breadcrumb>
-
- <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
-
- <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{
- $t('Servomanualone')
+ <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
+
+ <router-link to="/Electrical/Servomanualone" tag="el-button" type="text" active-class="blue-button">{{ $t('Servomanualone')
}}</router-link>
- <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
- }}</router-link>
- <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
- }}</router-link>
- <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{
- $t('Positioning1')
- }}</router-link>
- <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{
- $t('Positioning2')
- }}</router-link>
+ <router-link to="/Electrical/Parameter1" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter1')
+ }}</router-link>
+ <router-link to="/Electrical/Parameter2" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter2')
+ }}</router-link>
+ <router-link to="/Electrical/Positioning1" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning1')
+ }}</router-link>
+ <router-link to="/Electrical/Positioning2" tag="el-button" type="text" active-class="blue-button">{{ $t('Positioning2')
+ }}</router-link>
</el-breadcrumb>
<el-row :gutter="26">
- <el-col :span="12" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex">
- <el-card class="json-block" style="width:auto;">
- <el-row>
- <el-col v-for="(item, itemIndex) in dataGroup" :key="itemIndex" :span="12">
- <div class="item-container">
- <div class="item-row">
- <span class="name" style='width:230px;'>{{ item.name }}</span>
- <el-input v-if="item.type === '0'" v-model="item.value" class='input-box'
- :class="{ 'special-class': groupIndex === 0, 'special-class2': groupIndex === 1 }"
- v-show="groupIndex !== 0 && groupIndex !== 1"></el-input>
- </div>
- </div>
- </el-col>
- </el-row>
- <div class="button-row" style="display: flex; justify-content: space-between;">
- <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
- <el-button v-if="item.button" :name="item.button.name" v-model="item.button.value"
- :class="{ 'action-button': true, 'error-button': item.button.name === '鏁呴殰' && item.button.value === 1 }"
- @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend(item.button.name);">{{
- item.button.name }}</el-button>
-
+ <el-col :span="12" v-for="(dataGroup, groupIndex) in jsonData" :key="groupIndex" style="margin-bottom: -20px;">
+ <el-card class="json-block" style="width:auto;margin-bottom: 10px;">
+ <el-row >
+ <el-col v-for="(item, itemIndex) in dataGroup" :key="itemIndex" :span="12">
+ <div class="item-container">
+ <div class="item-row">
+ <span class="name" style='width:230px;'>{{ item.name }}</span>
+ <el-input v-if="item.type === '0'" v-model="item.value" class='input-box' :class="{ 'special-class': groupIndex === 0,'special-class2': groupIndex === 1 }" v-show="groupIndex !== 0 && groupIndex !== 1" ></el-input>
</div>
</div>
- </el-card>
- </el-col>
- </el-row>
+ </el-col>
+ </el-row>
+ <div class="button-row" style="display: flex; justify-content: space-between;">
+ <div v-for="(item, itemIndex) in dataGroup" :key="itemIndex">
+ <el-button v-if="item.button" :name="item.button.name" v-model="item.button.value" :class="{'action-button': true, 'error-button': item.button.name === '鏁呴殰' && item.button.value === 1}" @click="updateButtonValue(dataGroup, itemIndex); submitDataToBackend(item.button.name);">{{ item.button.name }}</el-button>
+
+ </div>
+ </div>
+ </el-card>
+ </el-col>
+</el-row>
<!-- <el-button @click="submitDataToBackend">鎻愪氦鏁版嵁鍒板悗绔�</el-button> -->
</div>
@@ -70,13 +60,15 @@
import LanguageMixin from '../../lang/LanguageMixin'
import data from '../../configuration/ServoManualone'
import { throttle } from 'lodash';
+
let socket;
-export default {
+ export default {
name: "ServoManualone",
mixins: [LanguageMixin],
- data () {
+
+ data() {
return {
- jsonData: data,
+ jsonData: data ,
// 鍔犺浇鏁翠釜data.json鏂囦欢浣滀负jsonData
}
@@ -86,85 +78,143 @@
// console.log('jsonData:', this.jsonData);
},
+
methods: {
- updateButtonValue (dataGroup, itemIndex) {
- // 灏嗗綋鍓嶆寜閽殑鍊艰涓�1
+
+
+ updateButtonValue(dataGroup, itemIndex) {
+ // 灏嗗綋鍓嶆寜閽殑鍊艰涓�1
+ this.$set(dataGroup[itemIndex].button, 'value', 1);
+
+ // 灏嗗叾浠栨寜閽殑鍊艰涓�0
+ // dataGroup.forEach((item, index) => {
+ // if (index !== itemIndex && item.button) {
+ // this.$set(item.button, 'value', 0);
+ // }
+ // });
+},
+submitDataToBackend(currentButtonName) {
+ if (currentButtonName === 'A01鍗婅嚜鍔ㄥ惎鍔�') {
+ const data = [];
- this.$set(dataGroup[itemIndex].button, 'value', 1);
+for (let i = 0; i < 1; i++) {
+ const inputData = this.jsonData[i].filter(item => item.type === '0').map(item => {
+ return { value: item.value };
+ });
+
+ const values = inputData.map(item => item.value);
+
+ data.push(values);
+}
+const jsonObject = { data };
- },
- submitDataToBackend (currentButtonName) {
- if (currentButtonName === '鍗婅嚜鍔ㄥ惎鍔�') {
- const data = [];
+// 鎻愪氦鏁版嵁鍒板悗绔�
+const jsonString = JSON.stringify(jsonObject);
+console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
+socket?.send(jsonString);
- for (let i = 0; i < 2; i++) {
- const inputData = this.jsonData[i].filter(item => item.type === '0').map(item => {
- return { value: item.value };
- });
+ }
- const values = inputData.map(item => item.value);
+ if (currentButtonName === 'A02鍗婅嚜鍔ㄥ惎鍔�') {
+ const data2 = [];
- data.push(values);
- }
+for (let i = 1; i < 2; i++) {
+ const inputData = this.jsonData[i].filter(item => item.type === '0').map(item => {
+ return { value: item.value };
+ });
+ const values2 = inputData.map(item => item.value);
+ data2.push(values2);
- const jsonObject = { data };
+}
+data2.unshift([]);
+const jsonObject = { data:data2 };
- // 鎻愪氦鏁版嵁鍒板悗绔�
- const jsonString = JSON.stringify(jsonObject);
- console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
- socket?.send(jsonString);
+// 鎻愪氦鏁版嵁鍒板悗绔�
+const jsonString = JSON.stringify(jsonObject);
+console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString);
+socket?.send(jsonString);
- }
+ }
- if (currentButtonName === '澶嶄綅') {
+ if (currentButtonName === '澶嶄綅') {
+ const data2 = [];
+ const resetButtonValues = this.jsonData.map(item => {
+ const buttonItem = item.find(subItem => subItem.button && subItem.button.name === '澶嶄綅');
+ return buttonItem ? buttonItem.button.value : null;
+ }).filter(value => value !== null);
- const data2 = [];
- const resetButtonValues = this.jsonData.map(item => {
- const buttonItem = item.find(subItem => subItem.button && subItem.button.name === '澶嶄綅');
- return buttonItem ? buttonItem.button.value : null;
- }).filter(value => value !== null);
+ // 灏嗗緱鍒扮殑鍊兼坊鍔犲埌 data 鏁扮粍涓�
+ data2.push(resetButtonValues.flat());
- // 灏嗗緱鍒扮殑鍊兼坊鍔犲埌 data 鏁扮粍涓�
- data2.push(...resetButtonValues);
- const jsonObject2 = { data2 };
+ // 鍦� data2 鏁扮粍鍓嶉潰娣诲姞涓や釜绌烘暟缁�
+ data2.unshift([], []);
- // 鎻愪氦鏁版嵁鍒板悗绔�
- const jsonString2 = JSON.stringify(jsonObject2);
- console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString2);
- socket?.send(jsonString2);
+ // 鍒涘缓 jsonObject2 瀵硅薄锛屽苟娣诲姞 data2 灞炴��
+ const jsonObject2 = { data: data2 };
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const jsonString2 = JSON.stringify(jsonObject2);
+ console.log('鎵�鏈塗ype涓�0鐨剉alue:', jsonString2);
+ socket?.send(jsonString2);
+ window.location.reload();
+}
- }
- if (currentButtonName === 'A01鍗婅嚜鍔�') {
- const elements = document.getElementsByClassName('special-class');
- for (let i = 0; i < elements.length; i++) {
- if (elements[i].style.display === 'none') {
- elements[i].style.display = ''; // 鏄剧ず鍏冪礌
- }
- }
- }
+if (currentButtonName === '鍥為浂') {
+ const data3 = [];
+ const resetButtonValues3 = this.jsonData.map(item => {
+ const buttonItem3 = item.find(subItem => subItem.button && subItem.button.name === '鍥為浂');
+ return buttonItem3 ? buttonItem3.button.value : null;
+ }).filter(value => value !== null);
- if (currentButtonName === 'A02鍗婅嚜鍔�') {
- const elements = document.getElementsByClassName('special-class2');
- for (let i = 0; i < elements.length; i++) {
- if (elements[i].style.display === 'none') {
- elements[i].style.display = ''; // 鏄剧ず鍏冪礌
- }
- }
- }
+ // 灏嗗緱鍒扮殑鍊兼坊鍔犲埌 data 鏁扮粍涓�
+ data3.push(resetButtonValues3.flat());
+
+ // 鍦� data3 鏁扮粍鍓嶉潰娣诲姞涓や釜绌烘暟缁�
+ data3.unshift([], [], []);
+
+ // 鍒涘缓 jsonObject2 瀵硅薄锛屽苟娣诲姞 data3 灞炴��
+ const jsonObject3 = { data: data3 };
+
+ // 鎻愪氦鏁版嵁鍒板悗绔�
+ const jsonString3 = JSON.stringify(jsonObject3);
+ console.log('鍥為浂:', jsonString3);
+ socket?.send(jsonString3);
+ window.location.reload();
+}
- },
+ if (currentButtonName === 'A01鍗婅嚜鍔�') {
+ const elements = document.getElementsByClassName('special-class');
+ for (let i = 0; i < elements.length; i++) {
+ if (elements[i].style.display === 'none') {
+ elements[i].style.display = ''; // 鏄剧ず鍏冪礌
+ }
+ }
+ }
+
+ if (currentButtonName === 'A02鍗婅嚜鍔�') {
+ const elements = document.getElementsByClassName('special-class2');
+ for (let i = 0; i < elements.length; i++) {
+ if (elements[i].style.display === 'none') {
+ elements[i].style.display = ''; // 鏄剧ず鍏冪礌
+ }
+ }
+ }
+
+
+
+
+},
initWebSocket () {
-
+
let viewname = "ServoManualone";
if (typeof WebSocket === "undefined") {
@@ -187,57 +237,78 @@
// 鏀跺埌娑堟伅
socket.onmessage = (msg) => {
- if (!msg.data) {
- return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
- }
+ if (!msg.data) {
+ return; // 濡傛灉鏀跺埌绌烘暟鎹紝鍒欑洿鎺ヨ繑鍥烇紝涓嶆墽琛屽悗缁�昏緫
+ }
- let obj = JSON.parse(msg.data);
- console.log(obj)
- const jsonData2 = this.jsonData;
+ let obj = JSON.parse(msg.data);
+ console.log(obj)
+ const jsonData2 = this.jsonData;
- const handleMouseMove = throttle(function (event) {
- const inputBox = document.querySelectorAll('.el-card__body');
- const target = event.target;
- if (inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
- // 鎵ц鏇存柊閫昏緫
- for (let i = 0; i < 6; i++) {
- jsonData2[i].forEach((item, index) => {
- if (typeof item.value !== 'undefined' && typeof obj[`zuhe${i + 1}`][0][index] !== 'undefined') {
- item.value = obj[`zuhe${i + 1}`][0][index];
- }
- });
- }
+ const handleMouseMove = throttle(function(event) {
+ const inputBox = document.querySelectorAll('.el-card__body');
+ const target = event.target;
+ if (inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
+ // 鎵ц鏇存柊閫昏緫
+ for (let i = 0; i < 6; i++) {
+ jsonData2[i].forEach((item, index) => {
+ if (typeof item.value !== 'undefined' && typeof obj[`zuhe${i+1}`][0][index] !== 'undefined') {
+ item.value = obj[`zuhe${i+1}`][0][index];
+ }
+ });
+}
- // 閬嶅巻guzhang鏁扮粍
- for (let i = 0; i < obj.guzhang[0].length; i++) {
- const guzhangValue = obj.guzhang[0][i];
+// 閬嶅巻guzhang鏁扮粍
+for (let i = 0; i < obj.guzhang[0].length; i++) {
+ const guzhangValue = obj.guzhang[0][i];
+
+ // 鏌ユ壘jsonData2涓甫鏈�"button"鐨勫璞★紝骞朵笖name绛変簬"鏁呴殰"
+ for (let j = 0; j < jsonData2.length; j++) {
+ const section = jsonData2[j];
+
+ for (let k = 0; k < section.length; k++) {
+ const item = section[k];
+
+ if (item.button && item.button.name === "鏁呴殰") {
+ // 鏇存柊value灞炴��
+ item.button.value = guzhangValue;
+ break;
+ }
+ }
+
+
+ }
+}
- // 鏌ユ壘jsonData2涓甫鏈�"button"鐨勫璞★紝骞朵笖name绛変簬"鏁呴殰"
- for (let j = 0; j < jsonData2.length; j++) {
- const section = jsonData2[j];
-
- for (let k = 0; k < section.length; k++) {
- const item = section[k];
-
- if (item.button && item.button.name === "鏁呴殰") {
- // 鏇存柊value灞炴��
- item.button.value = guzhangValue;
- break;
- }
- }
-
-
- }
- }
+for (let i = 0; i < obj.weihuiling[0].length; i++) {
+ const weihuilingValue = obj.weihuiling[0][i];
+
+ // 鏌ユ壘jsonData2涓甫鏈�"button"鐨勫璞★紝骞朵笖name绛変簬"鏁呴殰"
+ for (let j = 0; j < jsonData2.length; j++) {
+ const section = jsonData2[j];
+
+ for (let k = 0; k < section.length; k++) {
+ const item = section[k];
+
+ if (item.button && item.button.name === "鏈洖闆�") {
+ // 鏇存柊value灞炴��
+ item.button.value = weihuilingValue;
+ break;
+ }
+ }
+
+
+ }
+}
- }
- }, 200);
+ }
+}, 500);
- document.addEventListener('mouseover', handleMouseMove);
- };
+ document.addEventListener('mouseover', handleMouseMove);
+};
@@ -255,21 +326,22 @@
}
},
send () {
-
-
+
+
socket?.send(JSON.stringify(this.messagepack));
}
}
-}
+ }
</script>
<style scoped>
+
+
.item-row {
display: flex;
align-items: center;
- margin-bottom: 2px;
- /* 璋冩暣姣忎釜椤圭洰涔嬮棿鐨勯棿璺� */
+ margin-bottom: 2px; /* 璋冩暣姣忎釜椤圭洰涔嬮棿鐨勯棿璺� */
}
.action-button {
@@ -277,12 +349,12 @@
background: #66b1ff;
color: #FFF;
}
-
.blue-button {
background-color: skyblue;
}
-
.error-button {
background-color: red;
}
+
+
</style>
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/Electrical/Sign.vue b/CanadaMes-ui/src/views/Electrical/Sign.vue
index 1d23008..7dc4d0e 100644
--- a/CanadaMes-ui/src/views/Electrical/Sign.vue
+++ b/CanadaMes-ui/src/views/Electrical/Sign.vue
@@ -114,7 +114,7 @@
this.record.params[0] = obj.sig[0];
this.record.xyData = this.jsonData.sign;
-
+ console.log(this.jsonData.sign)
for (let a = 0; a < this.record.xyData.length; a++) {
this.record.xyData[a].value = this.record.params[0][a];
diff --git a/springboot-vue3/.idea/.gitignore b/springboot-vue3/.idea/.gitignore
index 91ee315..081b737 100644
--- a/springboot-vue3/.idea/.gitignore
+++ b/springboot-vue3/.idea/.gitignore
@@ -1,8 +1,8 @@
-# 榛樿蹇界暐鐨勬枃浠�
-/shelf/
-/workspace.xml
-# 鏁版嵁婧愭湰鍦板瓨鍌ㄥ凡蹇界暐鏂囦欢
-/dataSources/
-/dataSources.local.xml
-# 鍩轰簬缂栬緫鍣ㄧ殑 HTTP 瀹㈡埛绔姹�
-/httpRequests/
+# 榛樿蹇界暐鐨勬枃浠�
+/shelf/
+/workspace.xml
+# 鏁版嵁婧愭湰鍦板瓨鍌ㄥ凡蹇界暐鏂囦欢
+/dataSources/
+/dataSources.local.xml
+# 鍩轰簬缂栬緫鍣ㄧ殑 HTTP 瀹㈡埛绔姹�
+/httpRequests/
diff --git a/springboot-vue3/.idea/artifacts/springboot_vue3_war.xml b/springboot-vue3/.idea/artifacts/springboot_vue3_war.xml
index d419cc3..e2e6706 100644
--- a/springboot-vue3/.idea/artifacts/springboot_vue3_war.xml
+++ b/springboot-vue3/.idea/artifacts/springboot_vue3_war.xml
@@ -1,14 +1,14 @@
-<component name="ArtifactManager">
- <artifact type="war" name="springboot-vue3:war">
- <output-path>$PROJECT_DIR$/target</output-path>
- <properties id="maven-jee-properties">
- <options>
- <module>springboot-vue3</module>
- <packaging>war</packaging>
- </options>
- </properties>
- <root id="archive" name="springboot-vue3-0.0.1-SNAPSHOT.war">
- <element id="artifact" artifact-name="springboot-vue3:war exploded" />
- </root>
- </artifact>
+<component name="ArtifactManager">
+ <artifact type="war" name="springboot-vue3:war">
+ <output-path>$PROJECT_DIR$/target</output-path>
+ <properties id="maven-jee-properties">
+ <options>
+ <module>springboot-vue3</module>
+ <packaging>war</packaging>
+ </options>
+ </properties>
+ <root id="archive" name="springboot-vue3-0.0.1-SNAPSHOT.war">
+ <element id="artifact" artifact-name="springboot-vue3:war exploded" />
+ </root>
+ </artifact>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/artifacts/springboot_vue3_war_exploded.xml b/springboot-vue3/.idea/artifacts/springboot_vue3_war_exploded.xml
index 96b4d65..dbac47c 100644
--- a/springboot-vue3/.idea/artifacts/springboot_vue3_war_exploded.xml
+++ b/springboot-vue3/.idea/artifacts/springboot_vue3_war_exploded.xml
@@ -1,150 +1,150 @@
-<component name="ArtifactManager">
- <artifact type="exploded-war" name="springboot-vue3:war exploded">
- <output-path>$PROJECT_DIR$/target/springboot-vue3-0.0.1-SNAPSHOT</output-path>
- <properties id="maven-jee-properties">
- <options>
- <exploded>true</exploded>
- <module>springboot-vue3</module>
- <packaging>war</packaging>
- </options>
- </properties>
- <root id="root">
- <element id="directory" name="WEB-INF">
- <element id="directory" name="classes">
- <element id="module-output" name="springboot-vue3" />
- </element>
- <element id="directory" name="lib">
- <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.2.RELEASE" />
- <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter:2.3.2.RELEASE" />
- <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot:2.3.2.RELEASE" />
- <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.2.RELEASE" />
- <element id="library" level="project" name="Maven: ch.qos.logback:logback-classic:1.2.3" />
- <element id="library" level="project" name="Maven: ch.qos.logback:logback-core:1.2.3" />
- <element id="library" level="project" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" />
- <element id="library" level="project" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" />
- <element id="library" level="project" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" />
- <element id="library" level="project" name="Maven: org.yaml:snakeyaml:1.26" />
- <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.2.RELEASE" />
- <element id="library" level="project" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" />
- <element id="library" level="project" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" />
- <element id="library" level="project" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" />
- <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.2.RELEASE" />
- <element id="library" level="project" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.37" />
- <element id="library" level="project" name="Maven: org.glassfish:jakarta.el:3.0.3" />
- <element id="library" level="project" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.37" />
- <element id="library" level="project" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" />
- <element id="library" level="project" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" />
- <element id="library" level="project" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" />
- <element id="library" level="project" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" />
- <element id="library" level="project" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" />
- <element id="library" level="project" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" />
- <element id="library" level="project" name="Maven: mysql:mysql-connector-java:8.0.21" />
- <element id="library" level="project" name="Maven: net.bytebuddy:byte-buddy:1.10.13" />
- <element id="library" level="project" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" />
- <element id="library" level="project" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" />
- <element id="library" level="project" name="Maven: cn.hutool:hutool-all:5.5.4" />
- <element id="library" level="project" name="Maven: org.hibernate.validator:hibernate-validator:6.1.5.Final" />
- <element id="library" level="project" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" />
- <element id="library" level="project" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" />
- <element id="library" level="project" name="Maven: com.fasterxml:classmate:1.5.1" />
- <element id="library" level="project" name="Maven: io.jsonwebtoken:jjwt-api:0.10.7" />
- <element id="library" level="project" name="Maven: io.jsonwebtoken:jjwt-impl:0.10.7" />
- <element id="library" level="project" name="Maven: io.jsonwebtoken:jjwt-jackson:0.10.7" />
- <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" />
- <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" />
- <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" />
- <element id="library" level="project" name="Maven: org.apache.shiro:shiro-spring-boot-starter:1.8.0" />
- <element id="library" level="project" name="Maven: org.apache.shiro:shiro-spring:1.8.0" />
- <element id="library" level="project" name="Maven: org.apache.shiro:shiro-core:1.8.0" />
- <element id="library" level="project" name="Maven: org.apache.shiro:shiro-lang:1.8.0" />
- <element id="library" level="project" name="Maven: org.apache.shiro:shiro-cache:1.8.0" />
- <element id="library" level="project" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" />
- <element id="library" level="project" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" />
- <element id="library" level="project" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" />
- <element id="library" level="project" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" />
- <element id="library" level="project" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" />
- <element id="library" level="project" name="Maven: commons-beanutils:commons-beanutils:1.9.4" />
- <element id="library" level="project" name="Maven: commons-collections:commons-collections:3.2.2" />
- <element id="library" level="project" name="Maven: org.apache.shiro:shiro-event:1.8.0" />
- <element id="library" level="project" name="Maven: org.apache.shiro:shiro-web:1.8.0" />
- <element id="library" level="project" name="Maven: org.owasp.encoder:encoder:1.2.2" />
- <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.2.RELEASE" />
- <element id="library" level="project" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.2.0" />
- <element id="library" level="project" name="Maven: com.baomidou:mybatis-plus:3.2.0" />
- <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.2.RELEASE" />
- <element id="library" level="project" name="Maven: com.zaxxer:HikariCP:3.4.5" />
- <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:5.2.8.RELEASE" />
- <element id="library" level="project" name="Maven: org.springframework:spring-tx:5.2.8.RELEASE" />
- <element id="library" level="project" name="Maven: com.baomidou:mybatis-plus-core:3.2.0" />
- <element id="library" level="project" name="Maven: com.baomidou:mybatis-plus-annotation:3.2.0" />
- <element id="library" level="project" name="Maven: com.github.jsqlparser:jsqlparser:2.1" />
- <element id="library" level="project" name="Maven: org.mybatis:mybatis:3.5.2" />
- <element id="library" level="project" name="Maven: com.baomidou:mybatis-plus-generator:3.2.0" />
- <element id="library" level="project" name="Maven: com.baomidou:mybatis-plus-extension:3.2.0" />
- <element id="library" level="project" name="Maven: org.mybatis:mybatis-spring:2.0.2" />
- <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.3.2.RELEASE" />
- <element id="library" level="project" name="Maven: org.freemarker:freemarker:2.3.30" />
- <element id="library" level="project" name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE" />
- <element id="library" level="project" name="Maven: io.springfox:springfox-swagger2:2.9.2" />
- <element id="library" level="project" name="Maven: io.swagger:swagger-annotations:1.5.20" />
- <element id="library" level="project" name="Maven: io.swagger:swagger-models:1.5.20" />
- <element id="library" level="project" name="Maven: io.springfox:springfox-spi:2.9.2" />
- <element id="library" level="project" name="Maven: io.springfox:springfox-core:2.9.2" />
- <element id="library" level="project" name="Maven: io.springfox:springfox-schema:2.9.2" />
- <element id="library" level="project" name="Maven: io.springfox:springfox-swagger-common:2.9.2" />
- <element id="library" level="project" name="Maven: io.springfox:springfox-spring-web:2.9.2" />
- <element id="library" level="project" name="Maven: com.google.guava:guava:20.0" />
- <element id="library" level="project" name="Maven: org.slf4j:slf4j-api:1.7.30" />
- <element id="library" level="project" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" />
- <element id="library" level="project" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" />
- <element id="library" level="project" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" />
- <element id="library" level="project" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" />
- <element id="library" level="project" name="Maven: com.deepoove:poi-tl:1.12.1" />
- <element id="library" level="project" name="Maven: org.apache.commons:commons-lang3:3.10" />
- <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml:5.2.2" />
- <element id="library" level="project" name="Maven: org.apache.poi:poi:5.2.2" />
- <element id="library" level="project" name="Maven: commons-codec:commons-codec:1.14" />
- <element id="library" level="project" name="Maven: org.apache.commons:commons-math3:3.6.1" />
- <element id="library" level="project" name="Maven: com.zaxxer:SparseBitSet:1.2" />
- <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-lite:5.2.2" />
- <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:5.0.3" />
- <element id="library" level="project" name="Maven: org.apache.commons:commons-compress:1.21" />
- <element id="library" level="project" name="Maven: commons-io:commons-io:2.11.0" />
- <element id="library" level="project" name="Maven: com.github.virtuald:curvesapi:1.07" />
- <element id="library" level="project" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" />
- <element id="library" level="project" name="Maven: org.apache.commons:commons-collections4:4.4" />
- <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-transcoder:1.14" />
- <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-anim:1.14" />
- <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-css:1.14" />
- <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-ext:1.14" />
- <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-parser:1.14" />
- <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-svg-dom:1.14" />
- <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-awt-util:1.14" />
- <element id="library" level="project" name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:2.6" />
- <element id="library" level="project" name="Maven: commons-logging:commons-logging:1.0.4" />
- <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-bridge:1.14" />
- <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-script:1.14" />
- <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-dom:1.14" />
- <element id="library" level="project" name="Maven: xml-apis:xml-apis:1.4.01" />
- <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-gvt:1.14" />
- <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-shared-resources:1.14" />
- <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-svggen:1.14" />
- <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-util:1.14" />
- <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-constants:1.14" />
- <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-i18n:1.14" />
- <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-xml:1.14" />
- <element id="library" level="project" name="Maven: xml-apis:xml-apis-ext:1.3.04" />
- <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-codec:1.14" />
- <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.3.2.RELEASE" />
- <element id="library" level="project" name="Maven: org.springframework:spring-messaging:5.2.8.RELEASE" />
- <element id="library" level="project" name="Maven: org.springframework:spring-websocket:5.2.8.RELEASE" />
- <element id="library" level="project" name="Maven: com.github.xingshuangs:iot-communication:1.4.2" />
- </element>
- </element>
- <element id="directory" name="META-INF">
- <element id="file-copy" path="$PROJECT_DIR$/target/springboot-vue3-0.0.1-SNAPSHOT/META-INF/MANIFEST.MF" />
- </element>
- <element id="javaee-facet-resources" facet="springboot-vue3/web/Web" />
- </root>
- </artifact>
+<component name="ArtifactManager">
+ <artifact type="exploded-war" name="springboot-vue3:war exploded">
+ <output-path>$PROJECT_DIR$/target/springboot-vue3-0.0.1-SNAPSHOT</output-path>
+ <properties id="maven-jee-properties">
+ <options>
+ <exploded>true</exploded>
+ <module>springboot-vue3</module>
+ <packaging>war</packaging>
+ </options>
+ </properties>
+ <root id="root">
+ <element id="directory" name="WEB-INF">
+ <element id="directory" name="classes">
+ <element id="module-output" name="springboot-vue3" />
+ </element>
+ <element id="directory" name="lib">
+ <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.2.RELEASE" />
+ <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter:2.3.2.RELEASE" />
+ <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot:2.3.2.RELEASE" />
+ <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.2.RELEASE" />
+ <element id="library" level="project" name="Maven: ch.qos.logback:logback-classic:1.2.3" />
+ <element id="library" level="project" name="Maven: ch.qos.logback:logback-core:1.2.3" />
+ <element id="library" level="project" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" />
+ <element id="library" level="project" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" />
+ <element id="library" level="project" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" />
+ <element id="library" level="project" name="Maven: org.yaml:snakeyaml:1.26" />
+ <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.2.RELEASE" />
+ <element id="library" level="project" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" />
+ <element id="library" level="project" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" />
+ <element id="library" level="project" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" />
+ <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.2.RELEASE" />
+ <element id="library" level="project" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.37" />
+ <element id="library" level="project" name="Maven: org.glassfish:jakarta.el:3.0.3" />
+ <element id="library" level="project" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.37" />
+ <element id="library" level="project" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" />
+ <element id="library" level="project" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" />
+ <element id="library" level="project" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" />
+ <element id="library" level="project" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" />
+ <element id="library" level="project" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" />
+ <element id="library" level="project" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" />
+ <element id="library" level="project" name="Maven: mysql:mysql-connector-java:8.0.21" />
+ <element id="library" level="project" name="Maven: net.bytebuddy:byte-buddy:1.10.13" />
+ <element id="library" level="project" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" />
+ <element id="library" level="project" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" />
+ <element id="library" level="project" name="Maven: cn.hutool:hutool-all:5.5.4" />
+ <element id="library" level="project" name="Maven: org.hibernate.validator:hibernate-validator:6.1.5.Final" />
+ <element id="library" level="project" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" />
+ <element id="library" level="project" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" />
+ <element id="library" level="project" name="Maven: com.fasterxml:classmate:1.5.1" />
+ <element id="library" level="project" name="Maven: io.jsonwebtoken:jjwt-api:0.10.7" />
+ <element id="library" level="project" name="Maven: io.jsonwebtoken:jjwt-impl:0.10.7" />
+ <element id="library" level="project" name="Maven: io.jsonwebtoken:jjwt-jackson:0.10.7" />
+ <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" />
+ <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" />
+ <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" />
+ <element id="library" level="project" name="Maven: org.apache.shiro:shiro-spring-boot-starter:1.8.0" />
+ <element id="library" level="project" name="Maven: org.apache.shiro:shiro-spring:1.8.0" />
+ <element id="library" level="project" name="Maven: org.apache.shiro:shiro-core:1.8.0" />
+ <element id="library" level="project" name="Maven: org.apache.shiro:shiro-lang:1.8.0" />
+ <element id="library" level="project" name="Maven: org.apache.shiro:shiro-cache:1.8.0" />
+ <element id="library" level="project" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" />
+ <element id="library" level="project" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" />
+ <element id="library" level="project" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" />
+ <element id="library" level="project" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" />
+ <element id="library" level="project" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" />
+ <element id="library" level="project" name="Maven: commons-beanutils:commons-beanutils:1.9.4" />
+ <element id="library" level="project" name="Maven: commons-collections:commons-collections:3.2.2" />
+ <element id="library" level="project" name="Maven: org.apache.shiro:shiro-event:1.8.0" />
+ <element id="library" level="project" name="Maven: org.apache.shiro:shiro-web:1.8.0" />
+ <element id="library" level="project" name="Maven: org.owasp.encoder:encoder:1.2.2" />
+ <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.2.RELEASE" />
+ <element id="library" level="project" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.2.0" />
+ <element id="library" level="project" name="Maven: com.baomidou:mybatis-plus:3.2.0" />
+ <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.2.RELEASE" />
+ <element id="library" level="project" name="Maven: com.zaxxer:HikariCP:3.4.5" />
+ <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:5.2.8.RELEASE" />
+ <element id="library" level="project" name="Maven: org.springframework:spring-tx:5.2.8.RELEASE" />
+ <element id="library" level="project" name="Maven: com.baomidou:mybatis-plus-core:3.2.0" />
+ <element id="library" level="project" name="Maven: com.baomidou:mybatis-plus-annotation:3.2.0" />
+ <element id="library" level="project" name="Maven: com.github.jsqlparser:jsqlparser:2.1" />
+ <element id="library" level="project" name="Maven: org.mybatis:mybatis:3.5.2" />
+ <element id="library" level="project" name="Maven: com.baomidou:mybatis-plus-generator:3.2.0" />
+ <element id="library" level="project" name="Maven: com.baomidou:mybatis-plus-extension:3.2.0" />
+ <element id="library" level="project" name="Maven: org.mybatis:mybatis-spring:2.0.2" />
+ <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.3.2.RELEASE" />
+ <element id="library" level="project" name="Maven: org.freemarker:freemarker:2.3.30" />
+ <element id="library" level="project" name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE" />
+ <element id="library" level="project" name="Maven: io.springfox:springfox-swagger2:2.9.2" />
+ <element id="library" level="project" name="Maven: io.swagger:swagger-annotations:1.5.20" />
+ <element id="library" level="project" name="Maven: io.swagger:swagger-models:1.5.20" />
+ <element id="library" level="project" name="Maven: io.springfox:springfox-spi:2.9.2" />
+ <element id="library" level="project" name="Maven: io.springfox:springfox-core:2.9.2" />
+ <element id="library" level="project" name="Maven: io.springfox:springfox-schema:2.9.2" />
+ <element id="library" level="project" name="Maven: io.springfox:springfox-swagger-common:2.9.2" />
+ <element id="library" level="project" name="Maven: io.springfox:springfox-spring-web:2.9.2" />
+ <element id="library" level="project" name="Maven: com.google.guava:guava:20.0" />
+ <element id="library" level="project" name="Maven: org.slf4j:slf4j-api:1.7.30" />
+ <element id="library" level="project" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" />
+ <element id="library" level="project" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" />
+ <element id="library" level="project" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" />
+ <element id="library" level="project" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" />
+ <element id="library" level="project" name="Maven: com.deepoove:poi-tl:1.12.1" />
+ <element id="library" level="project" name="Maven: org.apache.commons:commons-lang3:3.10" />
+ <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml:5.2.2" />
+ <element id="library" level="project" name="Maven: org.apache.poi:poi:5.2.2" />
+ <element id="library" level="project" name="Maven: commons-codec:commons-codec:1.14" />
+ <element id="library" level="project" name="Maven: org.apache.commons:commons-math3:3.6.1" />
+ <element id="library" level="project" name="Maven: com.zaxxer:SparseBitSet:1.2" />
+ <element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml-lite:5.2.2" />
+ <element id="library" level="project" name="Maven: org.apache.xmlbeans:xmlbeans:5.0.3" />
+ <element id="library" level="project" name="Maven: org.apache.commons:commons-compress:1.21" />
+ <element id="library" level="project" name="Maven: commons-io:commons-io:2.11.0" />
+ <element id="library" level="project" name="Maven: com.github.virtuald:curvesapi:1.07" />
+ <element id="library" level="project" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" />
+ <element id="library" level="project" name="Maven: org.apache.commons:commons-collections4:4.4" />
+ <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-transcoder:1.14" />
+ <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-anim:1.14" />
+ <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-css:1.14" />
+ <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-ext:1.14" />
+ <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-parser:1.14" />
+ <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-svg-dom:1.14" />
+ <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-awt-util:1.14" />
+ <element id="library" level="project" name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:2.6" />
+ <element id="library" level="project" name="Maven: commons-logging:commons-logging:1.0.4" />
+ <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-bridge:1.14" />
+ <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-script:1.14" />
+ <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-dom:1.14" />
+ <element id="library" level="project" name="Maven: xml-apis:xml-apis:1.4.01" />
+ <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-gvt:1.14" />
+ <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-shared-resources:1.14" />
+ <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-svggen:1.14" />
+ <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-util:1.14" />
+ <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-constants:1.14" />
+ <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-i18n:1.14" />
+ <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-xml:1.14" />
+ <element id="library" level="project" name="Maven: xml-apis:xml-apis-ext:1.3.04" />
+ <element id="library" level="project" name="Maven: org.apache.xmlgraphics:batik-codec:1.14" />
+ <element id="library" level="project" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.3.2.RELEASE" />
+ <element id="library" level="project" name="Maven: org.springframework:spring-messaging:5.2.8.RELEASE" />
+ <element id="library" level="project" name="Maven: org.springframework:spring-websocket:5.2.8.RELEASE" />
+ <element id="library" level="project" name="Maven: com.github.xingshuangs:iot-communication:1.4.2" />
+ </element>
+ </element>
+ <element id="directory" name="META-INF">
+ <element id="file-copy" path="$PROJECT_DIR$/target/springboot-vue3-0.0.1-SNAPSHOT/META-INF/MANIFEST.MF" />
+ </element>
+ <element id="javaee-facet-resources" facet="springboot-vue3/web/Web" />
+ </root>
+ </artifact>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/compiler.xml b/springboot-vue3/.idea/compiler.xml
index feb7d3a..aea3015 100644
--- a/springboot-vue3/.idea/compiler.xml
+++ b/springboot-vue3/.idea/compiler.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="CompilerConfiguration">
- <annotationProcessing>
- <profile default="true" name="Default" enabled="true" />
- <profile name="Maven default annotation processors profile" enabled="true">
- <sourceOutputDir name="target/generated-sources/annotations" />
- <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
- <outputRelativeToContentRoot value="true" />
- <module name="springboot-vue3" />
- </profile>
- </annotationProcessing>
- <bytecodeTargetLevel>
- <module name="springboot-vue3" target="8" />
- </bytecodeTargetLevel>
- </component>
- <component name="JavacSettings">
- <option name="ADDITIONAL_OPTIONS_OVERRIDE">
- <module name="springboot-vue3" options="-parameters" />
- </option>
- </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="CompilerConfiguration">
+ <annotationProcessing>
+ <profile default="true" name="Default" enabled="true" />
+ <profile name="Maven default annotation processors profile" enabled="true">
+ <sourceOutputDir name="target/generated-sources/annotations" />
+ <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+ <outputRelativeToContentRoot value="true" />
+ <module name="springboot-vue3" />
+ </profile>
+ </annotationProcessing>
+ <bytecodeTargetLevel>
+ <module name="springboot-vue3" target="8" />
+ </bytecodeTargetLevel>
+ </component>
+ <component name="JavacSettings">
+ <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+ <module name="springboot-vue3" options="-parameters" />
+ </option>
+ </component>
</project>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/encodings.xml b/springboot-vue3/.idea/encodings.xml
index a156f52..aa00ffa 100644
--- a/springboot-vue3/.idea/encodings.xml
+++ b/springboot-vue3/.idea/encodings.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="Encoding">
- <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
- </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Encoding">
+ <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+ </component>
</project>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/jarRepositories.xml b/springboot-vue3/.idea/jarRepositories.xml
index 2898d49..52f4dcd 100644
--- a/springboot-vue3/.idea/jarRepositories.xml
+++ b/springboot-vue3/.idea/jarRepositories.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="RemoteRepositoriesConfiguration">
- <remote-repository>
- <option name="id" value="central" />
- <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="Maven Central repository" />
- <option name="url" value="https://repo1.maven.org/maven2" />
- </remote-repository>
- <remote-repository>
- <option name="id" value="nexus-aliyun" />
- <option name="name" value="nexus-aliyun" />
- <option name="url" value="http://maven.aliyun.com/nexus/content/groups/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/" />
- </remote-repository>
- </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="RemoteRepositoriesConfiguration">
+ <remote-repository>
+ <option name="id" value="central" />
+ <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="Maven Central repository" />
+ <option name="url" value="https://repo1.maven.org/maven2" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="nexus-aliyun" />
+ <option name="name" value="nexus-aliyun" />
+ <option name="url" value="http://maven.aliyun.com/nexus/content/groups/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/" />
+ </remote-repository>
+ </component>
</project>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml b/springboot-vue3/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml
index dd874c7..6fec8f4 100644
--- a/springboot-vue3/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml
+++ b/springboot-vue3/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: ch.qos.logback:logback-classic:1.2.3">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: ch.qos.logback:logback-classic:1.2.3">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml b/springboot-vue3/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml
index 974b2b2..9eb8596 100644
--- a/springboot-vue3/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml
+++ b/springboot-vue3/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: ch.qos.logback:logback-core:1.2.3">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: ch.qos.logback:logback-core:1.2.3">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__cn_hutool_hutool_all_5_5_4.xml b/springboot-vue3/.idea/libraries/Maven__cn_hutool_hutool_all_5_5_4.xml
index 866152b..2c37d9e 100644
--- a/springboot-vue3/.idea/libraries/Maven__cn_hutool_hutool_all_5_5_4.xml
+++ b/springboot-vue3/.idea/libraries/Maven__cn_hutool_hutool_all_5_5_4.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: cn.hutool:hutool-all:5.5.4">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.5.4/hutool-all-5.5.4.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.5.4/hutool-all-5.5.4-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.5.4/hutool-all-5.5.4-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: cn.hutool:hutool-all:5.5.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.5.4/hutool-all-5.5.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.5.4/hutool-all-5.5.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.5.4/hutool-all-5.5.4-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_2_0.xml b/springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_2_0.xml
index 0fd727b..af36493 100644
--- a/springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_2_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_2_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: com.baomidou:mybatis-plus:3.2.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.2.0/mybatis-plus-3.2.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.2.0/mybatis-plus-3.2.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.2.0/mybatis-plus-3.2.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: com.baomidou:mybatis-plus:3.2.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.2.0/mybatis-plus-3.2.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.2.0/mybatis-plus-3.2.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.2.0/mybatis-plus-3.2.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_2_0.xml b/springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_2_0.xml
index 8d2255a..ed7c028 100644
--- a/springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_2_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_2_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: com.baomidou:mybatis-plus-annotation:3.2.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.2.0/mybatis-plus-annotation-3.2.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.2.0/mybatis-plus-annotation-3.2.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.2.0/mybatis-plus-annotation-3.2.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: com.baomidou:mybatis-plus-annotation:3.2.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.2.0/mybatis-plus-annotation-3.2.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.2.0/mybatis-plus-annotation-3.2.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.2.0/mybatis-plus-annotation-3.2.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_2_0.xml b/springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_2_0.xml
index 94f896a..64ee3b1 100644
--- a/springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_2_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_2_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: com.baomidou:mybatis-plus-boot-starter:3.2.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.2.0/mybatis-plus-boot-starter-3.2.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.2.0/mybatis-plus-boot-starter-3.2.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.2.0/mybatis-plus-boot-starter-3.2.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: com.baomidou:mybatis-plus-boot-starter:3.2.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.2.0/mybatis-plus-boot-starter-3.2.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.2.0/mybatis-plus-boot-starter-3.2.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.2.0/mybatis-plus-boot-starter-3.2.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_2_0.xml b/springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_2_0.xml
index 96519fa..997e69b 100644
--- a/springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_2_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_2_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: com.baomidou:mybatis-plus-core:3.2.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.2.0/mybatis-plus-core-3.2.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.2.0/mybatis-plus-core-3.2.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.2.0/mybatis-plus-core-3.2.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: com.baomidou:mybatis-plus-core:3.2.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.2.0/mybatis-plus-core-3.2.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.2.0/mybatis-plus-core-3.2.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.2.0/mybatis-plus-core-3.2.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_2_0.xml b/springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_2_0.xml
index 57362c8..32aac0b 100644
--- a/springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_2_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_2_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: com.baomidou:mybatis-plus-extension:3.2.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.2.0/mybatis-plus-extension-3.2.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.2.0/mybatis-plus-extension-3.2.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.2.0/mybatis-plus-extension-3.2.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: com.baomidou:mybatis-plus-extension:3.2.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.2.0/mybatis-plus-extension-3.2.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.2.0/mybatis-plus-extension-3.2.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.2.0/mybatis-plus-extension-3.2.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_2_0.xml b/springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_2_0.xml
index ca31978..6e572fd 100644
--- a/springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_2_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_2_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: com.baomidou:mybatis-plus-generator:3.2.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.2.0/mybatis-plus-generator-3.2.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.2.0/mybatis-plus-generator-3.2.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.2.0/mybatis-plus-generator-3.2.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: com.baomidou:mybatis-plus-generator:3.2.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.2.0/mybatis-plus-generator-3.2.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.2.0/mybatis-plus-generator-3.2.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.2.0/mybatis-plus-generator-3.2.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__com_deepoove_poi_tl_1_12_1.xml b/springboot-vue3/.idea/libraries/Maven__com_deepoove_poi_tl_1_12_1.xml
index 919c04c..666b745 100644
--- a/springboot-vue3/.idea/libraries/Maven__com_deepoove_poi_tl_1_12_1.xml
+++ b/springboot-vue3/.idea/libraries/Maven__com_deepoove_poi_tl_1_12_1.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: com.deepoove:poi-tl:1.12.1">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/deepoove/poi-tl/1.12.1/poi-tl-1.12.1.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/deepoove/poi-tl/1.12.1/poi-tl-1.12.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/deepoove/poi-tl/1.12.1/poi-tl-1.12.1-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: com.deepoove:poi-tl:1.12.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/deepoove/poi-tl/1.12.1/poi-tl-1.12.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/deepoove/poi-tl/1.12.1/poi-tl-1.12.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/deepoove/poi-tl/1.12.1/poi-tl-1.12.1-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml b/springboot-vue3/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml
index 3b35db3..bc7d7fd 100644
--- a/springboot-vue3/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml
+++ b/springboot-vue3/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: com.fasterxml:classmate:1.5.1">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: com.fasterxml:classmate:1.5.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_1.xml b/springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_1.xml
index d0298a3..3aa8175 100644
--- a/springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_1.xml
+++ b/springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_1.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.11.1/jackson-annotations-2.11.1.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.11.1/jackson-annotations-2.11.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.11.1/jackson-annotations-2.11.1-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.11.1/jackson-annotations-2.11.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.11.1/jackson-annotations-2.11.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.11.1/jackson-annotations-2.11.1-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_1.xml b/springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_1.xml
index 062aed4..bd0d979 100644
--- a/springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_1.xml
+++ b/springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_1.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.11.1/jackson-core-2.11.1.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.11.1/jackson-core-2.11.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.11.1/jackson-core-2.11.1-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.11.1/jackson-core-2.11.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.11.1/jackson-core-2.11.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.11.1/jackson-core-2.11.1-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_1.xml b/springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_1.xml
index f8da2fd..08c0010 100644
--- a/springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_1.xml
+++ b/springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_1.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.11.1/jackson-databind-2.11.1.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.11.1/jackson-databind-2.11.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.11.1/jackson-databind-2.11.1-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.11.1/jackson-databind-2.11.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.11.1/jackson-databind-2.11.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.11.1/jackson-databind-2.11.1-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_1.xml b/springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_1.xml
index 6d6c4c9..ea31a53 100644
--- a/springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_1.xml
+++ b/springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_1.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.11.1/jackson-datatype-jdk8-2.11.1.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.11.1/jackson-datatype-jdk8-2.11.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.11.1/jackson-datatype-jdk8-2.11.1-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.11.1/jackson-datatype-jdk8-2.11.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.11.1/jackson-datatype-jdk8-2.11.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.11.1/jackson-datatype-jdk8-2.11.1-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_1.xml b/springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_1.xml
index b231d25..50b2736 100644
--- a/springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_1.xml
+++ b/springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_1.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.11.1/jackson-datatype-jsr310-2.11.1.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.11.1/jackson-datatype-jsr310-2.11.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.11.1/jackson-datatype-jsr310-2.11.1-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.11.1/jackson-datatype-jsr310-2.11.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.11.1/jackson-datatype-jsr310-2.11.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.11.1/jackson-datatype-jsr310-2.11.1-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_1.xml b/springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_1.xml
index 8ec64d5..6eac973 100644
--- a/springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_1.xml
+++ b/springboot-vue3/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_1.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.11.1/jackson-module-parameter-names-2.11.1.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.11.1/jackson-module-parameter-names-2.11.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.11.1/jackson-module-parameter-names-2.11.1-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.11.1/jackson-module-parameter-names-2.11.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.11.1/jackson-module-parameter-names-2.11.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.11.1/jackson-module-parameter-names-2.11.1-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_1.xml b/springboot-vue3/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_1.xml
index 803bc2e..e9b391b 100644
--- a/springboot-vue3/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_1.xml
+++ b/springboot-vue3/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_1.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: com.github.jsqlparser:jsqlparser:2.1">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/2.1/jsqlparser-2.1.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/2.1/jsqlparser-2.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/2.1/jsqlparser-2.1-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: com.github.jsqlparser:jsqlparser:2.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/2.1/jsqlparser-2.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/2.1/jsqlparser-2.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/2.1/jsqlparser-2.1-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_07.xml b/springboot-vue3/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_07.xml
index 00d41fe..6b2810c 100644
--- a/springboot-vue3/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_07.xml
+++ b/springboot-vue3/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_07.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: com.github.virtuald:curvesapi:1.07">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/github/virtuald/curvesapi/1.07/curvesapi-1.07.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/github/virtuald/curvesapi/1.07/curvesapi-1.07-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/github/virtuald/curvesapi/1.07/curvesapi-1.07-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: com.github.virtuald:curvesapi:1.07">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/github/virtuald/curvesapi/1.07/curvesapi-1.07.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/github/virtuald/curvesapi/1.07/curvesapi-1.07-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/github/virtuald/curvesapi/1.07/curvesapi-1.07-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__com_github_xingshuangs_iot_communication_1_4_2.xml b/springboot-vue3/.idea/libraries/Maven__com_github_xingshuangs_iot_communication_1_4_2.xml
index 0bc4dc9..73b6bdf 100644
--- a/springboot-vue3/.idea/libraries/Maven__com_github_xingshuangs_iot_communication_1_4_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__com_github_xingshuangs_iot_communication_1_4_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: com.github.xingshuangs:iot-communication:1.4.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/github/xingshuangs/iot-communication/1.4.2/iot-communication-1.4.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/github/xingshuangs/iot-communication/1.4.2/iot-communication-1.4.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/github/xingshuangs/iot-communication/1.4.2/iot-communication-1.4.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: com.github.xingshuangs:iot-communication:1.4.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/github/xingshuangs/iot-communication/1.4.2/iot-communication-1.4.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/github/xingshuangs/iot-communication/1.4.2/iot-communication-1.4.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/github/xingshuangs/iot-communication/1.4.2/iot-communication-1.4.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__com_google_guava_guava_20_0.xml b/springboot-vue3/.idea/libraries/Maven__com_google_guava_guava_20_0.xml
index e38a4e0..c5bd322 100644
--- a/springboot-vue3/.idea/libraries/Maven__com_google_guava_guava_20_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__com_google_guava_guava_20_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: com.google.guava:guava:20.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/20.0/guava-20.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/20.0/guava-20.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/20.0/guava-20.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: com.google.guava:guava:20.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/20.0/guava-20.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/20.0/guava-20.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/20.0/guava-20.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml b/springboot-vue3/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml
index a9e262b..f19f6eb 100644
--- a/springboot-vue3/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: com.jayway.jsonpath:json-path:2.4.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: com.jayway.jsonpath:json-path:2.4.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml b/springboot-vue3/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
index c987dd2..b8581a6 100644
--- a/springboot-vue3/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
+++ b/springboot-vue3/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_5.xml b/springboot-vue3/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_5.xml
index 52427de..97e2291 100644
--- a/springboot-vue3/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_5.xml
+++ b/springboot-vue3/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_5.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: com.zaxxer:HikariCP:3.4.5">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.4.5/HikariCP-3.4.5.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.4.5/HikariCP-3.4.5-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.4.5/HikariCP-3.4.5-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: com.zaxxer:HikariCP:3.4.5">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.4.5/HikariCP-3.4.5.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.4.5/HikariCP-3.4.5-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.4.5/HikariCP-3.4.5-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml b/springboot-vue3/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml
index 66ccc95..6ce4aae 100644
--- a/springboot-vue3/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: com.zaxxer:SparseBitSet:1.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/SparseBitSet/1.2/SparseBitSet-1.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/SparseBitSet/1.2/SparseBitSet-1.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/SparseBitSet/1.2/SparseBitSet-1.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: com.zaxxer:SparseBitSet:1.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/SparseBitSet/1.2/SparseBitSet-1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/SparseBitSet/1.2/SparseBitSet-1.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/SparseBitSet/1.2/SparseBitSet-1.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml b/springboot-vue3/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml
index b1aac3a..84eb115 100644
--- a/springboot-vue3/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml
+++ b/springboot-vue3/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: commons-beanutils:commons-beanutils:1.9.4">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.9.4/commons-beanutils-1.9.4.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.9.4/commons-beanutils-1.9.4-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.9.4/commons-beanutils-1.9.4-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: commons-beanutils:commons-beanutils:1.9.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.9.4/commons-beanutils-1.9.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.9.4/commons-beanutils-1.9.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.9.4/commons-beanutils-1.9.4-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__commons_codec_commons_codec_1_14.xml b/springboot-vue3/.idea/libraries/Maven__commons_codec_commons_codec_1_14.xml
index 5477cbc..50b8f2b 100644
--- a/springboot-vue3/.idea/libraries/Maven__commons_codec_commons_codec_1_14.xml
+++ b/springboot-vue3/.idea/libraries/Maven__commons_codec_commons_codec_1_14.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: commons-codec:commons-codec:1.14">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.14/commons-codec-1.14.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.14/commons-codec-1.14-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.14/commons-codec-1.14-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: commons-codec:commons-codec:1.14">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.14/commons-codec-1.14.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.14/commons-codec-1.14-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.14/commons-codec-1.14-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml b/springboot-vue3/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
index a5603ea..13afda2 100644
--- a/springboot-vue3/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: commons-collections:commons-collections:3.2.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: commons-collections:commons-collections:3.2.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__commons_io_commons_io_2_11_0.xml b/springboot-vue3/.idea/libraries/Maven__commons_io_commons_io_2_11_0.xml
index a6f65e5..f94fc5a 100644
--- a/springboot-vue3/.idea/libraries/Maven__commons_io_commons_io_2_11_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__commons_io_commons_io_2_11_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: commons-io:commons-io:2.11.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.11.0/commons-io-2.11.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.11.0/commons-io-2.11.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.11.0/commons-io-2.11.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: commons-io:commons-io:2.11.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.11.0/commons-io-2.11.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.11.0/commons-io-2.11.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.11.0/commons-io-2.11.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml b/springboot-vue3/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml
index 93fc9a3..217d6e0 100644
--- a/springboot-vue3/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml
+++ b/springboot-vue3/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: commons-logging:commons-logging:1.0.4">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: commons-logging:commons-logging:1.0.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__io_jsonwebtoken_jjwt_api_0_10_7.xml b/springboot-vue3/.idea/libraries/Maven__io_jsonwebtoken_jjwt_api_0_10_7.xml
index 7f0a4aa..7c4bd05 100644
--- a/springboot-vue3/.idea/libraries/Maven__io_jsonwebtoken_jjwt_api_0_10_7.xml
+++ b/springboot-vue3/.idea/libraries/Maven__io_jsonwebtoken_jjwt_api_0_10_7.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: io.jsonwebtoken:jjwt-api:0.10.7">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt-api/0.10.7/jjwt-api-0.10.7.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt-api/0.10.7/jjwt-api-0.10.7-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt-api/0.10.7/jjwt-api-0.10.7-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: io.jsonwebtoken:jjwt-api:0.10.7">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt-api/0.10.7/jjwt-api-0.10.7.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt-api/0.10.7/jjwt-api-0.10.7-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt-api/0.10.7/jjwt-api-0.10.7-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__io_jsonwebtoken_jjwt_impl_0_10_7.xml b/springboot-vue3/.idea/libraries/Maven__io_jsonwebtoken_jjwt_impl_0_10_7.xml
index 09f0e2a..d36f102 100644
--- a/springboot-vue3/.idea/libraries/Maven__io_jsonwebtoken_jjwt_impl_0_10_7.xml
+++ b/springboot-vue3/.idea/libraries/Maven__io_jsonwebtoken_jjwt_impl_0_10_7.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: io.jsonwebtoken:jjwt-impl:0.10.7">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt-impl/0.10.7/jjwt-impl-0.10.7.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt-impl/0.10.7/jjwt-impl-0.10.7-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt-impl/0.10.7/jjwt-impl-0.10.7-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: io.jsonwebtoken:jjwt-impl:0.10.7">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt-impl/0.10.7/jjwt-impl-0.10.7.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt-impl/0.10.7/jjwt-impl-0.10.7-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt-impl/0.10.7/jjwt-impl-0.10.7-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__io_jsonwebtoken_jjwt_jackson_0_10_7.xml b/springboot-vue3/.idea/libraries/Maven__io_jsonwebtoken_jjwt_jackson_0_10_7.xml
index a2dba26..35a0e46 100644
--- a/springboot-vue3/.idea/libraries/Maven__io_jsonwebtoken_jjwt_jackson_0_10_7.xml
+++ b/springboot-vue3/.idea/libraries/Maven__io_jsonwebtoken_jjwt_jackson_0_10_7.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: io.jsonwebtoken:jjwt-jackson:0.10.7">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt-jackson/0.10.7/jjwt-jackson-0.10.7.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt-jackson/0.10.7/jjwt-jackson-0.10.7-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt-jackson/0.10.7/jjwt-jackson-0.10.7-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: io.jsonwebtoken:jjwt-jackson:0.10.7">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt-jackson/0.10.7/jjwt-jackson-0.10.7.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt-jackson/0.10.7/jjwt-jackson-0.10.7-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt-jackson/0.10.7/jjwt-jackson-0.10.7-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml b/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml
index 74f266d..03588dc 100644
--- a/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: io.springfox:springfox-core:2.9.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/2.9.2/springfox-core-2.9.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/2.9.2/springfox-core-2.9.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/2.9.2/springfox-core-2.9.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: io.springfox:springfox-core:2.9.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/2.9.2/springfox-core-2.9.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/2.9.2/springfox-core-2.9.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/2.9.2/springfox-core-2.9.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml b/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml
index 61d5d27..4a47148 100644
--- a/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: io.springfox:springfox-schema:2.9.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-schema/2.9.2/springfox-schema-2.9.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-schema/2.9.2/springfox-schema-2.9.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-schema/2.9.2/springfox-schema-2.9.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: io.springfox:springfox-schema:2.9.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-schema/2.9.2/springfox-schema-2.9.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-schema/2.9.2/springfox-schema-2.9.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-schema/2.9.2/springfox-schema-2.9.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml b/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml
index 7589b4c..f934649 100644
--- a/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: io.springfox:springfox-spi:2.9.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/2.9.2/springfox-spi-2.9.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/2.9.2/springfox-spi-2.9.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/2.9.2/springfox-spi-2.9.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: io.springfox:springfox-spi:2.9.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/2.9.2/springfox-spi-2.9.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/2.9.2/springfox-spi-2.9.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/2.9.2/springfox-spi-2.9.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml b/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml
index e6cb233..7898a19 100644
--- a/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: io.springfox:springfox-spring-web:2.9.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/2.9.2/springfox-spring-web-2.9.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/2.9.2/springfox-spring-web-2.9.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/2.9.2/springfox-spring-web-2.9.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: io.springfox:springfox-spring-web:2.9.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/2.9.2/springfox-spring-web-2.9.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/2.9.2/springfox-spring-web-2.9.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/2.9.2/springfox-spring-web-2.9.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml b/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml
index 32389a4..4ed7d0d 100644
--- a/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: io.springfox:springfox-swagger2:2.9.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/2.9.2/springfox-swagger2-2.9.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/2.9.2/springfox-swagger2-2.9.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/2.9.2/springfox-swagger2-2.9.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: io.springfox:springfox-swagger2:2.9.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/2.9.2/springfox-swagger2-2.9.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/2.9.2/springfox-swagger2-2.9.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/2.9.2/springfox-swagger2-2.9.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml b/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml
index 79400a0..c40ef9f 100644
--- a/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: io.springfox:springfox-swagger-common:2.9.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-common/2.9.2/springfox-swagger-common-2.9.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-common/2.9.2/springfox-swagger-common-2.9.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-common/2.9.2/springfox-swagger-common-2.9.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: io.springfox:springfox-swagger-common:2.9.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-common/2.9.2/springfox-swagger-common-2.9.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-common/2.9.2/springfox-swagger-common-2.9.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-common/2.9.2/springfox-swagger-common-2.9.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml b/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml
index 3c049ec..0700f01 100644
--- a/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: io.springfox:springfox-swagger-ui:2.9.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-ui/2.9.2/springfox-swagger-ui-2.9.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-ui/2.9.2/springfox-swagger-ui-2.9.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-ui/2.9.2/springfox-swagger-ui-2.9.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: io.springfox:springfox-swagger-ui:2.9.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-ui/2.9.2/springfox-swagger-ui-2.9.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-ui/2.9.2/springfox-swagger-ui-2.9.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-ui/2.9.2/springfox-swagger-ui-2.9.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml b/springboot-vue3/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml
index eefd1e8..1c4a621 100644
--- a/springboot-vue3/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml
+++ b/springboot-vue3/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: io.swagger:swagger-annotations:1.5.20">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.20/swagger-annotations-1.5.20.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.20/swagger-annotations-1.5.20-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.20/swagger-annotations-1.5.20-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: io.swagger:swagger-annotations:1.5.20">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.20/swagger-annotations-1.5.20.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.20/swagger-annotations-1.5.20-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.20/swagger-annotations-1.5.20-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml b/springboot-vue3/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml
index 1cfdaf8..395508f 100644
--- a/springboot-vue3/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml
+++ b/springboot-vue3/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: io.swagger:swagger-models:1.5.20">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-models/1.5.20/swagger-models-1.5.20.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-models/1.5.20/swagger-models-1.5.20-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-models/1.5.20/swagger-models-1.5.20-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: io.swagger:swagger-models:1.5.20">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-models/1.5.20/swagger-models-1.5.20.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-models/1.5.20/swagger-models-1.5.20-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-models/1.5.20/swagger-models-1.5.20-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml b/springboot-vue3/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml
index be8b4b3..be90656 100644
--- a/springboot-vue3/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: jakarta.activation:jakarta.activation-api:1.2.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: jakarta.activation:jakarta.activation-api:1.2.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml b/springboot-vue3/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml
index 5ddce8f..cba9dd2 100644
--- a/springboot-vue3/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml
+++ b/springboot-vue3/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml b/springboot-vue3/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml
index 0839241..e66afb9 100644
--- a/springboot-vue3/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: jakarta.validation:jakarta.validation-api:2.0.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: jakarta.validation:jakarta.validation-api:2.0.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml b/springboot-vue3/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml
index 2810cb2..04213f7 100644
--- a/springboot-vue3/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml
+++ b/springboot-vue3/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__junit_junit_4_13.xml b/springboot-vue3/.idea/libraries/Maven__junit_junit_4_13.xml
index 290802f..59fc5c4 100644
--- a/springboot-vue3/.idea/libraries/Maven__junit_junit_4_13.xml
+++ b/springboot-vue3/.idea/libraries/Maven__junit_junit_4_13.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: junit:junit:4.13">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.13/junit-4.13.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.13/junit-4.13-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.13/junit-4.13-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: junit:junit:4.13">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.13/junit-4.13.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.13/junit-4.13-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.13/junit-4.13-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_21.xml b/springboot-vue3/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_21.xml
index 045fd4a..85958a1 100644
--- a/springboot-vue3/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_21.xml
+++ b/springboot-vue3/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_21.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: mysql:mysql-connector-java:8.0.21">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.21/mysql-connector-java-8.0.21.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.21/mysql-connector-java-8.0.21-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.21/mysql-connector-java-8.0.21-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: mysql:mysql-connector-java:8.0.21">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.21/mysql-connector-java-8.0.21.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.21/mysql-connector-java-8.0.21-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.21/mysql-connector-java-8.0.21-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_13.xml b/springboot-vue3/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_13.xml
index b0af3e1..74f49f3 100644
--- a/springboot-vue3/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_13.xml
+++ b/springboot-vue3/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_13.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: net.bytebuddy:byte-buddy:1.10.13">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.10.13/byte-buddy-1.10.13.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.10.13/byte-buddy-1.10.13-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.10.13/byte-buddy-1.10.13-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: net.bytebuddy:byte-buddy:1.10.13">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.10.13/byte-buddy-1.10.13.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.10.13/byte-buddy-1.10.13-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.10.13/byte-buddy-1.10.13-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_13.xml b/springboot-vue3/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_13.xml
index c97a5fe..768d1aa 100644
--- a/springboot-vue3/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_13.xml
+++ b/springboot-vue3/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_13.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.10.13/byte-buddy-agent-1.10.13.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.10.13/byte-buddy-agent-1.10.13-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.10.13/byte-buddy-agent-1.10.13-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.10.13/byte-buddy-agent-1.10.13.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.10.13/byte-buddy-agent-1.10.13-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.10.13/byte-buddy-agent-1.10.13-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml b/springboot-vue3/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml
index c85dd2a..b3d3858 100644
--- a/springboot-vue3/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: net.minidev:accessors-smart:1.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/1.2/accessors-smart-1.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/1.2/accessors-smart-1.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/1.2/accessors-smart-1.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: net.minidev:accessors-smart:1.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/1.2/accessors-smart-1.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/1.2/accessors-smart-1.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/1.2/accessors-smart-1.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml b/springboot-vue3/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml
index fdd4d46..1083023 100644
--- a/springboot-vue3/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml
+++ b/springboot-vue3/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: net.minidev:json-smart:2.3">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.3/json-smart-2.3.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.3/json-smart-2.3-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.3/json-smart-2.3-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: net.minidev:json-smart:2.3">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.3/json-smart-2.3.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.3/json-smart-2.3-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.3/json-smart-2.3-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml
index f60ef5f..5871c95 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.commons:commons-collections4:4.4">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.commons:commons-collections4:4.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_commons_commons_compress_1_21.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_commons_commons_compress_1_21.xml
index ce1c48d..49cd123 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_commons_commons_compress_1_21.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_commons_commons_compress_1_21.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.commons:commons-compress:1.21">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.21/commons-compress-1.21.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.21/commons-compress-1.21-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.21/commons-compress-1.21-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.commons:commons-compress:1.21">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.21/commons-compress-1.21.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.21/commons-compress-1.21-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.21/commons-compress-1.21-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_10.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_10.xml
index 3cdb674..00de553 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_10.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_10.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.commons:commons-lang3:3.10">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.10/commons-lang3-3.10.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.10/commons-lang3-3.10-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.10/commons-lang3-3.10-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.commons:commons-lang3:3.10">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.10/commons-lang3-3.10.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.10/commons-lang3-3.10-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.10/commons-lang3-3.10-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml
index 895af60..ebfe0a8 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.commons:commons-math3:3.6.1">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.commons:commons-math3:3.6.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml
index c7372f1..8ad4996 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.logging.log4j:log4j-api:2.13.3">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.13.3/log4j-api-2.13.3.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.13.3/log4j-api-2.13.3-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.13.3/log4j-api-2.13.3-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.logging.log4j:log4j-api:2.13.3">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.13.3/log4j-api-2.13.3.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.13.3/log4j-api-2.13.3-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.13.3/log4j-api-2.13.3-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_13_3.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_13_3.xml
index 32c39cb..57e6ac4 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_13_3.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_13_3.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.13.3/log4j-to-slf4j-2.13.3.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.13.3/log4j-to-slf4j-2.13.3-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.13.3/log4j-to-slf4j-2.13.3-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.13.3/log4j-to-slf4j-2.13.3.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.13.3/log4j-to-slf4j-2.13.3-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.13.3/log4j-to-slf4j-2.13.3-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_poi_poi_5_2_2.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_poi_poi_5_2_2.xml
index b759369..c177798 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_poi_poi_5_2_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_poi_poi_5_2_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.poi:poi:5.2.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/5.2.2/poi-5.2.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/5.2.2/poi-5.2.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/5.2.2/poi-5.2.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.poi:poi:5.2.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/5.2.2/poi-5.2.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/5.2.2/poi-5.2.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/5.2.2/poi-5.2.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_poi_poi_ooxml_5_2_2.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_poi_poi_ooxml_5_2_2.xml
index a8d0df0..42c2b77 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_poi_poi_ooxml_5_2_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_poi_poi_ooxml_5_2_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.poi:poi-ooxml:5.2.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml/5.2.2/poi-ooxml-5.2.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml/5.2.2/poi-ooxml-5.2.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml/5.2.2/poi-ooxml-5.2.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.poi:poi-ooxml:5.2.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml/5.2.2/poi-ooxml-5.2.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml/5.2.2/poi-ooxml-5.2.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml/5.2.2/poi-ooxml-5.2.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_poi_poi_ooxml_lite_5_2_2.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_poi_poi_ooxml_lite_5_2_2.xml
index a579c0f..c136b22 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_poi_poi_ooxml_lite_5_2_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_poi_poi_ooxml_lite_5_2_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.poi:poi-ooxml-lite:5.2.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-lite/5.2.2/poi-ooxml-lite-5.2.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-lite/5.2.2/poi-ooxml-lite-5.2.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-lite/5.2.2/poi-ooxml-lite-5.2.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.poi:poi-ooxml-lite:5.2.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-lite/5.2.2/poi-ooxml-lite-5.2.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-lite/5.2.2/poi-ooxml-lite-5.2.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-lite/5.2.2/poi-ooxml-lite-5.2.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_8_0.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_8_0.xml
index 88b3487..5272a36 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_8_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_8_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.shiro:shiro-cache:1.8.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-cache/1.8.0/shiro-cache-1.8.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-cache/1.8.0/shiro-cache-1.8.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-cache/1.8.0/shiro-cache-1.8.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.shiro:shiro-cache:1.8.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-cache/1.8.0/shiro-cache-1.8.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-cache/1.8.0/shiro-cache-1.8.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-cache/1.8.0/shiro-cache-1.8.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_8_0.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_8_0.xml
index b5dc78c..4578d1b 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_8_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_8_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.shiro:shiro-config-core:1.8.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-core/1.8.0/shiro-config-core-1.8.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-core/1.8.0/shiro-config-core-1.8.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-core/1.8.0/shiro-config-core-1.8.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.shiro:shiro-config-core:1.8.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-core/1.8.0/shiro-config-core-1.8.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-core/1.8.0/shiro-config-core-1.8.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-core/1.8.0/shiro-config-core-1.8.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_8_0.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_8_0.xml
index a5a1405..e699787 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_8_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_8_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-ogdl/1.8.0/shiro-config-ogdl-1.8.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-ogdl/1.8.0/shiro-config-ogdl-1.8.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-ogdl/1.8.0/shiro-config-ogdl-1.8.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-ogdl/1.8.0/shiro-config-ogdl-1.8.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-ogdl/1.8.0/shiro-config-ogdl-1.8.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-ogdl/1.8.0/shiro-config-ogdl-1.8.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_8_0.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_8_0.xml
index b587313..aa3fdcf 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_8_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_8_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.shiro:shiro-core:1.8.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-core/1.8.0/shiro-core-1.8.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-core/1.8.0/shiro-core-1.8.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-core/1.8.0/shiro-core-1.8.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.shiro:shiro-core:1.8.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-core/1.8.0/shiro-core-1.8.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-core/1.8.0/shiro-core-1.8.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-core/1.8.0/shiro-core-1.8.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_8_0.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_8_0.xml
index 88f8de2..77a90b8 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_8_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_8_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-cipher/1.8.0/shiro-crypto-cipher-1.8.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-cipher/1.8.0/shiro-crypto-cipher-1.8.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-cipher/1.8.0/shiro-crypto-cipher-1.8.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-cipher/1.8.0/shiro-crypto-cipher-1.8.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-cipher/1.8.0/shiro-crypto-cipher-1.8.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-cipher/1.8.0/shiro-crypto-cipher-1.8.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_8_0.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_8_0.xml
index 6372f35..dddd497 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_8_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_8_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-core/1.8.0/shiro-crypto-core-1.8.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-core/1.8.0/shiro-crypto-core-1.8.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-core/1.8.0/shiro-crypto-core-1.8.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-core/1.8.0/shiro-crypto-core-1.8.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-core/1.8.0/shiro-crypto-core-1.8.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-core/1.8.0/shiro-crypto-core-1.8.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_8_0.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_8_0.xml
index 36fc9cb..ece1eae 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_8_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_8_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-hash/1.8.0/shiro-crypto-hash-1.8.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-hash/1.8.0/shiro-crypto-hash-1.8.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-hash/1.8.0/shiro-crypto-hash-1.8.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-hash/1.8.0/shiro-crypto-hash-1.8.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-hash/1.8.0/shiro-crypto-hash-1.8.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-hash/1.8.0/shiro-crypto-hash-1.8.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_8_0.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_8_0.xml
index 94277e5..b7a65df 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_8_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_8_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.shiro:shiro-event:1.8.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-event/1.8.0/shiro-event-1.8.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-event/1.8.0/shiro-event-1.8.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-event/1.8.0/shiro-event-1.8.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.shiro:shiro-event:1.8.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-event/1.8.0/shiro-event-1.8.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-event/1.8.0/shiro-event-1.8.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-event/1.8.0/shiro-event-1.8.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_8_0.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_8_0.xml
index 81742f6..499eb00 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_8_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_8_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.shiro:shiro-lang:1.8.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-lang/1.8.0/shiro-lang-1.8.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-lang/1.8.0/shiro-lang-1.8.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-lang/1.8.0/shiro-lang-1.8.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.shiro:shiro-lang:1.8.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-lang/1.8.0/shiro-lang-1.8.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-lang/1.8.0/shiro-lang-1.8.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-lang/1.8.0/shiro-lang-1.8.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_8_0.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_8_0.xml
index 69e982e..264c53f 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_8_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_8_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.shiro:shiro-spring:1.8.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-spring/1.8.0/shiro-spring-1.8.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-spring/1.8.0/shiro-spring-1.8.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-spring/1.8.0/shiro-spring-1.8.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.shiro:shiro-spring:1.8.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-spring/1.8.0/shiro-spring-1.8.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-spring/1.8.0/shiro-spring-1.8.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-spring/1.8.0/shiro-spring-1.8.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_spring_boot_starter_1_8_0.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_spring_boot_starter_1_8_0.xml
index c50884f..0946e78 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_spring_boot_starter_1_8_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_spring_boot_starter_1_8_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.shiro:shiro-spring-boot-starter:1.8.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-spring-boot-starter/1.8.0/shiro-spring-boot-starter-1.8.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-spring-boot-starter/1.8.0/shiro-spring-boot-starter-1.8.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-spring-boot-starter/1.8.0/shiro-spring-boot-starter-1.8.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.shiro:shiro-spring-boot-starter:1.8.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-spring-boot-starter/1.8.0/shiro-spring-boot-starter-1.8.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-spring-boot-starter/1.8.0/shiro-spring-boot-starter-1.8.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-spring-boot-starter/1.8.0/shiro-spring-boot-starter-1.8.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_8_0.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_8_0.xml
index a6d79f2..7be49ba 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_8_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_8_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.shiro:shiro-web:1.8.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-web/1.8.0/shiro-web-1.8.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-web/1.8.0/shiro-web-1.8.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-web/1.8.0/shiro-web-1.8.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.shiro:shiro-web:1.8.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-web/1.8.0/shiro-web-1.8.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-web/1.8.0/shiro-web-1.8.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-web/1.8.0/shiro-web-1.8.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_37.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_37.xml
index 094655d..7e39935 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_37.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_37.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.37">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.37/tomcat-embed-core-9.0.37.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.37/tomcat-embed-core-9.0.37-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.37/tomcat-embed-core-9.0.37-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.37">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.37/tomcat-embed-core-9.0.37.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.37/tomcat-embed-core-9.0.37-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.37/tomcat-embed-core-9.0.37-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_37.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_37.xml
index a2f5896..6a30056 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_37.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_37.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.37">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.37/tomcat-embed-websocket-9.0.37.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.37/tomcat-embed-websocket-9.0.37-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.37/tomcat-embed-websocket-9.0.37-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.37">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.37/tomcat-embed-websocket-9.0.37.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.37/tomcat-embed-websocket-9.0.37-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.37/tomcat-embed-websocket-9.0.37-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_5_0_3.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_5_0_3.xml
index e6d7ece..09b083d 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_5_0_3.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_5_0_3.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.xmlbeans:xmlbeans:5.0.3">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/5.0.3/xmlbeans-5.0.3.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/5.0.3/xmlbeans-5.0.3-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/5.0.3/xmlbeans-5.0.3-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.xmlbeans:xmlbeans:5.0.3">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/5.0.3/xmlbeans-5.0.3.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/5.0.3/xmlbeans-5.0.3-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/5.0.3/xmlbeans-5.0.3-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_anim_1_14.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_anim_1_14.xml
index df57894..5331413 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_anim_1_14.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_anim_1_14.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.xmlgraphics:batik-anim:1.14">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-anim/1.14/batik-anim-1.14.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-anim/1.14/batik-anim-1.14-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-anim/1.14/batik-anim-1.14-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.xmlgraphics:batik-anim:1.14">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-anim/1.14/batik-anim-1.14.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-anim/1.14/batik-anim-1.14-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-anim/1.14/batik-anim-1.14-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_awt_util_1_14.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_awt_util_1_14.xml
index edf8213..89e6c4e 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_awt_util_1_14.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_awt_util_1_14.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.xmlgraphics:batik-awt-util:1.14">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-awt-util/1.14/batik-awt-util-1.14.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-awt-util/1.14/batik-awt-util-1.14-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-awt-util/1.14/batik-awt-util-1.14-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.xmlgraphics:batik-awt-util:1.14">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-awt-util/1.14/batik-awt-util-1.14.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-awt-util/1.14/batik-awt-util-1.14-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-awt-util/1.14/batik-awt-util-1.14-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_bridge_1_14.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_bridge_1_14.xml
index 1ee6048..2d1d862 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_bridge_1_14.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_bridge_1_14.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.xmlgraphics:batik-bridge:1.14">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-bridge/1.14/batik-bridge-1.14.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-bridge/1.14/batik-bridge-1.14-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-bridge/1.14/batik-bridge-1.14-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.xmlgraphics:batik-bridge:1.14">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-bridge/1.14/batik-bridge-1.14.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-bridge/1.14/batik-bridge-1.14-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-bridge/1.14/batik-bridge-1.14-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_codec_1_14.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_codec_1_14.xml
index d61b562..6cab06b 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_codec_1_14.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_codec_1_14.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.xmlgraphics:batik-codec:1.14">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-codec/1.14/batik-codec-1.14.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-codec/1.14/batik-codec-1.14-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-codec/1.14/batik-codec-1.14-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.xmlgraphics:batik-codec:1.14">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-codec/1.14/batik-codec-1.14.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-codec/1.14/batik-codec-1.14-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-codec/1.14/batik-codec-1.14-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_constants_1_14.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_constants_1_14.xml
index 6878fa2..e0fdd88 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_constants_1_14.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_constants_1_14.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.xmlgraphics:batik-constants:1.14">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-constants/1.14/batik-constants-1.14.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-constants/1.14/batik-constants-1.14-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-constants/1.14/batik-constants-1.14-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.xmlgraphics:batik-constants:1.14">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-constants/1.14/batik-constants-1.14.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-constants/1.14/batik-constants-1.14-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-constants/1.14/batik-constants-1.14-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_css_1_14.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_css_1_14.xml
index e945f83..d43695a 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_css_1_14.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_css_1_14.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.xmlgraphics:batik-css:1.14">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-css/1.14/batik-css-1.14.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-css/1.14/batik-css-1.14-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-css/1.14/batik-css-1.14-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.xmlgraphics:batik-css:1.14">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-css/1.14/batik-css-1.14.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-css/1.14/batik-css-1.14-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-css/1.14/batik-css-1.14-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_dom_1_14.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_dom_1_14.xml
index 28ff962..e546a70 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_dom_1_14.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_dom_1_14.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.xmlgraphics:batik-dom:1.14">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-dom/1.14/batik-dom-1.14.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-dom/1.14/batik-dom-1.14-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-dom/1.14/batik-dom-1.14-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.xmlgraphics:batik-dom:1.14">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-dom/1.14/batik-dom-1.14.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-dom/1.14/batik-dom-1.14-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-dom/1.14/batik-dom-1.14-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_ext_1_14.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_ext_1_14.xml
index 7892627..f86b604 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_ext_1_14.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_ext_1_14.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.xmlgraphics:batik-ext:1.14">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-ext/1.14/batik-ext-1.14.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-ext/1.14/batik-ext-1.14-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-ext/1.14/batik-ext-1.14-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.xmlgraphics:batik-ext:1.14">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-ext/1.14/batik-ext-1.14.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-ext/1.14/batik-ext-1.14-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-ext/1.14/batik-ext-1.14-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_gvt_1_14.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_gvt_1_14.xml
index 8c8433a..6ba9994 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_gvt_1_14.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_gvt_1_14.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.xmlgraphics:batik-gvt:1.14">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-gvt/1.14/batik-gvt-1.14.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-gvt/1.14/batik-gvt-1.14-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-gvt/1.14/batik-gvt-1.14-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.xmlgraphics:batik-gvt:1.14">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-gvt/1.14/batik-gvt-1.14.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-gvt/1.14/batik-gvt-1.14-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-gvt/1.14/batik-gvt-1.14-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_i18n_1_14.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_i18n_1_14.xml
index 7549010..1b830c7 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_i18n_1_14.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_i18n_1_14.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.xmlgraphics:batik-i18n:1.14">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-i18n/1.14/batik-i18n-1.14.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-i18n/1.14/batik-i18n-1.14-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-i18n/1.14/batik-i18n-1.14-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.xmlgraphics:batik-i18n:1.14">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-i18n/1.14/batik-i18n-1.14.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-i18n/1.14/batik-i18n-1.14-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-i18n/1.14/batik-i18n-1.14-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_parser_1_14.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_parser_1_14.xml
index cb41f41..c18bd43 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_parser_1_14.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_parser_1_14.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.xmlgraphics:batik-parser:1.14">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-parser/1.14/batik-parser-1.14.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-parser/1.14/batik-parser-1.14-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-parser/1.14/batik-parser-1.14-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.xmlgraphics:batik-parser:1.14">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-parser/1.14/batik-parser-1.14.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-parser/1.14/batik-parser-1.14-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-parser/1.14/batik-parser-1.14-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_script_1_14.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_script_1_14.xml
index 7758f24..f9d2e9f 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_script_1_14.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_script_1_14.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.xmlgraphics:batik-script:1.14">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-script/1.14/batik-script-1.14.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-script/1.14/batik-script-1.14-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-script/1.14/batik-script-1.14-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.xmlgraphics:batik-script:1.14">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-script/1.14/batik-script-1.14.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-script/1.14/batik-script-1.14-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-script/1.14/batik-script-1.14-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_shared_resources_1_14.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_shared_resources_1_14.xml
index 72a1739..b7622ee 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_shared_resources_1_14.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_shared_resources_1_14.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.xmlgraphics:batik-shared-resources:1.14">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-shared-resources/1.14/batik-shared-resources-1.14.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-shared-resources/1.14/batik-shared-resources-1.14-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-shared-resources/1.14/batik-shared-resources-1.14-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.xmlgraphics:batik-shared-resources:1.14">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-shared-resources/1.14/batik-shared-resources-1.14.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-shared-resources/1.14/batik-shared-resources-1.14-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-shared-resources/1.14/batik-shared-resources-1.14-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svg_dom_1_14.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svg_dom_1_14.xml
index d7c7218..69fec82 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svg_dom_1_14.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svg_dom_1_14.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.xmlgraphics:batik-svg-dom:1.14">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-svg-dom/1.14/batik-svg-dom-1.14.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-svg-dom/1.14/batik-svg-dom-1.14-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-svg-dom/1.14/batik-svg-dom-1.14-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.xmlgraphics:batik-svg-dom:1.14">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-svg-dom/1.14/batik-svg-dom-1.14.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-svg-dom/1.14/batik-svg-dom-1.14-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-svg-dom/1.14/batik-svg-dom-1.14-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svggen_1_14.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svggen_1_14.xml
index 2076f21..71dd6df 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svggen_1_14.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svggen_1_14.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.xmlgraphics:batik-svggen:1.14">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-svggen/1.14/batik-svggen-1.14.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-svggen/1.14/batik-svggen-1.14-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-svggen/1.14/batik-svggen-1.14-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.xmlgraphics:batik-svggen:1.14">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-svggen/1.14/batik-svggen-1.14.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-svggen/1.14/batik-svggen-1.14-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-svggen/1.14/batik-svggen-1.14-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_transcoder_1_14.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_transcoder_1_14.xml
index c83a7a7..ec79cab 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_transcoder_1_14.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_transcoder_1_14.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.xmlgraphics:batik-transcoder:1.14">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-transcoder/1.14/batik-transcoder-1.14.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-transcoder/1.14/batik-transcoder-1.14-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-transcoder/1.14/batik-transcoder-1.14-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.xmlgraphics:batik-transcoder:1.14">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-transcoder/1.14/batik-transcoder-1.14.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-transcoder/1.14/batik-transcoder-1.14-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-transcoder/1.14/batik-transcoder-1.14-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_util_1_14.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_util_1_14.xml
index b7920c3..6be66b8 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_util_1_14.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_util_1_14.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.xmlgraphics:batik-util:1.14">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-util/1.14/batik-util-1.14.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-util/1.14/batik-util-1.14-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-util/1.14/batik-util-1.14-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.xmlgraphics:batik-util:1.14">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-util/1.14/batik-util-1.14.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-util/1.14/batik-util-1.14-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-util/1.14/batik-util-1.14-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_xml_1_14.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_xml_1_14.xml
index 61e1317..6f865af 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_xml_1_14.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_batik_xml_1_14.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.xmlgraphics:batik-xml:1.14">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-xml/1.14/batik-xml-1.14.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-xml/1.14/batik-xml-1.14-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-xml/1.14/batik-xml-1.14-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.xmlgraphics:batik-xml:1.14">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-xml/1.14/batik-xml-1.14.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-xml/1.14/batik-xml-1.14-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/batik-xml/1.14/batik-xml-1.14-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_xmlgraphics_commons_2_6.xml b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_xmlgraphics_commons_2_6.xml
index da1f29b..55c255c 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_xmlgraphics_commons_2_6.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apache_xmlgraphics_xmlgraphics_commons_2_6.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:2.6">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/xmlgraphics-commons/2.6/xmlgraphics-commons-2.6.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/xmlgraphics-commons/2.6/xmlgraphics-commons-2.6-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/xmlgraphics-commons/2.6/xmlgraphics-commons-2.6-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:2.6">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/xmlgraphics-commons/2.6/xmlgraphics-commons-2.6.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/xmlgraphics-commons/2.6/xmlgraphics-commons-2.6-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/xmlgraphics-commons/2.6/xmlgraphics-commons-2.6-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml b/springboot-vue3/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml
index e6ecab0..f854ab0 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.apiguardian:apiguardian-api:1.1.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.apiguardian:apiguardian-api:1.1.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_assertj_assertj_core_3_16_1.xml b/springboot-vue3/.idea/libraries/Maven__org_assertj_assertj_core_3_16_1.xml
index fc632a8..8976500 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_assertj_assertj_core_3_16_1.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_assertj_assertj_core_3_16_1.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.assertj:assertj-core:3.16.1">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.16.1/assertj-core-3.16.1.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.16.1/assertj-core-3.16.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.16.1/assertj-core-3.16.1-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.assertj:assertj-core:3.16.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.16.1/assertj-core-3.16.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.16.1/assertj-core-3.16.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.16.1/assertj-core-3.16.1-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_freemarker_freemarker_2_3_30.xml b/springboot-vue3/.idea/libraries/Maven__org_freemarker_freemarker_2_3_30.xml
index ede9c4c..d0830ed 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_freemarker_freemarker_2_3_30.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_freemarker_freemarker_2_3_30.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.freemarker:freemarker:2.3.30">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.30/freemarker-2.3.30.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.30/freemarker-2.3.30-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.30/freemarker-2.3.30-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.freemarker:freemarker:2.3.30">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.30/freemarker-2.3.30.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.30/freemarker-2.3.30-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.30/freemarker-2.3.30-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml b/springboot-vue3/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml
index 7ade7f0..ae5020d 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.glassfish:jakarta.el:3.0.3">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jakarta.el/3.0.3/jakarta.el-3.0.3.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jakarta.el/3.0.3/jakarta.el-3.0.3-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jakarta.el/3.0.3/jakarta.el-3.0.3-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.glassfish:jakarta.el:3.0.3">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jakarta.el/3.0.3/jakarta.el-3.0.3.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jakarta.el/3.0.3/jakarta.el-3.0.3-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jakarta.el/3.0.3/jakarta.el-3.0.3-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml b/springboot-vue3/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml
index 130329b..6b5496f 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.hamcrest:hamcrest:2.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest/2.2/hamcrest-2.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest/2.2/hamcrest-2.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest/2.2/hamcrest-2.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.hamcrest:hamcrest:2.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest/2.2/hamcrest-2.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest/2.2/hamcrest-2.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest/2.2/hamcrest-2.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_1_5_Final.xml b/springboot-vue3/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_1_5_Final.xml
index 1fb020f..6d045ad 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_1_5_Final.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_1_5_Final.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.hibernate.validator:hibernate-validator:6.1.5.Final">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.1.5.Final/hibernate-validator-6.1.5.Final.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.1.5.Final/hibernate-validator-6.1.5.Final-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.1.5.Final/hibernate-validator-6.1.5.Final-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.hibernate.validator:hibernate-validator:6.1.5.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.1.5.Final/hibernate-validator-6.1.5.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.1.5.Final/hibernate-validator-6.1.5.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.1.5.Final/hibernate-validator-6.1.5.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml b/springboot-vue3/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml
index 9a79b44..0b76247 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml b/springboot-vue3/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml
index baa9718..7171153 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.junit.jupiter:junit-jupiter:5.6.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.6.2/junit-jupiter-5.6.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.6.2/junit-jupiter-5.6.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.6.2/junit-jupiter-5.6.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.junit.jupiter:junit-jupiter:5.6.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.6.2/junit-jupiter-5.6.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.6.2/junit-jupiter-5.6.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.6.2/junit-jupiter-5.6.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml b/springboot-vue3/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml
index 1a3662d..ef160d2 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.6.2/junit-jupiter-api-5.6.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.6.2/junit-jupiter-api-5.6.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.6.2/junit-jupiter-api-5.6.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.6.2/junit-jupiter-api-5.6.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.6.2/junit-jupiter-api-5.6.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.6.2/junit-jupiter-api-5.6.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml b/springboot-vue3/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml
index 1ec9aa3..fc4c644 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.6.2/junit-jupiter-engine-5.6.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.6.2/junit-jupiter-engine-5.6.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.6.2/junit-jupiter-engine-5.6.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.6.2/junit-jupiter-engine-5.6.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.6.2/junit-jupiter-engine-5.6.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.6.2/junit-jupiter-engine-5.6.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_2.xml b/springboot-vue3/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_2.xml
index 1ceb7d7..45b4af3 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.6.2/junit-jupiter-params-5.6.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.6.2/junit-jupiter-params-5.6.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.6.2/junit-jupiter-params-5.6.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.6.2/junit-jupiter-params-5.6.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.6.2/junit-jupiter-params-5.6.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.6.2/junit-jupiter-params-5.6.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml b/springboot-vue3/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml
index 9467e1c..f2699b9 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.junit.platform:junit-platform-commons:1.6.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.6.2/junit-platform-commons-1.6.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.6.2/junit-platform-commons-1.6.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.6.2/junit-platform-commons-1.6.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.junit.platform:junit-platform-commons:1.6.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.6.2/junit-platform-commons-1.6.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.6.2/junit-platform-commons-1.6.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.6.2/junit-platform-commons-1.6.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml b/springboot-vue3/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml
index a54528c..c13a302 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.junit.platform:junit-platform-engine:1.6.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.6.2/junit-platform-engine-1.6.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.6.2/junit-platform-engine-1.6.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.6.2/junit-platform-engine-1.6.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.junit.platform:junit-platform-engine:1.6.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.6.2/junit-platform-engine-1.6.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.6.2/junit-platform-engine-1.6.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.6.2/junit-platform-engine-1.6.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_junit_vintage_junit_vintage_engine_5_6_2.xml b/springboot-vue3/.idea/libraries/Maven__org_junit_vintage_junit_vintage_engine_5_6_2.xml
index d29e2ea..697c91f 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_junit_vintage_junit_vintage_engine_5_6_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_junit_vintage_junit_vintage_engine_5_6_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.junit.vintage:junit-vintage-engine:5.6.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/junit/vintage/junit-vintage-engine/5.6.2/junit-vintage-engine-5.6.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/junit/vintage/junit-vintage-engine/5.6.2/junit-vintage-engine-5.6.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/junit/vintage/junit-vintage-engine/5.6.2/junit-vintage-engine-5.6.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.junit.vintage:junit-vintage-engine:5.6.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/junit/vintage/junit-vintage-engine/5.6.2/junit-vintage-engine-5.6.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/junit/vintage/junit-vintage-engine/5.6.2/junit-vintage-engine-5.6.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/junit/vintage/junit-vintage-engine/5.6.2/junit-vintage-engine-5.6.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml b/springboot-vue3/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml
index 5fa1abf..87cb599 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.mapstruct:mapstruct:1.2.0.Final">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.2.0.Final/mapstruct-1.2.0.Final.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.2.0.Final/mapstruct-1.2.0.Final-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.2.0.Final/mapstruct-1.2.0.Final-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.mapstruct:mapstruct:1.2.0.Final">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.2.0.Final/mapstruct-1.2.0.Final.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.2.0.Final/mapstruct-1.2.0.Final-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.2.0.Final/mapstruct-1.2.0.Final-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_mockito_mockito_core_3_3_3.xml b/springboot-vue3/.idea/libraries/Maven__org_mockito_mockito_core_3_3_3.xml
index e04454e..d2f4afa 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_mockito_mockito_core_3_3_3.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_mockito_mockito_core_3_3_3.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.mockito:mockito-core:3.3.3">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/3.3.3/mockito-core-3.3.3.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/3.3.3/mockito-core-3.3.3-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/3.3.3/mockito-core-3.3.3-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.mockito:mockito-core:3.3.3">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/3.3.3/mockito-core-3.3.3.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/3.3.3/mockito-core-3.3.3-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/3.3.3/mockito-core-3.3.3-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_3_3.xml b/springboot-vue3/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_3_3.xml
index 30e921f..6c02a63 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_3_3.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_3_3.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.mockito:mockito-junit-jupiter:3.3.3">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-junit-jupiter/3.3.3/mockito-junit-jupiter-3.3.3.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-junit-jupiter/3.3.3/mockito-junit-jupiter-3.3.3-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-junit-jupiter/3.3.3/mockito-junit-jupiter-3.3.3-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.mockito:mockito-junit-jupiter:3.3.3">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-junit-jupiter/3.3.3/mockito-junit-jupiter-3.3.3.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-junit-jupiter/3.3.3/mockito-junit-jupiter-3.3.3-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-junit-jupiter/3.3.3/mockito-junit-jupiter-3.3.3-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_mybatis_mybatis_3_5_2.xml b/springboot-vue3/.idea/libraries/Maven__org_mybatis_mybatis_3_5_2.xml
index 9b8d41c..5a8050c 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_mybatis_mybatis_3_5_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_mybatis_mybatis_3_5_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.mybatis:mybatis:3.5.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.2/mybatis-3.5.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.2/mybatis-3.5.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.2/mybatis-3.5.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.mybatis:mybatis:3.5.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.2/mybatis-3.5.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.2/mybatis-3.5.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.2/mybatis-3.5.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_2.xml b/springboot-vue3/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_2.xml
index 344cd7f..d35eb55 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.mybatis:mybatis-spring:2.0.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.2/mybatis-spring-2.0.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.2/mybatis-spring-2.0.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.2/mybatis-spring-2.0.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.mybatis:mybatis-spring:2.0.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.2/mybatis-spring-2.0.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.2/mybatis-spring-2.0.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.2/mybatis-spring-2.0.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml b/springboot-vue3/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml
index 4679a93..af41e3b 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.objenesis:objenesis:2.6">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.6/objenesis-2.6.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.6/objenesis-2.6-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.6/objenesis-2.6-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.objenesis:objenesis:2.6">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.6/objenesis-2.6.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.6/objenesis-2.6-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.6/objenesis-2.6-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml b/springboot-vue3/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
index 718b32e..fbc1b16 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.opentest4j:opentest4j:1.2.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.opentest4j:opentest4j:1.2.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml b/springboot-vue3/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml
index acdc019..0bf8cf2 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.ow2.asm:asm:5.0.4">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.4/asm-5.0.4-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.4/asm-5.0.4-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.ow2.asm:asm:5.0.4">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.4/asm-5.0.4-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.4/asm-5.0.4-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_owasp_encoder_encoder_1_2_2.xml b/springboot-vue3/.idea/libraries/Maven__org_owasp_encoder_encoder_1_2_2.xml
index e3e5658..c21f786 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_owasp_encoder_encoder_1_2_2.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_owasp_encoder_encoder_1_2_2.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.owasp.encoder:encoder:1.2.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/owasp/encoder/encoder/1.2.2/encoder-1.2.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/owasp/encoder/encoder/1.2.2/encoder-1.2.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/owasp/encoder/encoder/1.2.2/encoder-1.2.2-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.owasp.encoder:encoder:1.2.2">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/owasp/encoder/encoder/1.2.2/encoder-1.2.2.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/owasp/encoder/encoder/1.2.2/encoder-1.2.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/owasp/encoder/encoder/1.2.2/encoder-1.2.2-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_projectlombok_lombok_1_18_12.xml b/springboot-vue3/.idea/libraries/Maven__org_projectlombok_lombok_1_18_12.xml
index 41de5d3..46cf8a8 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_projectlombok_lombok_1_18_12.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_projectlombok_lombok_1_18_12.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.projectlombok:lombok:1.18.12">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.12/lombok-1.18.12.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.12/lombok-1.18.12-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.12/lombok-1.18.12-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.projectlombok:lombok:1.18.12">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.12/lombok-1.18.12.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.12/lombok-1.18.12-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.12/lombok-1.18.12-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml b/springboot-vue3/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml
index 69c5c8a..c4c54d6 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.skyscreamer:jsonassert:1.5.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.skyscreamer:jsonassert:1.5.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml b/springboot-vue3/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml
index 8427836..27229ce 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.slf4j:jul-to-slf4j:1.7.30">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.slf4j:jul-to-slf4j:1.7.30">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml b/springboot-vue3/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml
index bad0386..02b6812 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.slf4j:slf4j-api:1.7.30">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.slf4j:slf4j-api:1.7.30">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_2_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_2_RELEASE.xml
index 8fd8659..158ddd9 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_2_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_2_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework.boot:spring-boot:2.3.2.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.3.2.RELEASE/spring-boot-2.3.2.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.3.2.RELEASE/spring-boot-2.3.2.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.3.2.RELEASE/spring-boot-2.3.2.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot:2.3.2.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.3.2.RELEASE/spring-boot-2.3.2.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.3.2.RELEASE/spring-boot-2.3.2.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.3.2.RELEASE/spring-boot-2.3.2.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_2_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_2_RELEASE.xml
index a6a40e1..d547da6 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_2_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_2_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.2.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.3.2.RELEASE/spring-boot-autoconfigure-2.3.2.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.3.2.RELEASE/spring-boot-autoconfigure-2.3.2.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.3.2.RELEASE/spring-boot-autoconfigure-2.3.2.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.2.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.3.2.RELEASE/spring-boot-autoconfigure-2.3.2.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.3.2.RELEASE/spring-boot-autoconfigure-2.3.2.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.3.2.RELEASE/spring-boot-autoconfigure-2.3.2.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_2_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_2_RELEASE.xml
index cb6cbdb..0cfdca9 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_2_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_2_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework.boot:spring-boot-starter:2.3.2.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.3.2.RELEASE/spring-boot-starter-2.3.2.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.3.2.RELEASE/spring-boot-starter-2.3.2.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.3.2.RELEASE/spring-boot-starter-2.3.2.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot-starter:2.3.2.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.3.2.RELEASE/spring-boot-starter-2.3.2.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.3.2.RELEASE/spring-boot-starter-2.3.2.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.3.2.RELEASE/spring-boot-starter-2.3.2.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_3_2_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_3_2_RELEASE.xml
index ce6e735..1412c2f 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_3_2_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_3_2_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.3.2.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-freemarker/2.3.2.RELEASE/spring-boot-starter-freemarker-2.3.2.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-freemarker/2.3.2.RELEASE/spring-boot-starter-freemarker-2.3.2.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-freemarker/2.3.2.RELEASE/spring-boot-starter-freemarker-2.3.2.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.3.2.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-freemarker/2.3.2.RELEASE/spring-boot-starter-freemarker-2.3.2.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-freemarker/2.3.2.RELEASE/spring-boot-starter-freemarker-2.3.2.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-freemarker/2.3.2.RELEASE/spring-boot-starter-freemarker-2.3.2.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_3_2_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_3_2_RELEASE.xml
index 726ee01..1046f12 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_3_2_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_3_2_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.2.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.3.2.RELEASE/spring-boot-starter-jdbc-2.3.2.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.3.2.RELEASE/spring-boot-starter-jdbc-2.3.2.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.3.2.RELEASE/spring-boot-starter-jdbc-2.3.2.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.2.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.3.2.RELEASE/spring-boot-starter-jdbc-2.3.2.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.3.2.RELEASE/spring-boot-starter-jdbc-2.3.2.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.3.2.RELEASE/spring-boot-starter-jdbc-2.3.2.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_3_2_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_3_2_RELEASE.xml
index d7e4a03..b2bec55 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_3_2_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_3_2_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.2.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.3.2.RELEASE/spring-boot-starter-json-2.3.2.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.3.2.RELEASE/spring-boot-starter-json-2.3.2.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.3.2.RELEASE/spring-boot-starter-json-2.3.2.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.2.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.3.2.RELEASE/spring-boot-starter-json-2.3.2.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.3.2.RELEASE/spring-boot-starter-json-2.3.2.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.3.2.RELEASE/spring-boot-starter-json-2.3.2.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_3_2_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_3_2_RELEASE.xml
index f27c7a7..30cfcb1 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_3_2_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_3_2_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.2.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.3.2.RELEASE/spring-boot-starter-logging-2.3.2.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.3.2.RELEASE/spring-boot-starter-logging-2.3.2.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.3.2.RELEASE/spring-boot-starter-logging-2.3.2.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.2.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.3.2.RELEASE/spring-boot-starter-logging-2.3.2.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.3.2.RELEASE/spring-boot-starter-logging-2.3.2.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.3.2.RELEASE/spring-boot-starter-logging-2.3.2.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_3_2_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_3_2_RELEASE.xml
index b303820..8353935 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_3_2_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_3_2_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.2.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.3.2.RELEASE/spring-boot-starter-test-2.3.2.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.3.2.RELEASE/spring-boot-starter-test-2.3.2.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.3.2.RELEASE/spring-boot-starter-test-2.3.2.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.2.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.3.2.RELEASE/spring-boot-starter-test-2.3.2.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.3.2.RELEASE/spring-boot-starter-test-2.3.2.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.3.2.RELEASE/spring-boot-starter-test-2.3.2.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_3_2_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_3_2_RELEASE.xml
index c81c0ff..2aed09e 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_3_2_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_3_2_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.2.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.3.2.RELEASE/spring-boot-starter-tomcat-2.3.2.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.3.2.RELEASE/spring-boot-starter-tomcat-2.3.2.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.3.2.RELEASE/spring-boot-starter-tomcat-2.3.2.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.2.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.3.2.RELEASE/spring-boot-starter-tomcat-2.3.2.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.3.2.RELEASE/spring-boot-starter-tomcat-2.3.2.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.3.2.RELEASE/spring-boot-starter-tomcat-2.3.2.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_3_2_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_3_2_RELEASE.xml
index 1864c8e..af10dc8 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_3_2_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_3_2_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.2.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.3.2.RELEASE/spring-boot-starter-web-2.3.2.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.3.2.RELEASE/spring-boot-starter-web-2.3.2.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.3.2.RELEASE/spring-boot-starter-web-2.3.2.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.2.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.3.2.RELEASE/spring-boot-starter-web-2.3.2.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.3.2.RELEASE/spring-boot-starter-web-2.3.2.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.3.2.RELEASE/spring-boot-starter-web-2.3.2.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_3_2_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_3_2_RELEASE.xml
index b90cb74..82d831f 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_3_2_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_3_2_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.3.2.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-websocket/2.3.2.RELEASE/spring-boot-starter-websocket-2.3.2.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-websocket/2.3.2.RELEASE/spring-boot-starter-websocket-2.3.2.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-websocket/2.3.2.RELEASE/spring-boot-starter-websocket-2.3.2.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.3.2.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-websocket/2.3.2.RELEASE/spring-boot-starter-websocket-2.3.2.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-websocket/2.3.2.RELEASE/spring-boot-starter-websocket-2.3.2.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-websocket/2.3.2.RELEASE/spring-boot-starter-websocket-2.3.2.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_3_2_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_3_2_RELEASE.xml
index f222407..8465350 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_3_2_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_3_2_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework.boot:spring-boot-test:2.3.2.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.3.2.RELEASE/spring-boot-test-2.3.2.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.3.2.RELEASE/spring-boot-test-2.3.2.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.3.2.RELEASE/spring-boot-test-2.3.2.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot-test:2.3.2.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.3.2.RELEASE/spring-boot-test-2.3.2.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.3.2.RELEASE/spring-boot-test-2.3.2.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.3.2.RELEASE/spring-boot-test-2.3.2.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_3_2_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_3_2_RELEASE.xml
index 222ea52..686327e 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_3_2_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_3_2_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.2.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.3.2.RELEASE/spring-boot-test-autoconfigure-2.3.2.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.3.2.RELEASE/spring-boot-test-autoconfigure-2.3.2.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.3.2.RELEASE/spring-boot-test-autoconfigure-2.3.2.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.2.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.3.2.RELEASE/spring-boot-test-autoconfigure-2.3.2.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.3.2.RELEASE/spring-boot-test-autoconfigure-2.3.2.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.3.2.RELEASE/spring-boot-test-autoconfigure-2.3.2.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml
index 415679a..fbc0452 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml
index a2d8627..7e6f096 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_aop_5_2_8_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_aop_5_2_8_RELEASE.xml
index 8c1ae56..000f9ff 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_aop_5_2_8_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_aop_5_2_8_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework:spring-aop:5.2.8.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.2.8.RELEASE/spring-aop-5.2.8.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.2.8.RELEASE/spring-aop-5.2.8.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.2.8.RELEASE/spring-aop-5.2.8.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-aop:5.2.8.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.2.8.RELEASE/spring-aop-5.2.8.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.2.8.RELEASE/spring-aop-5.2.8.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.2.8.RELEASE/spring-aop-5.2.8.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_beans_5_2_8_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_beans_5_2_8_RELEASE.xml
index b23e0d6..ca7aa33 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_beans_5_2_8_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_beans_5_2_8_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework:spring-beans:5.2.8.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.2.8.RELEASE/spring-beans-5.2.8.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.2.8.RELEASE/spring-beans-5.2.8.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.2.8.RELEASE/spring-beans-5.2.8.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-beans:5.2.8.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.2.8.RELEASE/spring-beans-5.2.8.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.2.8.RELEASE/spring-beans-5.2.8.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.2.8.RELEASE/spring-beans-5.2.8.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_context_5_2_8_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_context_5_2_8_RELEASE.xml
index 99b2379..3194e8e 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_context_5_2_8_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_context_5_2_8_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework:spring-context:5.2.8.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.2.8.RELEASE/spring-context-5.2.8.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.2.8.RELEASE/spring-context-5.2.8.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.2.8.RELEASE/spring-context-5.2.8.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-context:5.2.8.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.2.8.RELEASE/spring-context-5.2.8.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.2.8.RELEASE/spring-context-5.2.8.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.2.8.RELEASE/spring-context-5.2.8.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_8_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_8_RELEASE.xml
index 965911e..19410b2 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_8_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_8_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.2.8.RELEASE/spring-context-support-5.2.8.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.2.8.RELEASE/spring-context-support-5.2.8.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.2.8.RELEASE/spring-context-support-5.2.8.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.2.8.RELEASE/spring-context-support-5.2.8.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.2.8.RELEASE/spring-context-support-5.2.8.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.2.8.RELEASE/spring-context-support-5.2.8.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_core_5_2_8_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_core_5_2_8_RELEASE.xml
index b800040..e7d5de5 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_core_5_2_8_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_core_5_2_8_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework:spring-core:5.2.8.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.2.8.RELEASE/spring-core-5.2.8.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.2.8.RELEASE/spring-core-5.2.8.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.2.8.RELEASE/spring-core-5.2.8.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-core:5.2.8.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.2.8.RELEASE/spring-core-5.2.8.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.2.8.RELEASE/spring-core-5.2.8.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.2.8.RELEASE/spring-core-5.2.8.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_expression_5_2_8_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_expression_5_2_8_RELEASE.xml
index 6a824ce..2d2456d 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_expression_5_2_8_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_expression_5_2_8_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework:spring-expression:5.2.8.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.2.8.RELEASE/spring-expression-5.2.8.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.2.8.RELEASE/spring-expression-5.2.8.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.2.8.RELEASE/spring-expression-5.2.8.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-expression:5.2.8.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.2.8.RELEASE/spring-expression-5.2.8.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.2.8.RELEASE/spring-expression-5.2.8.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.2.8.RELEASE/spring-expression-5.2.8.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_8_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_8_RELEASE.xml
index 1a7026c..4fea859 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_8_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_8_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.2.8.RELEASE/spring-jcl-5.2.8.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.2.8.RELEASE/spring-jcl-5.2.8.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.2.8.RELEASE/spring-jcl-5.2.8.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.2.8.RELEASE/spring-jcl-5.2.8.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.2.8.RELEASE/spring-jcl-5.2.8.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.2.8.RELEASE/spring-jcl-5.2.8.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_8_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_8_RELEASE.xml
index 4a52e9a..a1290a5 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_8_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_8_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework:spring-jdbc:5.2.8.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.2.8.RELEASE/spring-jdbc-5.2.8.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.2.8.RELEASE/spring-jdbc-5.2.8.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.2.8.RELEASE/spring-jdbc-5.2.8.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-jdbc:5.2.8.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.2.8.RELEASE/spring-jdbc-5.2.8.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.2.8.RELEASE/spring-jdbc-5.2.8.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.2.8.RELEASE/spring-jdbc-5.2.8.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_messaging_5_2_8_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_messaging_5_2_8_RELEASE.xml
index 9c030a1..ce343d6 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_messaging_5_2_8_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_messaging_5_2_8_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework:spring-messaging:5.2.8.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-messaging/5.2.8.RELEASE/spring-messaging-5.2.8.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-messaging/5.2.8.RELEASE/spring-messaging-5.2.8.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-messaging/5.2.8.RELEASE/spring-messaging-5.2.8.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-messaging:5.2.8.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-messaging/5.2.8.RELEASE/spring-messaging-5.2.8.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-messaging/5.2.8.RELEASE/spring-messaging-5.2.8.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-messaging/5.2.8.RELEASE/spring-messaging-5.2.8.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_test_5_2_8_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_test_5_2_8_RELEASE.xml
index f5a6a5e..5fa25dc 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_test_5_2_8_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_test_5_2_8_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework:spring-test:5.2.8.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.2.8.RELEASE/spring-test-5.2.8.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.2.8.RELEASE/spring-test-5.2.8.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.2.8.RELEASE/spring-test-5.2.8.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-test:5.2.8.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.2.8.RELEASE/spring-test-5.2.8.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.2.8.RELEASE/spring-test-5.2.8.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.2.8.RELEASE/spring-test-5.2.8.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_tx_5_2_8_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_tx_5_2_8_RELEASE.xml
index ef8f2f2..6c8bcb7 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_tx_5_2_8_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_tx_5_2_8_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework:spring-tx:5.2.8.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.2.8.RELEASE/spring-tx-5.2.8.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.2.8.RELEASE/spring-tx-5.2.8.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.2.8.RELEASE/spring-tx-5.2.8.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-tx:5.2.8.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.2.8.RELEASE/spring-tx-5.2.8.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.2.8.RELEASE/spring-tx-5.2.8.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.2.8.RELEASE/spring-tx-5.2.8.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_web_5_2_8_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_web_5_2_8_RELEASE.xml
index 79b327a..ae46cf0 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_web_5_2_8_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_web_5_2_8_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework:spring-web:5.2.8.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.2.8.RELEASE/spring-web-5.2.8.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.2.8.RELEASE/spring-web-5.2.8.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.2.8.RELEASE/spring-web-5.2.8.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-web:5.2.8.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.2.8.RELEASE/spring-web-5.2.8.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.2.8.RELEASE/spring-web-5.2.8.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.2.8.RELEASE/spring-web-5.2.8.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_8_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_8_RELEASE.xml
index a2f6648..d584e24 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_8_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_8_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.2.8.RELEASE/spring-webmvc-5.2.8.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.2.8.RELEASE/spring-webmvc-5.2.8.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.2.8.RELEASE/spring-webmvc-5.2.8.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.2.8.RELEASE/spring-webmvc-5.2.8.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.2.8.RELEASE/spring-webmvc-5.2.8.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.2.8.RELEASE/spring-webmvc-5.2.8.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_websocket_5_2_8_RELEASE.xml b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_websocket_5_2_8_RELEASE.xml
index 886abd8..139eee0 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_websocket_5_2_8_RELEASE.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_springframework_spring_websocket_5_2_8_RELEASE.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.springframework:spring-websocket:5.2.8.RELEASE">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-websocket/5.2.8.RELEASE/spring-websocket-5.2.8.RELEASE.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-websocket/5.2.8.RELEASE/spring-websocket-5.2.8.RELEASE-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-websocket/5.2.8.RELEASE/spring-websocket-5.2.8.RELEASE-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.springframework:spring-websocket:5.2.8.RELEASE">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-websocket/5.2.8.RELEASE/spring-websocket-5.2.8.RELEASE.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-websocket/5.2.8.RELEASE/spring-websocket-5.2.8.RELEASE-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-websocket/5.2.8.RELEASE/spring-websocket-5.2.8.RELEASE-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml b/springboot-vue3/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml
index bcee8c8..006a8d3 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.xmlunit:xmlunit-core:2.7.0">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.7.0/xmlunit-core-2.7.0.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.7.0/xmlunit-core-2.7.0-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.7.0/xmlunit-core-2.7.0-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.xmlunit:xmlunit-core:2.7.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.7.0/xmlunit-core-2.7.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.7.0/xmlunit-core-2.7.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.7.0/xmlunit-core-2.7.0-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml b/springboot-vue3/.idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml
index 17d3c89..e998675 100644
--- a/springboot-vue3/.idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml
+++ b/springboot-vue3/.idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: org.yaml:snakeyaml:1.26">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.26/snakeyaml-1.26.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.26/snakeyaml-1.26-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.26/snakeyaml-1.26-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: org.yaml:snakeyaml:1.26">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.26/snakeyaml-1.26.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.26/snakeyaml-1.26-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.26/snakeyaml-1.26-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml b/springboot-vue3/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml
index a87a398..9aadd29 100644
--- a/springboot-vue3/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml
+++ b/springboot-vue3/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: xml-apis:xml-apis:1.4.01">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: xml-apis:xml-apis:1.4.01">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/libraries/Maven__xml_apis_xml_apis_ext_1_3_04.xml b/springboot-vue3/.idea/libraries/Maven__xml_apis_xml_apis_ext_1_3_04.xml
index 64107e1..6baf5e0 100644
--- a/springboot-vue3/.idea/libraries/Maven__xml_apis_xml_apis_ext_1_3_04.xml
+++ b/springboot-vue3/.idea/libraries/Maven__xml_apis_xml_apis_ext_1_3_04.xml
@@ -1,13 +1,13 @@
-<component name="libraryTable">
- <library name="Maven: xml-apis:xml-apis-ext:1.3.04">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04-sources.jar!/" />
- </SOURCES>
- </library>
+<component name="libraryTable">
+ <library name="Maven: xml-apis:xml-apis-ext:1.3.04">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04-sources.jar!/" />
+ </SOURCES>
+ </library>
</component>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/misc.xml b/springboot-vue3/.idea/misc.xml
index 774ef25..f234ebc 100644
--- a/springboot-vue3/.idea/misc.xml
+++ b/springboot-vue3/.idea/misc.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="FrameworkDetectionExcludesConfiguration">
- <file type="web" url="file://$PROJECT_DIR$" />
- </component>
- <component name="MavenProjectsManager">
- <option name="originalFiles">
- <list>
- <option value="$PROJECT_DIR$/pom.xml" />
- </list>
- </option>
- </component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="11" project-jdk-type="JavaSDK" />
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="FrameworkDetectionExcludesConfiguration">
+ <file type="web" url="file://$PROJECT_DIR$" />
+ </component>
+ <component name="MavenProjectsManager">
+ <option name="originalFiles">
+ <list>
+ <option value="$PROJECT_DIR$/pom.xml" />
+ </list>
+ </option>
+ </component>
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="11" project-jdk-type="JavaSDK" />
</project>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/modules.xml b/springboot-vue3/.idea/modules.xml
index fd01957..550d16a 100644
--- a/springboot-vue3/.idea/modules.xml
+++ b/springboot-vue3/.idea/modules.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/springboot-vue3.iml" filepath="$PROJECT_DIR$/springboot-vue3.iml" />
- </modules>
- </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectModuleManager">
+ <modules>
+ <module fileurl="file://$PROJECT_DIR$/springboot-vue3.iml" filepath="$PROJECT_DIR$/springboot-vue3.iml" />
+ </modules>
+ </component>
</project>
\ No newline at end of file
diff --git a/springboot-vue3/.idea/vcs.xml b/springboot-vue3/.idea/vcs.xml
index 2e3f692..6c0b863 100644
--- a/springboot-vue3/.idea/vcs.xml
+++ b/springboot-vue3/.idea/vcs.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
- </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+ </component>
</project>
\ No newline at end of file
diff --git a/springboot-vue3/springboot-vue3.iml b/springboot-vue3/springboot-vue3.iml
index 84a010a..1581352 100644
--- a/springboot-vue3/springboot-vue3.iml
+++ b/springboot-vue3/springboot-vue3.iml
@@ -1,186 +1,186 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="web" name="Web">
- <configuration>
- <webroots>
- <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
- </webroots>
- <sourceRoots>
- <root url="file://$MODULE_DIR$/src/main/java" />
- <root url="file://$MODULE_DIR$/src/main/resources" />
- </sourceRoots>
- </configuration>
- </facet>
- <facet type="Spring" name="Spring">
- <configuration />
- </facet>
- </component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.2.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.2.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.2.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.2.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
- <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
- <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
- <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.2.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.2.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.37" level="project" />
- <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.37" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.21" level="project" />
- <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.2.RELEASE" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.2.RELEASE" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.2.RELEASE" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.16.1" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.6.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.6.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.vintage:junit-vintage-engine:5.6.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.6.2" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.3.3" level="project" />
- <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.3.3" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.2.8.RELEASE" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" />
- <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.5.4" level="project" />
- <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.1.5.Final" level="project" />
- <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
- <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
- <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt-api:0.10.7" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: io.jsonwebtoken:jjwt-impl:0.10.7" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: io.jsonwebtoken:jjwt-jackson:0.10.7" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring-boot-starter:1.8.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.8.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
- <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
- <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.8.0" level="project" />
- <orderEntry type="library" name="Maven: org.owasp.encoder:encoder:1.2.2" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.2.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.2.0" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.2.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.8.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.8.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.2.0" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.2.0" level="project" />
- <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:2.1" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.2" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generator:3.2.0" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.2" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.3.2.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.30" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
- <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
- <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.20" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
- <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
- <orderEntry type="library" name="Maven: com.deepoove:poi-tl:1.12.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.10" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:5.2.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi:5.2.2" level="project" />
- <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
- <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-lite:5.2.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:5.0.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.21" level="project" />
- <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
- <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.07" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-transcoder:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-anim:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-parser:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svg-dom:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-awt-util:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:2.6" level="project" />
- <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-bridge:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-script:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-dom:1.14" level="project" />
- <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gvt:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-shared-resources:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svggen:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-constants:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-i18n:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-xml:1.14" level="project" />
- <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-codec:1.14" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.3.2.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.2.8.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.2.8.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: com.github.xingshuangs:iot-communication:1.4.2" level="project" />
- </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="web" name="Web">
+ <configuration>
+ <webroots>
+ <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
+ </webroots>
+ <sourceRoots>
+ <root url="file://$MODULE_DIR$/src/main/java" />
+ <root url="file://$MODULE_DIR$/src/main/resources" />
+ </sourceRoots>
+ </configuration>
+ </facet>
+ <facet type="Spring" name="Spring">
+ <configuration />
+ </facet>
+ </component>
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.2.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.2.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.2.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.2.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+ <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+ <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+ <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.2.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.2.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.37" level="project" />
+ <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.37" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.21" level="project" />
+ <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.2.RELEASE" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.2.RELEASE" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.2.RELEASE" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.16.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.6.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.6.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.junit.vintage:junit-vintage-engine:5.6.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.6.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.3.3" level="project" />
+ <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.3.3" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.2.8.RELEASE" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" />
+ <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.5.4" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.1.5.Final" level="project" />
+ <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
+ <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt-api:0.10.7" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: io.jsonwebtoken:jjwt-impl:0.10.7" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: io.jsonwebtoken:jjwt-jackson:0.10.7" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring-boot-starter:1.8.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.8.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
+ <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
+ <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.8.0" level="project" />
+ <orderEntry type="library" name="Maven: org.owasp.encoder:encoder:1.2.2" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.2.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.2.0" level="project" />
+ <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.2.0" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.2.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.8.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.8.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.2.0" level="project" />
+ <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.2.0" level="project" />
+ <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:2.1" level="project" />
+ <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.2" level="project" />
+ <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generator:3.2.0" level="project" />
+ <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.2.0" level="project" />
+ <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.2" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.3.2.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.30" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
+ <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
+ <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.20" level="project" />
+ <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
+ <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
+ <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
+ <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
+ <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
+ <orderEntry type="library" name="Maven: com.deepoove:poi-tl:1.12.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.10" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:5.2.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.poi:poi:5.2.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+ <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-lite:5.2.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:5.0.3" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.21" level="project" />
+ <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
+ <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.07" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-transcoder:1.14" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-anim:1.14" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.14" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.14" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-parser:1.14" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svg-dom:1.14" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-awt-util:1.14" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:2.6" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-bridge:1.14" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-script:1.14" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-dom:1.14" level="project" />
+ <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gvt:1.14" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-shared-resources:1.14" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svggen:1.14" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.14" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-constants:1.14" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-i18n:1.14" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-xml:1.14" level="project" />
+ <orderEntry type="library" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-codec:1.14" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.3.2.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.2.8.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.2.8.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: com.github.xingshuangs:iot-communication:1.4.2" level="project" />
+ </component>
</module>
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/MyGenerator.java b/springboot-vue3/src/main/java/MyGenerator.java
index 0be7461..46475de 100644
--- a/springboot-vue3/src/main/java/MyGenerator.java
+++ b/springboot-vue3/src/main/java/MyGenerator.java
@@ -1,176 +1,176 @@
-
-
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.baomidou.mybatisplus.generator.AutoGenerator;
-import com.baomidou.mybatisplus.generator.InjectionConfig;
-import com.baomidou.mybatisplus.generator.config.*;
-import com.baomidou.mybatisplus.generator.config.po.TableInfo;
-import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * mybatis-plus-generator浠ｇ爜鐢熸垚鍣�
- * 淇敼閰嶇疆鍚庣洿鎺ヨ繍琛宮ain鏂规硶鍗冲彲
- */
-public class MyGenerator {
-
- /** 鏁版嵁婧愰厤缃�*/
- private static final String jdbc = "jdbc:mysql://localhost:3306/canadames?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
- private static final String driverName = "com.mysql.cj.jdbc.Driver";
-
- private static final String username = "root";
- private static final String password = "beibo.123/";
- /** 鍖呭悕*/
- private static final String moduleName = "device";
- /** 琛ㄥ悕鍓嶇紑*/
- private static final String beginName = "device";
- /** 闇�瑕佺敓鎴愪唬鐮佺殑琛�*/
- private static final String [] tables = new String[]{"device"};
-
-
-
-
- public static void main(String[] args) {
-
- // 瀹樻柟缃戠珯锛歨ttps://baomidou.com/pages/d357af/#%E8%87%AA%E5%AE%9A%E4%B9%89%E5%B1%9E%E6%80%A7%E6%B3%A8%E5%85%A5
-
- // 鍙傝�冪綉绔欙細https://blog.csdn.net/kinghmj01/article/details/97748509
-
- // 浠ｇ爜鐢熸垚鍣�
- AutoGenerator mpg = new AutoGenerator();
-
- // 鍏ㄥ眬閰嶇疆
- GlobalConfig gc = new GlobalConfig();
- // 褰撳墠椤圭洰璺緞
- String projectPath = System.getProperty("user.dir");
- // 褰撳墠椤圭洰鐨勪笅鐨勮矾寰�
- gc.setOutputDir(projectPath + "/src/main/java");
- // 浣滆��
- gc.setAuthor("yyq");
- // 鏄惁鎵撳紑杈撳嚭鐩綍 榛樿涓簍rue
- gc.setOpen(false);
- // 瀹炰綋灞炴�� Swagger2 娉ㄨВ
- gc.setSwagger2(true);
-
- // 鑷畾涔夋枃浠跺懡鍚嶏紝娉ㄦ剰 %s 浼氳嚜鍔ㄥ～鍏呰〃瀹炰綋灞炴�э紒
- gc.setControllerName("%sController");
- gc.setServiceName("%sService");
- gc.setServiceImplName("%sServiceImpl");
- gc.setMapperName("%sDao");
- gc.setEntityName("%sEntity");
- mpg.setGlobalConfig(gc);
-
- // 鏁版嵁婧愰厤缃�
- DataSourceConfig dsc = new DataSourceConfig();
- // dsc.setSchemaName("public");
- dsc.setUrl(jdbc);
- dsc.setDriverName(driverName);
- dsc.setUsername(username);
- dsc.setPassword(password);
- mpg.setDataSource(dsc);
-
- // 璁剧疆鍖呭悕
- PackageConfig pc = new PackageConfig();
- // 鐢ㄤ簬鍖呭悕銆佽〃鍚嶅墠缂�
- //pc.setModuleName(moduleName);
- // 鐢熸垚鍒伴偅浜涘寘涓� 濡� com.modules涓诲寘涓嬬殑 controller.sys.TestController
- pc.setParent("com.canadames");
- pc.setController("controller."+moduleName);
- pc.setService("service."+moduleName);
- pc.setServiceImpl("service."+moduleName+".impl");
- pc.setMapper("mapper."+moduleName);
- pc.setEntity("entity."+moduleName);
- mpg.setPackageInfo(pc);
-
- // 鑷畾涔夐厤缃�
- InjectionConfig cfg = new InjectionConfig() {
- @Override
- public void initMap() {
- // to do nothing
- }
- };
-
- // 濡傛灉妯℃澘寮曟搸鏄� freemarker
- String templatePath = "/templates/mapper.xml.ftl";
- // 濡傛灉妯℃澘寮曟搸鏄� velocity
- // String templatePath = "/templates/mapper.xml.vm";
-
- // 鑷畾涔夎緭鍑洪厤缃�
- List<FileOutConfig> focList = new ArrayList<>();
- // 鑷畾涔夐厤缃細琚紭鍏堣緭鍑�
- focList.add(new FileOutConfig(templatePath) {
- @Override
- public String outputFile(TableInfo tableInfo) {
- // 鑷畾涔夎緭鍑烘枃浠跺悕 锛� 濡傛灉浣� Entity 璁剧疆浜嗗墠鍚庣紑銆佹澶勬敞鎰� xml 鐨勫悕绉颁細璺熺潃鍙戠敓鍙樺寲锛侊紒
- return projectPath + "/src/main/resources/mapper/" + moduleName + "/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
- }
- });
- /*
- cfg.setFileCreate(new IFileCreate() {
- @Override
- public boolean isCreate(ConfigBuilder configBuilder, FileType fileType, String filePath) {
- // 鍒ゆ柇鑷畾涔夋枃浠跺す鏄惁闇�瑕佸垱寤�
- checkDir("璋冪敤榛樿鏂规硶鍒涘缓鐨勭洰褰曪紝鑷畾涔夌洰褰曠敤");
- if (fileType == FileType.MAPPER) {
- // 宸茬粡鐢熸垚 mapper 鏂囦欢鍒ゆ柇瀛樺湪锛屼笉鎯抽噸鏂扮敓鎴愯繑鍥� false
- return !new File(filePath).exists();
- }
- // 鍏佽鐢熸垚妯℃澘鏂囦欢
- return true;
- }
- });
- */
- cfg.setFileOutConfigList(focList);
- mpg.setCfg(cfg);
-
- // 閰嶇疆妯℃澘
- TemplateConfig templateConfig = new TemplateConfig();
-
- // 閰嶇疆鑷畾涔夎緭鍑烘ā鏉�
- //鎸囧畾鑷畾涔夋ā鏉胯矾寰勶紝娉ㄦ剰涓嶈甯︿笂.ftl/.vm, 浼氭牴鎹娇鐢ㄧ殑妯℃澘寮曟搸鑷姩璇嗗埆
- // templateConfig.setEntity("templates/entity2.java");
- // templateConfig.setService();
- // templateConfig.setController();
-
- templateConfig.setXml(null);
- mpg.setTemplate(templateConfig);
-
- // 绛栫暐閰嶇疆
- StrategyConfig strategy = new StrategyConfig();
-
- //闇�瑕佺敓鎴愮殑琛�
- strategy.setInclude(tables);
- strategy.setControllerMappingHyphenStyle(true);
- //绫诲悕鐢熸垚绛栫暐锛氶┘宄板懡鍚�
- strategy.setNaming(NamingStrategy.underline_to_camel);
- //瀛楁鍚嶇敓鎴愭柟寮忥細椹煎嘲鍛藉悕
- strategy.setColumnNaming(NamingStrategy.underline_to_camel);
- // 琛ㄥ墠缂�
- strategy.setTablePrefix(beginName+"_");
-
- // 鍐欎簬鐖剁被涓殑鍏叡瀛楁锛堝湪鐖剁被涓凡缁忔湁鐨勪笉闇�瑕佺敓鎴愮殑瀛楁锛�
- strategy.setSuperEntityColumns("id", "updateTime", "createTime");
- // 姣忓眰鐨勭户鎵匡紙涓嶉渶瑕佸彲涓嶈缃級
-// strategy.setSuperControllerClass("com.common.controller.MyController");
- strategy.setSuperServiceClass("com.baomidou.mybatisplus.extension.service.IService");
- strategy.setSuperServiceImplClass("com.baomidou.mybatisplus.extension.service.impl.ServiceImpl");
- strategy.setSuperMapperClass("com.baomidou.mybatisplus.core.mapper.BaseMapper");
- //缁ф壙鐨勫睘鎬х埗绫�
-// strategy.setSuperEntityClass("com.common.entity.MyEntity");
- strategy.setEntityLombokModel(true);
- strategy.setRestControllerStyle(true);
-
- mpg.setStrategy(strategy);
-
- mpg.setTemplateEngine(new FreemarkerTemplateEngine());
-
- mpg.execute();
- }
-
-
-
-}
-
+
+
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * mybatis-plus-generator浠ｇ爜鐢熸垚鍣�
+ * 淇敼閰嶇疆鍚庣洿鎺ヨ繍琛宮ain鏂规硶鍗冲彲
+ */
+public class MyGenerator {
+
+ /** 鏁版嵁婧愰厤缃�*/
+ private static final String jdbc = "jdbc:mysql://localhost:3306/canadames?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
+ private static final String driverName = "com.mysql.cj.jdbc.Driver";
+
+ private static final String username = "root";
+ private static final String password = "beibo.123/";
+ /** 鍖呭悕*/
+ private static final String moduleName = "device";
+ /** 琛ㄥ悕鍓嶇紑*/
+ private static final String beginName = "device";
+ /** 闇�瑕佺敓鎴愪唬鐮佺殑琛�*/
+ private static final String [] tables = new String[]{"device"};
+
+
+
+
+ public static void main(String[] args) {
+
+ // 瀹樻柟缃戠珯锛歨ttps://baomidou.com/pages/d357af/#%E8%87%AA%E5%AE%9A%E4%B9%89%E5%B1%9E%E6%80%A7%E6%B3%A8%E5%85%A5
+
+ // 鍙傝�冪綉绔欙細https://blog.csdn.net/kinghmj01/article/details/97748509
+
+ // 浠ｇ爜鐢熸垚鍣�
+ AutoGenerator mpg = new AutoGenerator();
+
+ // 鍏ㄥ眬閰嶇疆
+ GlobalConfig gc = new GlobalConfig();
+ // 褰撳墠椤圭洰璺緞
+ String projectPath = System.getProperty("user.dir");
+ // 褰撳墠椤圭洰鐨勪笅鐨勮矾寰�
+ gc.setOutputDir(projectPath + "/src/main/java");
+ // 浣滆��
+ gc.setAuthor("yyq");
+ // 鏄惁鎵撳紑杈撳嚭鐩綍 榛樿涓簍rue
+ gc.setOpen(false);
+ // 瀹炰綋灞炴�� Swagger2 娉ㄨВ
+ gc.setSwagger2(true);
+
+ // 鑷畾涔夋枃浠跺懡鍚嶏紝娉ㄦ剰 %s 浼氳嚜鍔ㄥ～鍏呰〃瀹炰綋灞炴�э紒
+ gc.setControllerName("%sController");
+ gc.setServiceName("%sService");
+ gc.setServiceImplName("%sServiceImpl");
+ gc.setMapperName("%sDao");
+ gc.setEntityName("%sEntity");
+ mpg.setGlobalConfig(gc);
+
+ // 鏁版嵁婧愰厤缃�
+ DataSourceConfig dsc = new DataSourceConfig();
+ // dsc.setSchemaName("public");
+ dsc.setUrl(jdbc);
+ dsc.setDriverName(driverName);
+ dsc.setUsername(username);
+ dsc.setPassword(password);
+ mpg.setDataSource(dsc);
+
+ // 璁剧疆鍖呭悕
+ PackageConfig pc = new PackageConfig();
+ // 鐢ㄤ簬鍖呭悕銆佽〃鍚嶅墠缂�
+ //pc.setModuleName(moduleName);
+ // 鐢熸垚鍒伴偅浜涘寘涓� 濡� com.modules涓诲寘涓嬬殑 controller.sys.TestController
+ pc.setParent("com.canadames");
+ pc.setController("controller."+moduleName);
+ pc.setService("service."+moduleName);
+ pc.setServiceImpl("service."+moduleName+".impl");
+ pc.setMapper("mapper."+moduleName);
+ pc.setEntity("entity."+moduleName);
+ mpg.setPackageInfo(pc);
+
+ // 鑷畾涔夐厤缃�
+ InjectionConfig cfg = new InjectionConfig() {
+ @Override
+ public void initMap() {
+ // to do nothing
+ }
+ };
+
+ // 濡傛灉妯℃澘寮曟搸鏄� freemarker
+ String templatePath = "/templates/mapper.xml.ftl";
+ // 濡傛灉妯℃澘寮曟搸鏄� velocity
+ // String templatePath = "/templates/mapper.xml.vm";
+
+ // 鑷畾涔夎緭鍑洪厤缃�
+ List<FileOutConfig> focList = new ArrayList<>();
+ // 鑷畾涔夐厤缃細琚紭鍏堣緭鍑�
+ focList.add(new FileOutConfig(templatePath) {
+ @Override
+ public String outputFile(TableInfo tableInfo) {
+ // 鑷畾涔夎緭鍑烘枃浠跺悕 锛� 濡傛灉浣� Entity 璁剧疆浜嗗墠鍚庣紑銆佹澶勬敞鎰� xml 鐨勫悕绉颁細璺熺潃鍙戠敓鍙樺寲锛侊紒
+ return projectPath + "/src/main/resources/mapper/" + moduleName + "/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
+ }
+ });
+ /*
+ cfg.setFileCreate(new IFileCreate() {
+ @Override
+ public boolean isCreate(ConfigBuilder configBuilder, FileType fileType, String filePath) {
+ // 鍒ゆ柇鑷畾涔夋枃浠跺す鏄惁闇�瑕佸垱寤�
+ checkDir("璋冪敤榛樿鏂规硶鍒涘缓鐨勭洰褰曪紝鑷畾涔夌洰褰曠敤");
+ if (fileType == FileType.MAPPER) {
+ // 宸茬粡鐢熸垚 mapper 鏂囦欢鍒ゆ柇瀛樺湪锛屼笉鎯抽噸鏂扮敓鎴愯繑鍥� false
+ return !new File(filePath).exists();
+ }
+ // 鍏佽鐢熸垚妯℃澘鏂囦欢
+ return true;
+ }
+ });
+ */
+ cfg.setFileOutConfigList(focList);
+ mpg.setCfg(cfg);
+
+ // 閰嶇疆妯℃澘
+ TemplateConfig templateConfig = new TemplateConfig();
+
+ // 閰嶇疆鑷畾涔夎緭鍑烘ā鏉�
+ //鎸囧畾鑷畾涔夋ā鏉胯矾寰勶紝娉ㄦ剰涓嶈甯︿笂.ftl/.vm, 浼氭牴鎹娇鐢ㄧ殑妯℃澘寮曟搸鑷姩璇嗗埆
+ // templateConfig.setEntity("templates/entity2.java");
+ // templateConfig.setService();
+ // templateConfig.setController();
+
+ templateConfig.setXml(null);
+ mpg.setTemplate(templateConfig);
+
+ // 绛栫暐閰嶇疆
+ StrategyConfig strategy = new StrategyConfig();
+
+ //闇�瑕佺敓鎴愮殑琛�
+ strategy.setInclude(tables);
+ strategy.setControllerMappingHyphenStyle(true);
+ //绫诲悕鐢熸垚绛栫暐锛氶┘宄板懡鍚�
+ strategy.setNaming(NamingStrategy.underline_to_camel);
+ //瀛楁鍚嶇敓鎴愭柟寮忥細椹煎嘲鍛藉悕
+ strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+ // 琛ㄥ墠缂�
+ strategy.setTablePrefix(beginName+"_");
+
+ // 鍐欎簬鐖剁被涓殑鍏叡瀛楁锛堝湪鐖剁被涓凡缁忔湁鐨勪笉闇�瑕佺敓鎴愮殑瀛楁锛�
+ strategy.setSuperEntityColumns("id", "updateTime", "createTime");
+ // 姣忓眰鐨勭户鎵匡紙涓嶉渶瑕佸彲涓嶈缃級
+// strategy.setSuperControllerClass("com.common.controller.MyController");
+ strategy.setSuperServiceClass("com.baomidou.mybatisplus.extension.service.IService");
+ strategy.setSuperServiceImplClass("com.baomidou.mybatisplus.extension.service.impl.ServiceImpl");
+ strategy.setSuperMapperClass("com.baomidou.mybatisplus.core.mapper.BaseMapper");
+ //缁ф壙鐨勫睘鎬х埗绫�
+// strategy.setSuperEntityClass("com.common.entity.MyEntity");
+ strategy.setEntityLombokModel(true);
+ strategy.setRestControllerStyle(true);
+
+ mpg.setStrategy(strategy);
+
+ mpg.setTemplateEngine(new FreemarkerTemplateEngine());
+
+ mpg.execute();
+ }
+
+
+
+}
+
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PLCManualJog.java b/springboot-vue3/src/main/java/com/example/springboot/component/PLCManualJog.java
new file mode 100644
index 0000000..23ac20d
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PLCManualJog.java
@@ -0,0 +1,173 @@
+package com.example.springboot.component;
+
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import org.apache.commons.io.FileUtils;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class PLCManualJog extends Thread {
+ String name = "";
+ Integer count = 0;
+
+ public static String readFileToString(String filePath) throws IOException {
+ File file = new File(filePath);
+ return FileUtils.readFileToString(file, "UTF-8");
+ }
+
+ public void readValue() {
+ String str = "";
+ BufferedReader bufferedReader = null;
+ FileInputStream fileInputStream;
+ try {
+ // 浠庢枃浠朵腑璇诲彇瀛楄妭鏁版嵁瀛樺叆 fileInputStream
+ fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/address.json");
+ // 璇诲彇 fileInputStream 涓瓧鑺傚苟灏嗗叾瑙ｇ爜涓哄瓧绗�
+ InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");
+ // 鎻愰珮璇诲彇鏁堢巼锛屽湪 BufferedReader 鍐呭寘瑁� InputStreamReader
+ bufferedReader = new BufferedReader(inputStreamReader);
+ String line = null;
+ // 灏� bufferedReader 鍐呭涓�琛屼竴琛岃祴鍊肩粰str
+ while ((line = bufferedReader.readLine()) != null) {
+ str += line;
+ }
+
+ // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
+ JSONObject jsonObject = new JSONObject(str);
+
+ // 鑾峰彇json涓殑鍊�
+ JSONArray address = jsonObject.getJSONArray("address");
+ for (int i = 0; i < address.size(); i++) {
+ JSONObject ress = (JSONObject) address.get(i);
+
+ this.name = ress.getStr("name");
+ this.count = ress.getInt("count");
+
+ }
+
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void run() {
+ while (this != null) {
+ try {
+ Thread.sleep(500);
+
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ // this.readValue();
+ // String PlcAddress = this.name;
+ // Integer Plccount = this.count;
+
+ // System.out.println(stt);
+ List<Boolean> arraylist = S7control.getinstance().ReadBits("DB101.0.0", 16);
+ List<Boolean> arraylist2 = S7control.getinstance().ReadBits("DB101.2.6", 8);
+ List<Boolean> arraylist3 = S7control.getinstance().ReadBits("DB101.5.2", 2);
+ // Boolean[] values1 = { false, true, true, true, false, false, true, false,
+ // false, true, true, true, false, false,
+ // true, false };
+ // List<Boolean> arraylist = new ArrayList<>(Arrays.asList(values1));
+ // Boolean[] values2 = { false, true, true, true, false, false, true, false };
+ // List<Boolean> arraylist2 = new ArrayList<>(Arrays.asList(values2));
+ // Boolean[] values3 = { false, false };
+ // List<Boolean> arraylist3 = new ArrayList<>(Arrays.asList(values3));
+
+ arraylist.addAll(arraylist2);
+ arraylist.addAll(arraylist3);
+
+ JSONObject jsonObject = new JSONObject();
+
+ short[] params = new short[arraylist.size()];
+ for (int i = 0; i < arraylist.size(); i++) {
+ boolean value = arraylist.get(i);
+ params[i] = value ? (short) 1 : (short) 0;
+ }
+
+ jsonObject.append("params", params);
+
+ WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualJog");
+ if (sendwServer != null) {
+ sendwServer.sendMessage(jsonObject.toString());
+ }
+
+ WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ManualJog");
+
+ if (webSocketServer != null) {
+ String addressList1 = "DB101.0.0";
+ String addressList2 = "DB101.2.6";
+ String addressList3 = "DB101.5.2";
+
+ List<String> messages = webSocketServer.getMessages();
+ if (!messages.isEmpty()) {
+ // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+ String lastMessage = messages.get(messages.size() - 1);
+ // System.out.println("messages锛�" + messages);
+ String[] parts = lastMessage.split(",");
+ List<Integer> messageValues = new ArrayList<>();
+ for (String part : parts) {
+ try {
+ // 浣跨敤姝ｅ垯琛ㄨ揪寮忔竻闄ら潪鏁板瓧瀛楃
+ String cleanedPart = part.replaceAll("[^0-9-]", "");
+ Integer value = Integer.parseInt(cleanedPart.trim());
+ messageValues.add(value);
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓烘暣鏁扮被鍨嬶紝鍒欏拷鐣ヨ閮ㄥ垎
+ // e.printStackTrace();
+ }
+
+ }
+ // 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
+ List<Boolean> messageBooleans = new ArrayList<>();
+ for (Integer value : messageValues) {
+ messageBooleans.add(value == 1 ? true : false);
+ }
+ // System.out.println(messageBooleans);
+ List<Boolean> bolList = new ArrayList<>();
+ List<Boolean> bolList2 = new ArrayList<>();
+ List<Boolean> bolList3 = new ArrayList<>();
+
+ for (int i = 0; i < 16 && i < messageBooleans.size(); i++) {
+ bolList.add(messageBooleans.get(i));
+ }
+
+ for (int i = 16; i < 24 && i < messageBooleans.size(); i++) {
+ bolList2.add(messageBooleans.get(i));
+ }
+
+ for (int i = 24; i < 26 && i < messageBooleans.size(); i++) {
+ bolList3.add(messageBooleans.get(i));
+ }
+
+ // System.out.println(bolList);
+ // System.out.println(bolList2);
+ // System.out.println(bolList3);
+ if (!bolList.isEmpty()) {
+ S7control.getinstance().WriteBit(addressList1, bolList);
+ System.out.println("messageValue锛�" + bolList + " written to PLC at address " + addressList1);
+ }
+ if (!bolList2.isEmpty()) {
+ S7control.getinstance().WriteBit(addressList2, bolList2);
+ System.out.println("messageValue锛�" + bolList2 + " written to PLC at address " + addressList2);
+ }
+ if (!bolList3.isEmpty()) {
+ S7control.getinstance().WriteBit(addressList3, bolList3);
+ System.out.println("messageValue锛�" + bolList3 + " written to PLC at address " + addressList3);
+ }
+ }
+
+ }
+
+ }
+ }
+}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
index a38d1f2..da4a94e 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
@@ -48,78 +48,69 @@
// // TODO Auto-generated catch block
// e.printStackTrace();
// }
-
// 鍒ゆ柇杩涚墖璇锋眰
List<Short> datas1List = S7control.getinstance().ReadWord("DB106.24", 1);// 鑾峰彇prc杩涚墖璇锋眰鏁版嵁
List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);// 鑾峰彇杩涚墖杞︾姸鎬�
List<Short> datas1ListState2 = S7control.getinstance().ReadWord("DB105.16", 1);// 鑾峰彇杩涚墖杞︿换鍔℃槸鍚﹀惎鍔�
-
- boolean B01backs =spianService.listbool("DB106.60");// b01姹囨姤
+ boolean B01backs = spianService.listbool("DB106.60");// b01姹囨姤
boolean B02backs = spianService.listbool("DB106.62");// b02姹囨姤
- StringBuilder B01glassid=spianService.queGlassid("DB106.DBB26");//BO1鐨勭幓鐠僫d
- StringBuilder B02glassid=spianService.queGlassid("DB106.DBB26");//B02鐨勭幓鐠僫d
- //褰撹繘鐗囧皬杞﹀畬鎴愪换鍔℃椂
- if(B01backs==true){
- //褰揃01灏忚溅姹囨姤瀹屾垚鏃舵洿鏀圭幓鐠冪姸鎬佷负1
- spianMapper.UpdateCageOver(B01glassid.toString(),1);//鏇存敼绗煎瓙琛ㄨ繘鐗囩姸鎬�
- spianMapper.Updatetask(1,0);//鏇存敼杩涚墖浠诲姟鐘舵�佷负1
- spianMapper.overqueue(B01glassid.toString(),0);//鏇存敼涓婄墖浠诲姟琛ㄧ殑鐘舵�佷负0
- S7control.getinstance().WriteWord("DB105.48", (short) 1);//搴旂瓟B01灏忚溅鏀跺埌
- S7control.getinstance().WriteWord("DB105.16", (short) 0);//杩涚墖浠诲姟鍚姩鏀逛负0
- }else{
- S7control.getinstance().WriteWord("DB105.48", (short) 0);//鎭㈠B01灏忚溅搴旂瓟
+ StringBuilder B01glassid = spianService.queGlassid("DB103.184", 14);// BO1鐨勭幓鐠僫d
+ StringBuilder B02glassid = spianService.queGlassid("DB103.212", 14);// B02鐨勭幓鐠僫d
+ // 褰撹繘鐗囧皬杞﹀畬鎴愪换鍔℃椂
+ if (B01backs == true) {
+ // 褰揃01灏忚溅姹囨姤瀹屾垚鏃舵洿鏀圭幓鐠冪姸鎬佷负1
+ spianMapper.UpdateCageOver(B01glassid.toString(), 1);// 鏇存敼绗煎瓙琛ㄨ繘鐗囩姸鎬�
+ spianMapper.Updatetask(1, 0);// 鏇存敼杩涚墖浠诲姟鐘舵�佷负1
+ spianMapper.overqueue(B01glassid.toString(), 0);// 鏇存敼涓婄墖浠诲姟琛ㄧ殑鐘舵�佷负0
+ S7control.getinstance().WriteWord("DB106.60", (short) 0);// 鎭㈠B01灏忚溅搴旂瓟鏀逛负0
+ S7control.getinstance().WriteWord("DB105.48", (short) 1);//姹囨姤B01灏忚溅鏀跺埌
}
- //褰撳嚭鐗囧皬杞﹀畬鎴愪换鍔℃椂
- if(B02backs==true){
- //褰揃02灏忚溅姹囨姤瀹屾垚鏃舵洿鏀圭幓鐠冪姸鎬佷负0
- spianMapper.UpdateCageOver(B02glassid.toString(),0);//鏇存敼绗煎瓙琛ㄥ嚭鐗囩姸鎬�
+
+ // 褰撳嚭鐗囧皬杞﹀畬鎴愪换鍔℃椂
+ if (B02backs == true) {
+ // 褰揃02灏忚溅姹囨姤瀹屾垚鏃舵洿鏀圭幓鐠冪姸鎬佷负0
+ spianMapper.UpdateCageOver(B02glassid.toString(), 0);// 鏇存敼绗煎瓙琛ㄥ嚭鐗囩姸鎬�
spianMapper.UpdatetaskOut(B02glassid.toString()); // 瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰皟搴︿换鍔�
- S7control.getinstance().WriteWord("DB105.50", (short) 1);//搴旂瓟B02灏忚溅鏀跺埌
- }else{
- S7control.getinstance().WriteWord("DB105.50", (short) 0);//鎭㈠B02灏忚溅搴旂瓟
+ S7control.getinstance().WriteWord("DB105.50", (short) 0);// 鎭㈠B02灏忚溅搴旂瓟鏀逛负0
+ // S7control.getinstance().WriteWord("DB105.50", (short) 1);//姹囨姤B02灏忚溅鏀跺埌
}
-
-
// 鑾峰彇DO1鏁版嵁
- StringBuilder queueid1 = spianService.queGlassid("DB106.DBB26");
+ StringBuilder queueid1 = spianService.queGlassid("DB103.44", 14);
// 鑾峰彇DO2鏁版嵁
- StringBuilder queueid2 = spianService.queGlassid("DB103.DBB78");
- System.out.println("D01"+queueid1);
- System.out.println("D02"+queueid2);
- int questate = spianMapper.Selectqueuestate();//鍒ゆ柇鎵爜浣嶆槸鍚︽湁鐜荤拑宸茬‘璁�
+ StringBuilder queueid2 = spianService.queGlassid("DB103.58", 14);
+ System.out.println("D01|" + queueid1);
+ System.out.println("D02|" + queueid2);
+ int questate = spianMapper.Selectquecount(queueid1.toString());// 鍒ゆ柇鎵爜浣嶆槸鍚︽湁鐜荤拑宸茬‘璁�
// queueid1.toString().isEmpty()
- north_glass_buffer1 glass1 = spianMapper.selectGlass(queueid1.toString());//D01鐨勭幓鐠冧俊鎭�
- north_glass_buffer1 glass2 = spianMapper.selectGlass(queueid2.toString());//D02鐜荤拑淇℃伅
- double quewitdh=0;
- double quewitdh2=0;
- //褰撴壂鐮佷綅鐜荤拑id涓虹┖鏃� 瀹藉害涓�0
- if(glass1==null){
- quewitdh=0;
- queueid1=new StringBuilder("");
- }else{
- quewitdh=glass1.getglasslengthmm();
- }
- if(glass2==null){
- quewitdh2=0;
- queueid2=new StringBuilder("");
- }else{
- quewitdh2=glass2.getglasslengthmm();
- }
-
-
- if (queueid1!=null&& questate == 0) {
+ north_glass_buffer1 glass1 = spianMapper.selectGlass(queueid1.toString());// D01鐨勭幓鐠冧俊鎭�
+ north_glass_buffer1 glass2 = spianMapper.selectGlass(queueid2.toString());// D02鐜荤拑淇℃伅
+ // 褰撴壂鐮佷綅鐜荤拑id涓虹┖鏃� 瀹藉害涓�0
+
+ if (queueid1 != null&&questate==0) {
// 鍐欏叆D01鐨勬暟鎹埌涓婄墖闃熷垪琛�
- spianMapper.insertqueue(queueid1.toString(), 1, quewitdh);
+ if (glass1 == null) { //褰撴病鏈夊�兼椂浼犵┖
+ spianMapper.Updatequeue(null,null,null,null, 0, null, null, null, null, 1);
+ } else {
+ spianMapper.overqueue2(queueid2.toString(), 0, 1);// 鏇存敼鎵爜浣嶄换鍔¤〃鐨勭姸鎬佷负0
+ spianMapper.Updatequeue(queueid1.toString(),glass1.getordernumber(),glass1.getlistnumber(),glass1.getboxnumber(),0,glass1.getglasslengthmm().toString(),glass1.getglassheightmm().toString(),glass1.getglasslength().toString(),glass1.getglassheight().toString(),1);
+ }
+
}
- if (queueid2!=null) {
- // 鍐欏叆D02鐨勬暟鎹埌涓婄墖闃熷垪琛�
- spianMapper.insertqueue(queueid2.toString(), 2, quewitdh2);
- spianMapper.overqueue2(queueid2.toString(),0,1);//鏇存敼涓婄墖浠诲姟琛ㄧ殑鐘舵�佷负0
+ if (queueid2 != null) {
+ // 鍐欏叆D02鐨勬暟鎹埌涓婄墖闃熷垪琛�
+ if(glass2==null){
+ spianMapper.Updatequeue(null,null,null,null, 0, null, null, null, null, 2);
+ }else{
+ spianMapper.Updatequeue(queueid1.toString(),glass2.getordernumber(),glass2.getlistnumber(),glass2.getboxnumber(),0,glass2.getglasslengthmm().toString(),glass2.getglassheightmm().toString(),glass2.getglasslength().toString(),glass2.getglassheight().toString(),2);
+
+ S7control.getinstance().WriteWord("DB105.16", (short) 0);//鍏抽棴浠诲姟鍚姩
+ }
+
}
- // 鍑虹墖浠诲姟////////////////////////////////
+ // 鍑虹墖浠诲姟////////////////////////////////
List<Short> outlist = S7control.getinstance().ReadWord("DB106.20", 1); // 鍑虹墖杞︾姸鎬�
List<Short> outlist1 = S7control.getinstance().ReadWord("DB105.18", 1); // 鍑虹墖浠诲姟鏄惁鍚姩
// StringBuilder writedstrIdOut = new StringBuilder();
@@ -127,7 +118,6 @@
byte[] writedglassidbytesOut = S7control.getinstance().ReadByte("DB105.30", 14);
String writedstrIdOut = new String(writedglassidbytesOut);
-
boolean outstate = false;// 鍑虹墖杞︾┖闂插垽鏂�
boolean outstate1 = false;// 鍑虹墖杞︿换鍔℃槸鍚﹀惎鍔�
if (outlist != null && outlist1 != null) {
@@ -143,25 +133,25 @@
}
if (outglassbegin & outstate)// 褰撲换鍔″紑濮嬩笖鍑虹墖杞︾┖闂叉椂
{
- outglassbegin = false;
+ outglassbegin = false;
}
if (outstate == true & glass.getbarcode() != null) { // 褰撳嚭鐗囪溅绌洪棽涓旀湁鍑虹墖浠诲姟寰呭畬鎴愭椂
// 鍒ゆ柇鏈変袱涓嚭鐗囨垨璋冩嫧浠诲姟鏃跺苟涓斿嚭鐗噄d鍜屾湭瀹屾垚鐨勫嚭鐗囦换鍔d涓嶄竴鏍锋椂鎵ц鍑虹墖
if (!writedstrIdOut.toString().equals(glass.getbarcode().toString())) {
spianService.selectout2(glass.getbarcode().toString());
- outstate=false;
+ outstate = false;
}
}
// 鍒ゆ柇褰撳墠鏄惁鏈夋湭鎵ц鐨勪换鍔�
int outnum = spianMapper.SelectOutSliceshu();
- //褰撴病鏈変换鍔℃墽琛屽苟涓斿嚭鐗囪溅绌洪棽鏃�
- if (outnum == 0&&outstate == true ) {
+ // 褰撴病鏈変换鍔℃墽琛屽苟涓斿嚭鐗囪溅绌洪棽鏃�
+ if (outnum == 0 && outstate == true) {
// 鍒ゆ柇閾濇鍑虹墖闃熷垪琛ㄦ槸鍚︽湁寰呭嚭鐗囩殑鐜荤拑
String outglassid = spianMapper.SelectOutSlice();
if (outglassid != null) {
spianService.selectout2(outglassid);
- outstate=false;
+ outstate = false;
}
}
if (outstate == true) {// 涓嬪彂浠诲姟鍚庡皢浠诲姟鍚姩鏀逛负0//鍑虹墖杞︾┖闂插垽鏂�
@@ -172,12 +162,12 @@
}
// if (outstate == true) { // 鍑虹墖杞︾姸鎬佺┖闂叉椂
- // Integer state = spianMapper.Selectoutstate();
- // String orderid = spianMapper.SelectOrderout();
+ // Integer state = spianMapper.Selectoutstate();
+ // String orderid = spianMapper.SelectOrderout();
- // if (orderid != null && state == 0) {
- // spianService.selectout(orderid);
- // }
+ // if (orderid != null && state == 0) {
+ // spianService.selectout(orderid);
+ // }
// }
// 鏌ヨ鏁版嵁搴�
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
index d0351de..49566c2 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
@@ -39,7 +39,7 @@
JSONObject jsonObject = new JSONObject(str);
// 鑾峰彇json涓殑鍊�
- JSONArray address = jsonObject.getJSONArray("ServoManualone");
+ JSONArray address = jsonObject.getJSONArray("ManualonePosition");
for (int i = 0; i < address.size(); i++) {
JSONObject ress = (JSONObject) address.get(i);
@@ -75,7 +75,7 @@
addresses.add("DB100.20");
addresses.add("DB103.52");
List<Short> arraylist = S7control.getinstance().readWords(addresses);
- // System.out.println(arraylist);
+// System.out.println(arraylist);
List<String> addresses2 = new ArrayList<>();
addresses2.add("DB100.110");
@@ -100,13 +100,19 @@
List<Short> arraylist7 = S7control.getinstance().ReadWord("DB103.48", 1);
List<Short> arraylist8 = S7control.getinstance().ReadWord("DB103.50", 1);
List<String> addresses9 = new ArrayList<>();
- addresses9.add("DB104.24");
- addresses9.add("DB104.26");
- addresses9.add("DB104.20");
- addresses9.add("DB104.22");
- addresses9.add("DB104.28");
- addresses9.add("DB104.30");
- List<Short> arraylist9 = S7control.getinstance().readWords(addresses9);
+ addresses9.add("DB104.1.2");
+ addresses9.add("DB104.1.3");
+ addresses9.add("DB104.1.6");
+ addresses9.add("DB104.1.7");
+// addresses9.add("DB104.28");
+// addresses9.add("DB104.30");
+ List<Boolean> arraylist9 = S7control.getinstance().readBits(addresses9);
+ short[] params2 = new short[arraylist9.size()];
+ for (int i = 0; i < arraylist9.size(); i++) {
+ boolean value = arraylist9.get(i);
+ params2[i] = value ? (short) 1 : (short) 0;
+ }
+// List<Short> arraylist9 = S7control.getinstance().readWords(addresses9);
arraylist5.addAll(arraylist6);
arraylist5.addAll(arraylist7);
arraylist5.addAll(arraylist8);
@@ -118,7 +124,7 @@
jsonObject.append("zuhe3", arraylist3);
jsonObject.append("zuhe4", arraylist4);
jsonObject.append("shishi1", arraylist5);
- jsonObject.append("guzhang", arraylist9);
+ jsonObject.append("guzhang", params2);
// jsonObject.append("weihuiling", arraylist8);
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualonePosition");
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java
new file mode 100644
index 0000000..f5da68d
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java
@@ -0,0 +1,281 @@
+package com.example.springboot.component;
+
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import org.apache.commons.io.FileUtils;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class PlcManualonePosition2 extends Thread {
+ String name = "";
+ Integer count = 0;
+
+ public static String readFileToString(String filePath) throws IOException {
+ File file = new File(filePath);
+ return FileUtils.readFileToString(file, "UTF-8");
+ }
+
+ public void readValue() {
+ String str = "";
+ BufferedReader bufferedReader = null;
+ FileInputStream fileInputStream;
+ try {
+ // 浠庢枃浠朵腑璇诲彇瀛楄妭鏁版嵁瀛樺叆 fileInputStream
+ fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/address.json");
+ // 璇诲彇 fileInputStream 涓瓧鑺傚苟灏嗗叾瑙ｇ爜涓哄瓧绗�
+ InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");
+ // 鎻愰珮璇诲彇鏁堢巼锛屽湪 BufferedReader 鍐呭寘瑁� InputStreamReader
+ bufferedReader = new BufferedReader(inputStreamReader);
+ String line = null;
+ // 灏� bufferedReader 鍐呭涓�琛屼竴琛岃祴鍊肩粰str
+ while ((line = bufferedReader.readLine()) != null) {
+ str += line;
+ }
+
+ // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
+ JSONObject jsonObject = new JSONObject(str);
+
+ // 鑾峰彇json涓殑鍊�
+ JSONArray address = jsonObject.getJSONArray("ServoManualone");
+ for (int i = 0; i < address.size(); i++) {
+ JSONObject ress = (JSONObject) address.get(i);
+
+ this.name = ress.getStr("name");
+ this.count = ress.getInt("count");
+
+ }
+
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void run() {
+ while (this != null) {
+ try {
+ Thread.sleep(500);
+
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ // this.readValue();
+ // String PlcAddress = this.name;
+ // Integer Plccount = this.count;
+
+ List<String> addresses = new ArrayList<>();
+ addresses.add("DB100.16");
+ addresses.add("DB100.116");
+ addresses.add("DB103.20");
+ List<Short> arraylist = S7control.getinstance().readWords(addresses);
+// System.out.println(arraylist);
+
+ List<String> addresses2 = new ArrayList<>();
+ addresses2.add("DB100.192");
+ addresses2.add("DB100.118");
+ addresses2.add("DB103.22");
+ List<Short> arraylist2 = S7control.getinstance().readWords(addresses2);
+
+ List<String> addresses9 = new ArrayList<>();
+
+
+
+ addresses9.add("DB104.1.2");
+ addresses9.add("DB104.1.3");
+ List<Boolean> arraylist9 = S7control.getinstance().readBits(addresses9);
+ short[] params2 = new short[arraylist9.size()];
+ for (int i = 0; i < arraylist9.size(); i++) {
+ boolean value = arraylist9.get(i);
+ params2[i] = value ? (short) 1 : (short) 0;
+ }
+
+ JSONObject jsonObject = new JSONObject();
+ // System.out.println(arraylist);
+ jsonObject.append("zuhe1", arraylist);
+ jsonObject.append("zuhe2", arraylist2);
+ jsonObject.append("guzhang", params2);
+ // jsonObject.append("weihuiling", arraylist8);
+
+ WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualonePosition2");
+ if (sendwServer != null) {
+ sendwServer.sendMessage(jsonObject.toString());
+ }
+
+ WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ManualonePosition2");
+ if (webSocketServer != null) {
+ List<String> messages = webSocketServer.getMessages();
+ List<String> waddresses1 = new ArrayList<>();
+ waddresses1.add("DB100.108");
+ waddresses1.add("DB100.20");
+ waddresses1.add("DB103.52");
+
+ List<String> waddresses2 = new ArrayList<>();
+ waddresses2.add("DB100.110");
+ waddresses2.add("DB100.176");
+ waddresses2.add("DB103.54");
+
+ // 鏁呴殰鍦板潃
+ List<String> waddresses3 = new ArrayList<>();
+ waddresses3.add("DB103.242");
+ waddresses3.add("DB103.248");
+
+ // 澶嶄綅鍦板潃
+ List<String> waddresses4 = new ArrayList<>();
+ waddresses4.add("DB101.3.6");
+ waddresses4.add("DB101.4.1");
+
+ // 鍥為浂鍦板潃
+ List<String> waddresses5 = new ArrayList<>();
+ waddresses5.add("DB101.3.7");
+ waddresses5.add("DB101.4.2");
+
+ if (!messages.isEmpty()) {
+ // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
+ String lastMessage = messages.get(messages.size() - 1);
+ // System.out.println("lastMessage锛�" + lastMessage);
+ JSONArray messageArray = new JSONArray(lastMessage);
+
+ // A01涓嬪彂
+ if (messageArray.getJSONArray(0).size() > 0) {
+ JSONArray jsonArray = messageArray.getJSONArray(0);
+ List<Short> sValue = new ArrayList<>();
+ for (int i = 0; i < jsonArray.size(); i++) {
+ Object value = jsonArray.get(i);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ short val = Short.parseShort(cleanedValue.trim());
+ sValue.add(val);
+ System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ if (!sValue.isEmpty()) {
+ S7control.getinstance().WriteWord(waddresses1, sValue);
+ System.out.println("Values " + sValue + " written to PLC at address " + waddresses1);
+ }
+ }
+
+ // A02涓嬪彂
+ if (messageArray.getJSONArray(1).size() > 0) {
+ JSONArray jsonArray = messageArray.getJSONArray(1);
+ List<Short> sValue2 = new ArrayList<>();
+ for (int i = 0; i < jsonArray.size(); i++) {
+ Object value = jsonArray.get(i);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ short val = Short.parseShort(cleanedValue.trim());
+ sValue2.add(val);
+ System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ if (!sValue2.isEmpty()) {
+ S7control.getinstance().WriteWord(waddresses2, sValue2);
+ System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses2);
+ }
+ }
+
+ // 鍐欏叆鏁呴殰鍦板潃
+ if (messageArray.getJSONArray(2).size() > 0) {
+ JSONArray jsonArray = messageArray.getJSONArray(2);
+ List<Short> sValue2 = new ArrayList<>();
+ for (int i = 0; i < jsonArray.size(); i++) {
+ Object value = jsonArray.get(i);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ short val = Short.parseShort(cleanedValue.trim());
+ sValue2.add(val);
+ System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ if (!sValue2.isEmpty()) {
+ S7control.getinstance().WriteWord(waddresses3, sValue2);
+ System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses3);
+ }
+ }
+
+ // 鍐欏叆澶嶄綅鍦板潃
+ if (messageArray.getJSONArray(3).size() > 0) {
+ JSONArray jsonArray = messageArray.getJSONArray(3);
+ List<Short> sValue2 = new ArrayList<>();
+ List<Boolean> messageBooleans = new ArrayList<>();
+ for (int i = 0; i < jsonArray.size(); i++) {
+ Object value = jsonArray.get(i);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ short val = Short.parseShort(cleanedValue.trim());
+ sValue2.add(val);
+ // 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
+ for (short values : sValue2) {
+ messageBooleans.add(values == 1 ? true : false);
+ }
+ System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ if (!messageBooleans.isEmpty()) {
+ S7control.getinstance().WriteBit(waddresses4, messageBooleans);
+ System.out.println("Values " + messageBooleans + " written to PLC at address " + waddresses4);
+ }
+ }
+
+ // 鍐欏叆鍥為浂鍦板潃
+ if (messageArray.getJSONArray(4).size() > 0) {
+ JSONArray jsonArray = messageArray.getJSONArray(4);
+ List<Short> sValue2 = new ArrayList<>();
+ List<Boolean> messageBooleans = new ArrayList<>();
+ for (int i = 0; i < jsonArray.size(); i++) {
+ Object value = jsonArray.get(i);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ short val = Short.parseShort(cleanedValue.trim());
+ sValue2.add(val);
+ // 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
+ for (short values : sValue2) {
+ messageBooleans.add(values == 1 ? true : false);
+ }
+ System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ if (!messageBooleans.isEmpty()) {
+ S7control.getinstance().WriteBit(waddresses5, messageBooleans);
+ System.out.println("Values " + messageBooleans + " written to PLC at address " + waddresses5);
+ }
+ }
+
+ // 娓呯┖娑堟伅鍒楄〃
+ webSocketServer.clearMessages();
+ }
+ }
+ }
+ }
+}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
index 08e7f66..0399888 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter.java
@@ -73,18 +73,18 @@
} catch (InterruptedException e) {
e.printStackTrace();
}
- this.readValue();
- String PlcAddress = this.name;
- Integer Plccount = this.count;
+// this.readValue();
+// String PlcAddress = this.name;
+// Integer Plccount = this.count;
// System.out.println(stt);
- // List<Short> arraylist = S7control.getinstance().ReadWord("DB100.0", 12);
- // List<Short> state = S7control.getinstance().ReadWord("DB103.0", 10);
- Short[] values1 = { 1231, 1, 1, 1, 1, 1, 2, 33, 2, 3, 4, 5 };
- List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+ List<Short> arraylist = S7control.getinstance().ReadWord("DB100.0", 72);
+ List<Short> state = S7control.getinstance().ReadWord("DB103.0", 10);
+// Short[] values1 = { 1231, 1, 1, 1, 1, 1, 2, 33, 2, 3, 4, 5 ,1231, 1, 1, 1, 1, 1, 2, 33, 2, 3, 4, 5 };
+// List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
- Short[] values2 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
- List<Short> state = new ArrayList<>(Arrays.asList(values2));
+// Short[] values2 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+// List<Short> state = new ArrayList<>(Arrays.asList(values2));
// Boolean[] values = { false, true, true, true, true, true, true, true, true,
// true, true, true, true, true, true, true, true, true, true, true, true, true,
@@ -137,7 +137,7 @@
}
// 灏嗘秷鎭�煎啓鍏� PLC
- // S7control.getinstance().WriteWord(addressList, messageValues);
+ S7control.getinstance().WriteWord(addressList, messageValues);
System.out.println("messageValues锛�" + messageValues);
System.out.println("addressList锛�" + addressList);
// 娓呯┖娑堟伅鍒楄〃
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1.java
index d1518f6..e2fa2b8 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1.java
@@ -71,9 +71,23 @@
// Integer Plccount = this.count;
// System.out.println(stt);
- List<Short> arraylist = S7control.getinstance().ReadWord("DB100.0", 12);
- List<Short> fanzhuan1 = S7control.getinstance().ReadWord("DB100.8", 1);
- List<Short> xiaoche1 = S7control.getinstance().ReadWord("DB100.12", 1);
+ List<String> addresses = new ArrayList<>();
+ addresses.add("DB100.0");
+ addresses.add("DB100.2");
+ addresses.add("DB100.4");
+ addresses.add("DB100.6");
+ addresses.add("DB100.26");
+ addresses.add("DB100.28");
+ addresses.add("DB100.30");
+ addresses.add("DB100.32");
+ addresses.add("DB100.34");
+ addresses.add("DB100.36");
+ addresses.add("DB100.38");
+ addresses.add("DB100.40");
+ List<Short> arraylist = S7control.getinstance().readWords(addresses);
+
+ List<Short> fanzhuan1 = S7control.getinstance().ReadWord("DB100.8", 1);
+ List<Short> xiaoche1 = S7control.getinstance().ReadWord("DB100.12", 1);
// Short[] values1 = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
// List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
// Short[] fanzhuan = { 4 };
@@ -86,8 +100,8 @@
// new short[]{0,0, 0, 0, 0, 0, 0, 0, 0, 0}
jsonObject.append("params", arraylist);
- jsonObject.append("fanzhuan", fanzhuan1);
- jsonObject.append("xiaoche", xiaoche1);
+ jsonObject.append("fanzhuan", fanzhuan1);
+ jsonObject.append("xiaoche", xiaoche1);
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter1");
if (sendwServer != null) {
@@ -97,7 +111,20 @@
WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Parameter1");
if (webSocketServer != null) {
List<String> messages = webSocketServer.getMessages();
- String addressList1 = "DB100.0";
+ List<String> waddresses1 = new ArrayList<>();
+ waddresses1.add("DB100.0");
+ waddresses1.add("DB100.2");
+ waddresses1.add("DB100.4");
+ waddresses1.add("DB100.6");
+ waddresses1.add("DB100.26");
+ waddresses1.add("DB100.28");
+ waddresses1.add("DB100.30");
+ waddresses1.add("DB100.32");
+ waddresses1.add("DB100.34");
+ waddresses1.add("DB100.36");
+ waddresses1.add("DB100.38");
+ waddresses1.add("DB100.40");
+
String addressList2 = "DB100.8";
String addressList3 = "DB100.12";
@@ -133,9 +160,9 @@
try {
String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
short sValue = Short.parseShort(cleanedValue.trim());
- S7control.getinstance().WriteWord(addressList1, Arrays.asList(sValue));
+ S7control.getinstance().WriteWord(addressList2, Arrays.asList(sValue));
System.out
- .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList3);
+ .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList2);
} catch (NumberFormatException e) {
// 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
System.err.println("Could not parse value: " + value);
@@ -150,9 +177,9 @@
try {
String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
short sValue = Short.parseShort(cleanedValue.trim());
- S7control.getinstance().WriteWord(addressList2, Arrays.asList(sValue));
+ S7control.getinstance().WriteWord(addressList3, Arrays.asList(sValue));
System.out
- .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList2);
+ .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList3);
} catch (NumberFormatException e) {
// 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
System.err.println("Could not parse value: " + value);
@@ -162,8 +189,8 @@
// 鍐欏叆绗笁涓湴鍧�
if (!mergedList.isEmpty()) {
- S7control.getinstance().WriteWord(addressList3, mergedList);
- System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList1);
+ S7control.getinstance().WriteWord(waddresses1, mergedList);
+ System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + waddresses1);
}
// 娓呯┖娑堟伅鍒楄〃
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
index 7d65157..59124ce 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
@@ -67,19 +67,34 @@
e.printStackTrace();
}
+
List<String> addressList1 = new ArrayList<>();
- addressList1.add("DB103.32~45");
- addressList1.add("DB103.46~59");
- addressList1.add("DB103.60~73");
- addressList1.add("DB103.74~101");
- addressList1.add("DB103.102~115");
- addressList1.add("DB103.116~143");
- addressList1.add("DB103.144~157");
- addressList1.add("DB103.158~171");
- addressList1.add("DB103.172~185");
- addressList1.add("DB103.200~213");
- addressList1.add("DB103.228~241");
- List<Boolean> paramlist = S7control.getinstance().readBits(addressList1);
+// addressList1.add("DB103.32~45");
+// addressList1.add("DB103.46~59");
+// addressList1.add("DB103.60~73");
+// addressList1.add("DB103.74~101");
+// addressList1.add("DB103.102~115");
+// addressList1.add("DB103.116~143");
+// addressList1.add("DB103.144~157");
+// addressList1.add("DB103.158~171");
+// addressList1.add("DB103.172~185");
+// addressList1.add("DB103.200~213");
+// addressList1.add("DB103.228~241");
+ addressList1.add("DB103.44");//D01
+ addressList1.add("DB103.58");//D02
+ addressList1.add("DB103.72");//D03
+ addressList1.add("DB103.86");//D04
+ addressList1.add("DB103.100");//D05
+ addressList1.add("DB103.114");//D06
+ addressList1.add("DB103.128");//A01
+ addressList1.add("DB103.156");//A01 2
+ addressList1.add("DB103.142");//A02
+ addressList1.add("DB103.212");//B01
+ addressList1.add("DB103.184");//B02
+
+
+ List<String> paramlist = S7control.getinstance().readStrings(addressList1);
+
List<String> addresses = new ArrayList<>();
addresses.add("DB103.0");
@@ -94,43 +109,47 @@
addresses.add("DB103.6");
List<Short> data = S7control.getinstance().readWords(addresses);
+
+
List<Boolean> data2 = S7control.getinstance().ReadBits("DB101.9.2", 10);
List<String> addressList3 = new ArrayList<>();
- addressList3.add("DB103.6");
- List<Boolean> data3 = S7control.getinstance().readBits(addressList3);
+ addressList3.add("DB106.64");
+ List<String> data3 = S7control.getinstance().readStrings(addressList3);
List<String> addresses4 = new ArrayList<>();
- addresses.add("DB106.0");
- addresses.add("DB106.12");
- addresses.add("DB106.40");
- addresses.add("DB106.50");
+ addresses4.add("DB103.52");
+ addresses4.add("DB103.54");
+ addresses4.add("DB103.56");
+ addresses4.add("DB103.60");
List<Short> data4 = S7control.getinstance().readWords(addresses4);
- // Boolean[] values = { false, true, true, true, true, true, true, true, true,
- // true};
- // List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
- // Short[] values1 = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
- // List<Short> data = new ArrayList<>(Arrays.asList(values1));
- // Short[] values2 = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
- // List<Short> data2 = new ArrayList<>(Arrays.asList(values2));
- // Short[] values3 = { 11};
- // List<Short> data3 = new ArrayList<>(Arrays.asList(values3));
- // Short[] values4 = { 2,2,3,4};
- // List<Short> data4 = new ArrayList<>(Arrays.asList(values4));
+
+// Boolean[] values = { false, true, true, true, true, true, true, true, true,
+// true};
+// List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
+// Short[] values1 = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
+// List<Short> data = new ArrayList<>(Arrays.asList(values1));
+// Short[] values2 = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
+// List<Short> data2 = new ArrayList<>(Arrays.asList(values2));
+// Short[] values3 = { 11};
+// List<Short> data3 = new ArrayList<>(Arrays.asList(values3));
+// Short[] values4 = { 2,2,3,4};
+// List<Short> data4 = new ArrayList<>(Arrays.asList(values4));
+
JSONObject jsonObject = new JSONObject();
- short[] params = new short[paramlist.size()];
- for (int i = 0; i < paramlist.size(); i++) {
- boolean value = paramlist.get(i);
+ short[] params = new short[data2.size()];
+ for (int i = 0; i < data2.size(); i++) {
+ boolean value = data2.get(i);
params[i] = value ? (short) 1 : (short) 0;
}
-
jsonObject.append("params", params);
+ jsonObject.append("params", paramlist);
jsonObject.append("params", data);
- jsonObject.append("params", data2);
jsonObject.append("params", data3);
jsonObject.append("params", data4);
+
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter2");
if (sendwServer != null) {
@@ -158,7 +177,7 @@
messageValues.add(value);
} catch (NumberFormatException e) {
// 濡傛灉鏃犳硶瑙ｆ瀽涓烘暣鏁扮被鍨嬶紝鍒欏拷鐣ヨ閮ㄥ垎
- // e.printStackTrace();
+// e.printStackTrace();
}
}
@@ -169,7 +188,7 @@
}
// 灏嗗竷灏斿垪琛ㄥ啓鍏� PLC
- S7control.getinstance().WriteBit(addressList, messageBooleans);
+ S7control.getinstance().WriteBit(addressList, messageBooleans);
System.out.println("messageValues锛�" + messageBooleans);
System.out.println("addressList锛�" + addressList);
// 娓呯┖娑堟伅鍒楄〃
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
index 11b23a1..8c2ef38 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
@@ -17,131 +17,135 @@
import org.apache.commons.io.FileUtils;
public class PlcPositioning1 extends Thread {
- String name = "";
- Integer count = 0;
+ String name = "";
+ Integer count = 0;
- public static String readFileToString(String filePath) throws IOException {
- File file = new File(filePath);
- return FileUtils.readFileToString(file, "UTF-8");
- }
-
- public void readValue() {
- String str = "";
- BufferedReader bufferedReader = null;
- FileInputStream fileInputStream;
- try {
- // 浠庢枃浠朵腑璇诲彇瀛楄妭鏁版嵁瀛樺叆 fileInputStream
- fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/address.json");
- // 璇诲彇 fileInputStream 涓瓧鑺傚苟灏嗗叾瑙ｇ爜涓哄瓧绗�
- InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");
- // 鎻愰珮璇诲彇鏁堢巼锛屽湪 BufferedReader 鍐呭寘瑁� InputStreamReader
- bufferedReader = new BufferedReader(inputStreamReader);
- String line = null;
- // 灏� bufferedReader 鍐呭涓�琛屼竴琛岃祴鍊肩粰str
- while ((line = bufferedReader.readLine()) != null) {
- str += line;
- }
-
- // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
- JSONObject jsonObject = new JSONObject(str);
-
- // 鑾峰彇json涓殑鍊�
- JSONArray address = jsonObject.getJSONArray("Positioning1");
- for (int i = 0; i < address.size(); i++) {
- JSONObject ress = (JSONObject) address.get(i);
-
- this.name = ress.getStr("name");
- this.count = ress.getInt("count");
- System.out.println("messageValues锛�" + this.name);
- System.out.println("messageValues锛�" + this.count);
- }
-
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
+ public static String readFileToString(String filePath) throws IOException {
+ File file = new File(filePath);
+ return FileUtils.readFileToString(file, "UTF-8");
}
- }
- @Override
- public void run() {
- while (this != null) {
- try {
- Thread.sleep(1000);
-
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- // this.readValue();
- // String PlcAddress = this.name;
- // Integer Plccount = this.count;
-
- // System.out.println(stt);
- List<Short> arraylist = S7control.getinstance().ReadWord("DB100.42", 23);
-
- // Short[] 瀛樼墖 = { 1 };
- // List<Short> 瀛樼墖1 = new ArrayList<>(Arrays.asList(瀛樼墖));
- // Short[] 鎺ョ墖 = { 1 };
- // List<Short> 鎺ョ墖1 = new ArrayList<>(Arrays.asList(鎺ョ墖));
- // Short[] 闂磋窛 = { 1 };
- // List<Short> 闂磋窛1 = new ArrayList<>(Arrays.asList(闂磋窛));
- // Short[] values1 = {1,1,1, 1,2, 3, 4, 5, 6, 7, 8, 9, 10,11,
- // 12,13,14,15,16,17,18,19,20 };
- // List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
-
- JSONObject jsonObject = new JSONObject();
-
- jsonObject.append("params", arraylist);
-
- WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Positioning1");
- if (sendwServer != null) {
- sendwServer.sendMessage(jsonObject.toString());
- }
-
- WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Positioning1");
- if (webSocketServer != null) {
- List<String> messages = webSocketServer.getMessages();
-
- String addressList3 = "DB100.12";
-
- if (!messages.isEmpty()) {
- // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
- String lastMessage = messages.get(messages.size() - 1);
- // System.out.println("lastMessage锛�" + lastMessage);
- JSONArray messageArray = new JSONArray(lastMessage);
-
- // 鏁村悎绗� 1 鍒� 3 涓暟缁勫苟鍘绘帀 null 鍏冪礌
- List<Short> mergedList = new ArrayList<>();
- for (int i = 0; i < 5; i++) {
- JSONArray sublist = messageArray.getJSONArray(i);
- for (int j = 0; j < sublist.size(); j++) {
- Object value = sublist.get(j);
- if (value != null && !value.toString().equals("null")) {
- try {
- String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- short sValue = Short.parseShort(cleanedValue.trim());
- mergedList.add(sValue);
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
- System.err.println("Could not parse value: " + value);
- }
- }
+ public void readValue() {
+ String str = "";
+ BufferedReader bufferedReader = null;
+ FileInputStream fileInputStream;
+ try {
+ // 浠庢枃浠朵腑璇诲彇瀛楄妭鏁版嵁瀛樺叆 fileInputStream
+ fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/address.json");
+ // 璇诲彇 fileInputStream 涓瓧鑺傚苟灏嗗叾瑙ｇ爜涓哄瓧绗�
+ InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");
+ // 鎻愰珮璇诲彇鏁堢巼锛屽湪 BufferedReader 鍐呭寘瑁� InputStreamReader
+ bufferedReader = new BufferedReader(inputStreamReader);
+ String line = null;
+ // 灏� bufferedReader 鍐呭涓�琛屼竴琛岃祴鍊肩粰str
+ while ((line = bufferedReader.readLine()) != null) {
+ str += line;
}
- }
- // 鍐欏叆绗瑈i涓湴鍧�
- if (!mergedList.isEmpty()) {
- // S7control.getinstance().WriteWord(addressList3, mergedList);
- System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList3);
- }
+ // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
+ JSONObject jsonObject = new JSONObject(str);
- // 娓呯┖娑堟伅鍒楄〃
- webSocketServer.clearMessages();
+ // 鑾峰彇json涓殑鍊�
+ JSONArray address = jsonObject.getJSONArray("Positioning1");
+ for (int i = 0; i < address.size(); i++) {
+ JSONObject ress = (JSONObject) address.get(i);
+
+ this.name = ress.getStr("name");
+ this.count = ress.getInt("count");
+ System.out.println("messageValues锛�" + this.name);
+ System.out.println("messageValues锛�" + this.count);
+ }
+
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
}
-
- }
}
- }
+
+ @Override
+ public void run() {
+ while (this != null) {
+ try {
+ Thread.sleep(1000);
+
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+// this.readValue();
+// String PlcAddress = this.name;
+// Integer Plccount = this.count;
+
+ // System.out.println(stt);
+ List<Short> arraylist = S7control.getinstance().ReadWord("DB100.42", 23);
+// System.out.println(arraylist);
+// Short[] 瀛樼墖 = { 1 };
+// List<Short> 瀛樼墖1 = new ArrayList<>(Arrays.asList(瀛樼墖));
+// Short[] 鎺ョ墖 = { 1 };
+// List<Short> 鎺ョ墖1 = new ArrayList<>(Arrays.asList(鎺ョ墖));
+// Short[] 闂磋窛 = { 1 };
+// List<Short> 闂磋窛1 = new ArrayList<>(Arrays.asList(闂磋窛));
+// Short[] values1 = {1,1,1, 1,2, 3, 4, 5, 6, 7, 8, 9, 10,11, 12,13,14,15,16,17,18,19,20 };
+// List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+
+
+ JSONObject jsonObject = new JSONObject();
+
+
+ jsonObject.append("params", arraylist);
+
+
+ WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Positioning1");
+ if (sendwServer != null) {
+ sendwServer.sendMessage(jsonObject.toString());
+ }
+
+ WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Positioning1");
+ if (webSocketServer != null) {
+ List<String> messages = webSocketServer.getMessages();
+
+ String addressList3 = "DB100.42";
+
+ if (!messages.isEmpty()) {
+ // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
+ String lastMessage = messages.get(messages.size() - 1);
+// System.out.println("lastMessage锛�" + lastMessage);
+ JSONArray messageArray = new JSONArray(lastMessage);
+
+ // 鏁村悎绗� 1 鍒� 3 涓暟缁勫苟鍘绘帀 null 鍏冪礌
+ List<Short> mergedList = new ArrayList<>();
+ for (int i = 0; i < 5; i++) {
+ JSONArray sublist = messageArray.getJSONArray(i);
+ for (int j = 0; j < sublist.size(); j++) {
+ Object value = sublist.get(j);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ short sValue = Short.parseShort(cleanedValue.trim());
+ mergedList.add(sValue);
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ }
+
+
+ // 鍐欏叆绗瑈i涓湴鍧�
+ if (!mergedList.isEmpty()) {
+ S7control.getinstance().WriteWord(addressList3, mergedList);
+ System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList3);
+ }
+
+ // 娓呯┖娑堟伅鍒楄〃
+ webSocketServer.clearMessages();
+ }
+
+
+ }
+ }
+ }
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
index 5b91621..9a45abc 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
@@ -18,42 +18,25 @@
return FileUtils.readFileToString(file, "UTF-8");
}
- public void readValue() {
- String str = "";
- BufferedReader bufferedReader = null;
- FileInputStream fileInputStream;
- try {
- // 浠庢枃浠朵腑璇诲彇瀛楄妭鏁版嵁瀛樺叆 fileInputStream
- fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/address.json");
- // 璇诲彇 fileInputStream 涓瓧鑺傚苟灏嗗叾瑙ｇ爜涓哄瓧绗�
- InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");
- // 鎻愰珮璇诲彇鏁堢巼锛屽湪 BufferedReader 鍐呭寘瑁� InputStreamReader
- bufferedReader = new BufferedReader(inputStreamReader);
- String line = null;
- // 灏� bufferedReader 鍐呭涓�琛屼竴琛岃祴鍊肩粰str
- while ((line = bufferedReader.readLine()) != null) {
- str += line;
+
+
+
+ public void insertDataToList(List<Short> list, String rangeAddress, int insertIndex) {
+ if (list.size() >= insertIndex + 14) {
+ List<Short> rangeData = new ArrayList<>();
+ byte[] byteData = S7control.getinstance().ReadByte(rangeAddress, 14);
+ if (byteData != null && byteData.length == 14) {
+ for (byte b : byteData) {
+ rangeData.add((short) b);
+ }
+ } else {
+ // 璇诲彇鏁版嵁澶辫触锛屾坊鍔犻粯璁ゅ��
+ for (int i = 0; i < 14; i++) {
+ rangeData.add((short) -1);
+ }
}
- // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
- JSONObject jsonObject = new JSONObject(str);
-
- // 鑾峰彇json涓殑鍊�
- JSONArray address = jsonObject.getJSONArray("ServoManualone");
- for (int i = 0; i < address.size(); i++) {
- JSONObject ress = (JSONObject) address.get(i);
-
- this.name = ress.getStr("name");
- this.count = ress.getInt("count");
-
- }
-
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
+ list.addAll(insertIndex, rangeData);
}
}
@@ -61,78 +44,100 @@
public void run() {
while (this != null) {
try {
- Thread.sleep(500);
+ Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
- // this.readValue();
- // String PlcAddress = this.name;
- // Integer Plccount = this.count;
- List<String> addresses = new ArrayList<>();
- addresses.add("DB103.25");
- addresses.add("DB100.144");
- // addresses.add("DB100.148-161");
- addresses.add("DB100.184");
- addresses.add("DB100.186");
- addresses.add("DB100.180");
- addresses.add("DB100.182");
+// List<String> addresses = new ArrayList<>();
+// addresses.add("DB103.25");
+// addresses.add("DB100.144");
+//
+// addresses.add("DB100.184");
+// addresses.add("DB100.186");
+// addresses.add("DB100.180");
+// addresses.add("DB100.182");
+//
+// List<Short> arraylist = S7control.getinstance().readWords(addresses);
+//
+//// String rangeAddress = "DB100.148-161";
+// String rangeAddress = "DB100.148";
+// int insertIndex = 2;
+// insertDataToList(arraylist, rangeAddress, insertIndex);
+//
+//
+// List<String> addresses2 = new ArrayList<>();
+// addresses2.add("DB103.26");
+// addresses2.add("DB100.188");
+// addresses2.add("DB100.190");
+// addresses2.add("DB100.146");
+//// addresses2.add("DB100.162-175");
+// List<Short> arraylist2 = S7control.getinstance().readWords(addresses2);
+//// String rangeAddress2 = "DB100.148-161";
+// String rangeAddress2 = "DB100.162";
+// int insertIndex2 = 4;
+// insertDataToList(arraylist2, rangeAddress2, insertIndex2);
+//// System.out.println(arraylist2);
+// List<String> addresses3 = new ArrayList<>();
+// addresses3.add("DB103.42");
+// List<Short> arraylist3 = S7control.getinstance().readWords(addresses3);
+//
+// List<String> addresses4 = new ArrayList<>();
+// addresses4.add("DB103.46");
+// List<Short> arraylist4 = S7control.getinstance().readWords(addresses4);
+//
+// List<Short> arraylist5 = S7control.getinstance().ReadWord("DB103.27", 2);
+// List<Short> arraylist6 = S7control.getinstance().ReadWord("DB103.29", 2);
+// List<String> addresses7 = new ArrayList<>();
+// addresses7.add("DB104.1.4");
+// addresses7.add("DB104.1.5");
+// addresses7.add("DB104.1.2");
+// addresses7.add("DB104.1.3");
+// addresses7.add("DB104.1.6");
+// addresses7.add("DB104.1.7");
+// List<Boolean> arraylist7 = S7control.getinstance().readBits(addresses7);
+//
+//
+// short[] params2 = new short[arraylist7.size()];
+// for (int i = 0; i < arraylist7.size(); i++) {
+// boolean value = arraylist7.get(i);
+// params2[i] = value ? (short) 1 : (short) 0;
+// }
+//
+// List<String> addresses8 = new ArrayList<>();
+// addresses8.add("DB101.3.7");
+// addresses8.add("DB101.4.2");
+// addresses8.add("DB101.4.5");
+// addresses8.add("DB101.4.7");
+// List<Boolean> arraylist8 = S7control.getinstance().readBits(addresses8);
+// short[] params = new short[arraylist8.size()];
+// for (int i = 0; i < arraylist8.size(); i++) {
+// boolean value = arraylist8.get(i);
+// params[i] = value ? (short) 1 : (short) 0;
+// }
- List<Short> arraylist = S7control.getinstance().readWords(addresses);
- // System.out.println(arraylist);
- List<String> addresses2 = new ArrayList<>();
- addresses2.add("DB103.26");
- addresses2.add("DB100.188");
- addresses2.add("DB100.190");
- addresses2.add("DB100.146");
- // addresses2.add("DB100.162-175");
- List<Short> arraylist2 = S7control.getinstance().readWords(addresses2);
- List<String> addresses3 = new ArrayList<>();
- addresses3.add("DB103.42");
- List<Short> arraylist3 = S7control.getinstance().readWords(addresses3);
+ Short[] values1 = { 1, 2, 3, 4, 5, 6, 7};
+ List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+ Short[] values2 = { 1, 2, 3, 4, 5};
+ List<Short> arraylist2 = new ArrayList<>(Arrays.asList(values2));
- List<String> addresses4 = new ArrayList<>();
- addresses4.add("DB103.46");
- List<Short> arraylist4 = S7control.getinstance().readWords(addresses4);
+ Short[] values3 = {1};
+ List<Short> arraylist3 = new ArrayList<>(Arrays.asList(values3));
+ Short[] values4 = {2};
+ List<Short> arraylist4 = new ArrayList<>(Arrays.asList(values4));
+ Short[] values5 = {3,3};
+ List<Short> arraylist5 = new ArrayList<>(Arrays.asList(values5));
+ Short[] values6 = { 4,4};
+ List<Short> arraylist6 = new ArrayList<>(Arrays.asList(values6));
+ Short[] values7 = { 1,1,1,1,1,1};
+ List<Short> arraylist7 = new ArrayList<>(Arrays.asList(values7));
+ Short[] values8 = { 1,1,1,1,1,1};
+ List<Short> arraylist8 = new ArrayList<>(Arrays.asList(values8));
- List<Short> arraylist5 = S7control.getinstance().ReadWord("DB103.27", 2);
- List<Short> arraylist6 = S7control.getinstance().ReadWord("DB103.29", 2);
- List<String> addresses7 = new ArrayList<>();
- addresses7.add("DB104.24");
- addresses7.add("DB104.26");
- addresses7.add("DB104.20");
- addresses7.add("DB104.22");
- addresses7.add("DB104.28");
- addresses7.add("DB104.30");
- List<Short> arraylist7 = S7control.getinstance().readWords(addresses7);
- // List<String> addresses8 = new ArrayList<>();
- // addresses8.add("DB103.26");
- // addresses8.add("DB103.26");
- // addresses8.add("DB103.26");
- // addresses8.add("DB103.26");
- // List<Short> arraylist8 = S7control.getinstance().readWords(addresses8);
- // Short[] values1 = { 1, 2, 3, 4, 5, 6, 7};
- // List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
- // Short[] values2 = { 1, 2, 3, 4, 5};
- // List<Short> arraylist2 = new ArrayList<>(Arrays.asList(values2));
-
- // Short[] values3 = {1};
- // List<Short> arraylist3 = new ArrayList<>(Arrays.asList(values3));
- // Short[] values4 = {2};
- // List<Short> arraylist4 = new ArrayList<>(Arrays.asList(values4));
- // Short[] values5 = {3,3};
- // List<Short> arraylist5 = new ArrayList<>(Arrays.asList(values5));
- // Short[] values6 = { 4,4};
- // List<Short> arraylist6 = new ArrayList<>(Arrays.asList(values6));
- // Short[] values7 = { 1,1,1,1,1,1};
- // List<Short> arraylist7 = new ArrayList<>(Arrays.asList(values7));
- // Short[] values8 = { 1,1,1,1,1,1};
- // List<Short> arraylist8 = new ArrayList<>(Arrays.asList(values8));
- // System.out.println(arraylist);
JSONObject jsonObject = new JSONObject();
jsonObject.append("zuhe1", arraylist);
@@ -141,8 +146,10 @@
jsonObject.append("zuhe4", arraylist4);
jsonObject.append("zuhe5", arraylist5);
jsonObject.append("zuhe6", arraylist6);
- jsonObject.append("guzhang", arraylist7);
- // jsonObject.append("weihuiling", arraylist8);
+// jsonObject.append("guzhang", params2);
+// jsonObject.append("weihuiling", params);
+
+
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ServoManualone");
if (sendwServer != null) {
@@ -155,7 +162,7 @@
List<String> waddresses1 = new ArrayList<>();
waddresses1.add("DB103.25");
waddresses1.add("DB100.144");
- // waddresses1.add("DB100.148-161");
+ waddresses1.add("DB100.148-161");
waddresses1.add("DB100.184");
waddresses1.add("DB100.186");
waddresses1.add("DB100.180");
@@ -166,13 +173,41 @@
waddresses2.add("DB100.188");
waddresses2.add("DB100.190");
waddresses2.add("DB100.146");
- // waddresses2.add("DB100.162-175");
+ waddresses2.add("DB100.162-175");
+
+ List<String> waddresses3 = new ArrayList<>();
+ waddresses3.add("DB101.4.0");
+ waddresses3.add("DB101.4.3");
+ waddresses3.add("DB101.3.6");
+ waddresses3.add("DB101.4.1");
+ waddresses3.add("DB101.4.4");
+ waddresses3.add("DB101.4.6");
+
+
+ List<String> waddresses4 = new ArrayList<>();
+ waddresses4.add("DB101.3.7");
+ waddresses4.add("DB101.4.2");
+ waddresses4.add("DB101.4.5");
+ waddresses4.add("DB101.4.7");
+
+
+
+
+
+
+
+
+
+
if (!messages.isEmpty()) {
// 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
String lastMessage = messages.get(messages.size() - 1);
- // System.out.println("lastMessage锛�" + lastMessage);
+// System.out.println("lastMessage锛�" + lastMessage);
JSONArray messageArray = new JSONArray(lastMessage);
+
+
+
// 鍐欏叆绗竴涓湴鍧�
if (messageArray.getJSONArray(0).size() > 0) {
@@ -193,16 +228,16 @@
}
}
if (!sValue.isEmpty()) {
- S7control.getinstance().WriteWord(waddresses1, sValue);
+ S7control.getinstance().WriteWord(waddresses1, sValue);
System.out.println("Values " + sValue + " written to PLC at address " + waddresses1);
}
}
if (messageArray.getJSONArray(1).size() > 0) {
- JSONArray jsonArray = messageArray.getJSONArray(1);
+ JSONArray jsonArray2 = messageArray.getJSONArray(1);
List<Short> sValue2 = new ArrayList<>();
- for (int i = 0; i < jsonArray.size(); i++) {
- Object value = jsonArray.get(i);
+ for (int i = 0; i < jsonArray2.size(); i++) {
+ Object value = jsonArray2.get(i);
if (value != null && !value.toString().equals("null")) {
try {
String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
@@ -216,11 +251,60 @@
}
}
if (!sValue2.isEmpty()) {
- S7control.getinstance().WriteWord(waddresses2, sValue2);
+ S7control.getinstance().WriteWord(waddresses2, sValue2);
System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses2);
}
}
+
+
+ if (messageArray.getJSONArray(2).size() > 0) {
+ JSONArray jsonArray3 = messageArray.getJSONArray(2);
+ List<Boolean> sValue3 = new ArrayList<>();
+ for (int i = 0; i < jsonArray3.size(); i++) {
+ Object value = jsonArray3.get(i);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ boolean val = "1".equals(cleanedValue.trim());
+ sValue3.add(val);
+ System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ if (!sValue3.isEmpty()) {
+ S7control.getinstance().WriteBit(waddresses3, sValue3);
+ System.out.println("Values " + sValue3 + " written to PLC at address " + waddresses3);
+ }
+ }
+
+
+ if (messageArray.getJSONArray(3).size() > 0) {
+ JSONArray jsonArray4 = messageArray.getJSONArray(3);
+ List<Boolean> sValue4 = new ArrayList<>();
+ for (int i = 0; i < jsonArray4.size(); i++) {
+ Object value = jsonArray4.get(i);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ boolean val = "1".equals(cleanedValue.trim());
+ sValue4.add(val);
+ System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
+ }
+ if (!sValue4.isEmpty()) {
+ S7control.getinstance().WriteBit(waddresses4, sValue4);
+ System.out.println("Values " + sValue4 + " written to PLC at address " + waddresses4);
+ }
+ }
+
// 娓呯┖娑堟伅鍒楄〃
webSocketServer.clearMessages();
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
index f601cbb..400aefe 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java
@@ -66,16 +66,16 @@
}
// 璋冪敤鏂规硶锛岃繘琛岃祴鍊�
- this.readValue();
- String PlcAddress = this.name;
- Integer Plccount = this.count;
+// this.readValue();
+// String PlcAddress = this.name;
+// Integer Plccount = this.count;
// System.out.println(PlcAddress);
- // List<Boolean> paramlist = S7control.getinstance().ReadBits("DB2.0.0", 26);
- Boolean[] values = { false, true, true, true, true, true, true, true, true,
- true, true, true, true, true, true, true, true, true, true, true, true, true, true,
- true, false, true };
- List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
+ List<Boolean> paramlist = S7control.getinstance().ReadBits("DB2.0.0", 26);
+// Boolean[] values = { false, true, true, true, true, true, true, true, true,
+// true, true, true, true, true, true, true, true, true, true, true, true, true, true,
+// true, false, true };
+// List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
if (paramlist != null) {
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
index 22a103a..54d6a6d 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
@@ -82,13 +82,13 @@
e.printStackTrace();
}
- this.readValue();
- String PlcAddress = this.name;
- Integer Plccount = this.count;
+// this.readValue();
+// String PlcAddress = this.name;
+// Integer Plccount = this.count;
// 鏍规嵁鍦板潃璇诲彇PCL鏁版嵁
- // List<Boolean> plclist = S7control.getinstance().ReadBits("DB104.0.0", 71);
- List<Boolean> plclist = S7control.getinstance().ReadBits(PlcAddress, Plccount);
+ List<Boolean> plclist = S7control.getinstance().ReadBits("DB104.0.0", 71);
+// List<Boolean> plclist = S7control.getinstance().ReadBits(PlcAddress, Plccount);
// System.out.println(plclist);
// Boolean[] values = { false, false, true, false, true, false, true, false,
// true, false, true, false, true, false,
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
index ee52f66..89881b8 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java
@@ -65,24 +65,24 @@
e.printStackTrace();
}
- this.readValue();
- String PlcAddress = this.name;
- Integer Plccount = this.count;
+// this.readValue();
+// String PlcAddress = this.name;
+// Integer Plccount = this.count;
// System.out.println(PlcAddress);
- List<Boolean> plclist = S7control.getinstance().ReadBits(PlcAddress, Plccount);
- // List<Boolean> plclist2 = S7control.getinstance().ReadBits("DB102.5.5", 13);
+// List<Boolean> plclist = S7control.getinstance().ReadBits(PlcAddress, Plccount);
+ List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 64);
- // Boolean[] values = { true, true, true, true, true, false, true, false,
- // true, false, true, false, true, false,
- // true, false, true, false, true, false, true, false, true, false, true, false,
- // true, false, true, false, true,
- // false, true, false, true, false,
- // true, false, true, false, true, false, true, false, null,
- // true, false,
- // true, false, true, false, true, false,
- // true, false, true, false, true, };
- // List<Boolean> plclist = new ArrayList<>(Arrays.asList(values));
+// Boolean[] values = { true, true, true, true, true, false, true, false,
+// true, false, true, false, true, false,
+// true, false, true, false, true, false, true, false, true, false, true, false,
+// true, false, true, false, true,
+// false, true, false, true, false,
+// true, false, true, false, true, false, true, false, null,
+// true, false,
+// true, false, true, false, true, false,
+// true, false, true, false, true, };
+// List<Boolean> plclist = new ArrayList<>(Arrays.asList(values));
if (plclist != null) {
// 灏嗚幏鍙栫殑甯冨皵绫诲瀷杞崲涓烘暣鏁扮被鍨�
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
index 61c28f0..f644903 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
@@ -65,15 +65,15 @@
e.printStackTrace();
}
- this.readValue();
- String PlcAddress = this.name;
- Integer Plccount = this.count;
+// this.readValue();
+// String PlcAddress = this.name;
+// Integer Plccount = this.count;
// System.out.println(PlcAddress);
- // List<Short> plclist = S7control.getinstance().ReadWord("DB103.0", 10);
- Short[] values = { 0, 1, 1, 0, 1, 0, 1, 0,
- 1, 0, };
- List<Short> plclist = new ArrayList<>(Arrays.asList(values));
+List<Short> plclist = S7control.getinstance().ReadWord("DB103.0", 44);
+// Short[] values = { 0, 1, 1, 0, 1, 0, 1, 0,
+// 1, 0, };
+// List<Short> plclist = new ArrayList<>(Arrays.asList(values));
if (plclist != null) {
List<String> Intlist = new ArrayList<>();
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java b/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
index e207db3..b6afa91 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
@@ -1,11 +1,15 @@
package com.example.springboot.component;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
import com.github.xingshuangs.iot.protocol.s7.service.MultiAddressWrite;
import com.github.xingshuangs.iot.protocol.s7.service.S7PLC;
+import com.google.common.primitives.Bytes;
public class S7control {
@@ -78,35 +82,7 @@
* @param address 鍦板潃
* @param datas word鐨勫��
*/
- public void WriteWord(List<String> address, List<Short> datas) {
- if (s7PLC == null)
- return;
- for (int i = 0; i < address.size(); i++) {
- String addr = address.get(i);
- short data = datas.get(i);
-
- if (addr.contains("-")) {
- // 澶勭悊鑼冨洿鍦板潃
- String[] range = addr.split("-");
- if (range.length == 2) {
- String startAddr = range[0].trim();
- String endAddr = range[1].trim();
-
- int startIndex = Integer.parseInt(startAddr.substring(startAddr.indexOf('.') + 1));
- int endIndex = Integer.parseInt(endAddr.substring(endAddr.indexOf('.') + 1));
-
- for (int j = startIndex; j <= endIndex; j++) {
- String currentAddress = startAddr.substring(0, startAddr.indexOf('.') + 1) + j;
- s7PLC.writeInt16(currentAddress, data); // 灏嗘暟鎹啓鍏ュ綋鍓嶅湴鍧�
- }
- }
- } else {
- // 澶勭悊鍗曚釜鍦板潃
- s7PLC.writeInt16(addr, data); // 灏嗘暟鎹啓鍏ュ崟涓湴鍧�
- }
- }
- }
@@ -184,43 +160,7 @@
return s7PLC.readInt16(address);
}
- public List<Short> readWords(List<String> addresses) {
- if (s7PLC == null) {
- return null;
- }
- List<Short> data = new ArrayList<>();
-
- for (String address : addresses) {
- if (address.contains("-")) {
- String[] range = address.split("-");
- String startAddress = range[0];
- String endAddress = range[1];
-
- if (startAddress.equals(endAddress)) {
- // 鍗曚釜鍦板潃
- Short value = s7PLC.readInt16(startAddress);
- data.add(value);
- } else {
- // 鑼冨洿鍦板潃
- int startIndex = getIndexFromAddress(startAddress);
- int endIndex = getIndexFromAddress(endAddress);
-
- for (int i = startIndex; i <= endIndex; i++) {
- String currentAddress = getAddressFromIndex(i);
- Short value = s7PLC.readInt16(currentAddress);
- data.add(value);
- }
- }
- } else {
- // 鍗曚釜鍦板潃
- Short value = s7PLC.readInt16(address);
- data.add(value);
- }
- }
-
- return data;
- }
private int getIndexFromAddress(String address) {
@@ -258,7 +198,6 @@
public byte[] ReadByte(String address, int count) {
if (s7PLC==null)
return null;
-
// List<String> addresslist = GetAddressList(address, count, 16);
return s7PLC.readByte(address,count);
}
@@ -276,28 +215,33 @@
}
public List<Boolean> readBits(List<String> addressList) {
- if (s7PLC == null)
+ if (s7PLC == null || addressList.isEmpty()) {
return null;
+ }
- List<Boolean> result = new ArrayList<>();
+ List<Boolean> values = new ArrayList<>();
+ for (String address : addressList) {
+ boolean value = s7PLC.readBoolean(address);
+ values.add(value);
+ }
+
+ return values;
+ }
+
+
+ public List<String> readStrings(List<String> addressList) {
+ if (s7PLC == null) {
+ return null;
+ }
+
+ List<String> result = new ArrayList<>();
for (String address : addressList) {
- if (address.contains("~")) {
- String[] range = address.split("~");
- String startAddress = range[0];
- String endAddress = range[1];
+ byte[] bytes = s7PLC.readByte(address, 14);
- int startIndex = extractAddressNumber(startAddress);
- int endIndex = extractAddressNumber(endAddress);
-
- String prefix = startAddress.substring(0, startAddress.indexOf(".") + 1);
-
- for (int i = startIndex; i <= endIndex; i++) {
- String newAddress = prefix + i;
- result.add(s7PLC.readBoolean(newAddress));
- }
- } else {
- result.add(s7PLC.readBoolean(address));
+ if (bytes != null) {
+ String str = new String(bytes, StandardCharsets.US_ASCII);
+ result.add(str);
}
}
@@ -305,6 +249,55 @@
}
+ public void WriteWord(List<String> address, List<Short> datas) {
+ if (s7PLC == null)
+ return;
+
+ for (int i = 0; i < address.size(); i++) {
+ String addr = address.get(i);
+ short data = datas.get(i);
+
+ if (addr.contains("-")) {
+ outmesid(String.valueOf(data),addr); // 鍗曠嫭澶勭悊甯︾牬鎶樺彿鐨勫湴鍧�
+ } else {
+ s7PLC.writeInt16(addr, data); // 灏嗘暟鎹啓鍏ュ崟涓湴鍧�
+ }
+ }
+ }
+
+ public void outmesid(String data, String addr) {
+ System.out.println("outmesid: " + data);
+ List<Byte> glassidlist = new ArrayList<>();
+ String[] parts = addr.split("-");
+ if (parts.length == 2) {
+ addr = parts[0]; // 鍙繚鐣� "-" 鍓嶉潰鐨勯儴鍒�
+ }
+ for (char iditem : data.toCharArray()) {
+ glassidlist.add(Byte.valueOf(String.valueOf(iditem)));
+ }
+ byte[] bytes = Bytes.toArray(glassidlist);
+ S7control.getinstance().WriteByte(addr, bytes);
+ }
+
+
+ public List<Short> readWords(List<String> addresses) {
+ if (s7PLC == null) {
+ return null;
+ }
+
+ List<Short> data = new ArrayList<>();
+
+ for (String address : addresses) {
+
+ // 鍗曚釜鍦板潃
+ Short value = s7PLC.readInt16(address);
+ data.add(value);
+
+ }
+
+ return data;
+ }
+
private int extractAddressNumber(String address) {
String numberStr = address.replaceAll("\\D+", ""); // 浣跨敤姝ｅ垯琛ㄨ揪寮忔彁鍙栨暟瀛楅儴鍒�
return Integer.parseInt(numberStr);
diff --git a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
index 2d92702..4661acd 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -7,10 +7,7 @@
import org.springframework.stereotype.Component;
import com.example.springboot.component.PLCAutomaticParameterSetting;
-import com.example.springboot.component.PLCManualJog;
import com.example.springboot.component.PlcHold;
-import com.example.springboot.component.PlcManualonePosition;
-import com.example.springboot.component.PlcManualonePosition2;
import com.example.springboot.component.PlcParameter;
import com.example.springboot.component.Plcaction;
import com.example.springboot.component.Plchome;
@@ -22,6 +19,10 @@
import com.example.springboot.component.PlcParameter2;
import com.example.springboot.component.PlcParameter1;
import com.example.springboot.component.PlcServoManualone;
+import com.example.springboot.component.PLCAutomaticParameterSetting;
+import com.example.springboot.component.PlcManualonePosition;
+import com.example.springboot.component.PlcManualonePosition2;
+import com.example.springboot.component.PLCManualJog;
@Component
@Order(1)
@@ -34,27 +35,28 @@
//
System.out.println("鍚姩瀹屾垚");
- // new PlcHold().start();
+ new PlcHold().start();
- // new Plcaction().start();
+ new Plcaction().start();
//
new Plchome().start();
- // //
- // new PlcParameter().start();
//
- // new Plcalarm().start();
+ new PlcParameter().start();
//
- // new Plcsign().start();
+ //new Plcalarm().start();
//
- // new Plcstate().start();
- // new PlcPositioning1().start();
- // new PlcPositioning2().start();
- // new PlcParameter2().start();
- // new PlcParameter1().start();
- // new PLCAutomaticParameterSetting().start();
- // new PlcServoManualone().start();
- // new PLCManualJog().start();
- // new PlcManualonePosition().start();
- // new PlcManualonePosition2().start();
+ new Plcsign().start();
+ //
+ new Plcstate().start();
+ new PlcPositioning1().start();
+ new PlcPositioning2().start();
+ new PlcParameter2().start();
+ new PlcParameter1().start();
+ new PLCAutomaticParameterSetting().start();
+
+ new PlcManualonePosition().start();
+ new PlcManualonePosition2().start();
+ new PlcServoManualone().start();
+ new PLCManualJog().start();
}
}
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/out_slice.java b/springboot-vue3/src/main/java/com/example/springboot/entity/out_slice.java
deleted file mode 100644
index 6b13c63..0000000
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/out_slice.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.example.springboot.entity;
-
-public class Out_slice {
- private int id;
- private String glassId;
- private String barcode;
- private double glasswidth;
- private double glassheight;
- private int state;
- private String time;
-
- private north_glass_buffer1 north_glass_buffer1s;
-
- public void setnorth_glass_buffer1s(north_glass_buffer1 north_glass_buffer1s) {
- this.north_glass_buffer1s = north_glass_buffer1s;
- }
-
- public north_glass_buffer1 getnorth_glass_buffer1s() {
- return north_glass_buffer1s;
- }
-
- private StorageCage storageCage;
-
- public void setstorageCage(StorageCage storageCage) {
- this.storageCage = storageCage;
- }
-
- public StorageCage getstorageCage() {
- return storageCage;
- }
-
- public Out_slice() {
- }
-
- public Out_slice(int ID, String glassId, String barCode, double glasswidth, double glassheight, int state, String time) {
- this.id = ID;
- this.glassId = glassId;
- this.barcode = barCode;
- this.glasswidth = glasswidth;
- this.glassheight = glassheight;
- this.state = state;
- this.time = time;
- }
-
- public int getID() {
- return id;
- }
-
- public String getGlassId() {
- return glassId;
- }
-
- public String getBarCode() {
- return barcode;
- }
-
- public double getGlasswidth() {
- return glasswidth;
- }
-
- public double getGlassheight() {
- return glassheight;
- }
-
- public int getState() {
- return state;
- }
-
- public String getTime() {
- return time;
- }
-
- public void setID(int ID) {
- this.id = ID;
- }
-
- public void setGlassId(String glassId) {
- this.glassId = glassId;
- }
-
- public void setBarCode(String barCode) {
- barcode = barCode;
- }
-
- public void setGlasswidth(double glasswidth) {
- this.glasswidth = glasswidth;
- }
-
- public void setGlassheight(double glassheight) {
- this.glassheight = glassheight;
- }
-
- public void setState(int state) {
- this.state = state;
- }
-
- public void setTime(String time) {
- this.time = time;
- }
-
-}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
index 61ff339..dd13816 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
@@ -37,7 +37,7 @@
//鑾峰彇鐜荤拑淇℃伅
- @Select("select ordernumber as ordernumber,glasslength_mm as glasslengthmm,barcode from north_glass_buffer1 where barcode=#{glassid}")
+ @Select("select ordernumber ,glasslength_mm as glasslengthmm,glassheight_mm as glassheightmm,barcode,listnumber,boxnumber,glasslength,glassheight from north_glass_buffer1 where barcode=#{glassid}")
north_glass_buffer1 selectGlass(String glassid);
//鍑虹墖浠诲姟鏌ヨ
@@ -109,9 +109,12 @@
//鍒ゆ柇鏈夊嚑鍧楃幓鐠冭繕鍦ㄥ嚭鐗囦腑
@Select("SELECT COUNT(*) FROM `storage_cage` where state=3;")
Integer Selectoutstate();
- //鑾峰彇杩涚墖闃熷垪id
- @Insert("update queue set glassid=#{glassid},width=#{width} where type=#{type};")
- void insertqueue(String glassid,int type,double width);
+ //鍒ゆ柇闃熷垪琛ㄦ槸鍚︽湁璇ョ幓鐠�
+ @Select("select COUNT(*) from queue where glassid=#{glassid};")
+ int Selectquecount(String glassid);
+ //鏇存柊杩涚墖闃熷垪
+ @Update("update queue set glassid=#{glassid},orderid=#{orderid},listid=#{listid},boxid=#{boxid},state=#{state},glasswidthmm=#{glasswidthmm},glassheightmm=#{glassheightmm},glasswidth=#{glasswidth},glassheight=#{glassheight} where type=#{type};")
+ void Updatequeue(String glassid,String orderid,String listid,String boxid,int state,String glasswidth,String glassheight,String glasswidthmm,String glassheightmm,int type);
//瀹屾垚杩涚墖闃熷垪浠诲姟
@Update("update queue set state=#{state} where glassid=#{glassid};")
void overqueue(String glassid,int state);
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/OutSlice.java b/springboot-vue3/src/main/java/com/example/springboot/service/OutSlice.java
index 13764dd..27e72af 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/OutSlice.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/OutSlice.java
@@ -13,15 +13,15 @@
// List<Out_slice> resultlist = new ArrayList<Out_slice>();
// HashMap map = new HashMap<>();
// // HashMap<String,List<Out_slice>> map=new HashMap<String,List<Out_slice>>();
- // for (Out_slice out_slice : out_slices) {
- // String key_ = out_slice.getState() + "-";
+ // for (Out_slice Out_slice.java : out_slices) {
+ // String key_ = Out_slice.java.getState() + "-";
// if (map.get(key_) == null) {
// List<Out_slice> lists = new ArrayList<Out_slice>();
- // lists.add(out_slice);
+ // lists.add(Out_slice.java);
// map.put(key_, lists);
// } else {
// List<Out_slice> lists = (List<Out_slice>) map.get(key_);
- // lists.add(out_slice);
+ // lists.add(Out_slice.java);
// map.put(key_, lists);
// }
// }
@@ -31,13 +31,13 @@
// public static List<Out_slice> Orderbyresult(List<Out_slice> out_slices, int orders) {
// // orders 鎺掑簭妯″紡
// List<Out_slice> list = new ArrayList<Out_slice>();
- // for (Out_slice out_slice : out_slices) {
+ // for (Out_slice Out_slice.java : out_slices) {
// if (list.isEmpty()) {
- // list.add(out_slice);
+ // list.add(Out_slice.java);
// } else {
// for (int i = 0; i < list.size(); i++) {
// Out_slice out_slice2 = list.get(i);
- // if (out_slice.getID() > out_slice2.getID()) {
+ // if (Out_slice.java.getID() > out_slice2.getID()) {
// continue;
// } else {
// list.add(i, out_slice2);
@@ -49,15 +49,15 @@
// public static void f() {
// HashMap map = new HashMap<>();
- // for (Out_slice out_slice : listoutslice) {
- // String key_ = out_slice.getState() + "-";
+ // for (Out_slice Out_slice.java : listoutslice) {
+ // String key_ = Out_slice.java.getState() + "-";
// if (map.get(key_) == null) {
// List<Out_slice> lists = new ArrayList<Out_slice>();
- // lists.add(out_slice);
+ // lists.add(Out_slice.java);
// map.put(key_, lists);
// } else {
// List<Out_slice> lists = (List<Out_slice>) map.get(key_);
- // lists.add(out_slice);
+ // lists.add(Out_slice.java);
// map.put(key_, lists);
// }
// }
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
index 797c9ff..0db49f2 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
@@ -536,9 +536,9 @@
S7control.getinstance().WriteByte(address, bytes);// 娲惧彂鍑虹墖id
}
//鑾峰彇鍦板潃鍐呯殑鐜荤拑id杞瓧绗︿覆
- public StringBuilder queGlassid(String address) {
+ public StringBuilder queGlassid(String address,int count) {
StringBuilder writedstrIdOut = new StringBuilder();
- byte[] writedglassidbytesOut = S7control.getinstance().ReadByte(address, 14);
+ byte[] writedglassidbytesOut = S7control.getinstance().ReadByte(address, count);
if (writedglassidbytesOut != null) {
// 鑾峰彇鐜荤拑id
for (byte iditem : writedglassidbytesOut) {
diff --git a/springboot-vue3/src/main/resources/sql/canadames.sql b/springboot-vue3/src/main/resources/sql/canadames.sql
index dadc176..d6d01c8 100644
--- a/springboot-vue3/src/main/resources/sql/canadames.sql
+++ b/springboot-vue3/src/main/resources/sql/canadames.sql
@@ -1,1354 +1,1354 @@
-/*
- Navicat MySQL Data Transfer
-
- Source Server : 鏈湴
- Source Server Type : MySQL
- Source Server Version : 80022
- Source Host : localhost:3306
- Source Schema : canadames
-
- Target Server Type : MySQL
- Target Server Version : 80022
- File Encoding : 65001
-
- Date: 14/09/2023 09:47:12
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for alarmmg
--- ----------------------------
-DROP TABLE IF EXISTS `alarmmg`;
-CREATE TABLE `alarmmg` (
- `id` int NOT NULL AUTO_INCREMENT COMMENT '涓婚敭',
- `content` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鎶ヨ淇℃伅',
- `timeon` datetime(0) NULL DEFAULT NULL COMMENT '寮�濮嬫椂闂�',
- `endTime` datetime(0) NULL DEFAULT NULL COMMENT '缁撴潫鏃堕棿',
- PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1378 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of alarmmg
--- ----------------------------
-INSERT INTO `alarmmg` VALUES (1, 'D01 VFD error', '2023-09-11 10:07:17', '2023-09-11 10:07:51');
-INSERT INTO `alarmmg` VALUES (2, 'D02 VFD error', '2023-09-07 10:07:17', '2023-09-07 10:07:51');
-INSERT INTO `alarmmg` VALUES (1338, 'D02 VFD error', '2023-09-12 16:10:32', '2023-09-12 16:22:36');
-INSERT INTO `alarmmg` VALUES (1339, 'D04 VFD error', '2023-09-12 16:10:32', '2023-09-12 16:22:36');
-INSERT INTO `alarmmg` VALUES (1340, 'D06 VFD error', '2023-09-12 16:10:32', '2023-09-12 16:22:36');
-INSERT INTO `alarmmg` VALUES (1341, 'B02 VFD error', '2023-09-12 16:10:32', '2023-09-12 16:22:36');
-INSERT INTO `alarmmg` VALUES (1342, 'A02 VFD error', '2023-09-12 16:10:32', '2023-09-12 16:22:36');
-INSERT INTO `alarmmg` VALUES (1343, 'A02 servo turn error', '2023-09-12 16:10:32', '2023-09-12 16:22:36');
-INSERT INTO `alarmmg` VALUES (1344, 'A02 servo travel error', '2023-09-12 16:10:32', '2023-09-12 16:22:36');
-INSERT INTO `alarmmg` VALUES (1345, 'B02 servo travel error', '2023-09-12 16:10:32', '2023-09-12 16:22:36');
-INSERT INTO `alarmmg` VALUES (1346, 'D01 pos error', '2023-09-12 16:10:32', '2023-09-12 16:22:36');
-INSERT INTO `alarmmg` VALUES (1347, 'D02 pos error', '2023-09-12 16:10:32', '2023-09-12 16:22:36');
-INSERT INTO `alarmmg` VALUES (1348, 'D03 pos error', '2023-09-12 16:10:32', '2023-09-12 16:22:36');
-INSERT INTO `alarmmg` VALUES (1349, 'D04 pos error', '2023-09-12 16:16:48', '2023-09-12 16:22:36');
-INSERT INTO `alarmmg` VALUES (1350, 'D05 pos error', '2023-09-12 16:16:48', '2023-09-12 16:22:36');
-INSERT INTO `alarmmg` VALUES (1351, 'D06 pos error', '2023-09-12 16:16:48', '2023-09-12 16:22:36');
-INSERT INTO `alarmmg` VALUES (1352, 'A01 pos error', '2023-09-12 16:16:48', '2023-09-12 16:22:36');
-INSERT INTO `alarmmg` VALUES (1353, 'A02 pos error', '2023-09-12 16:16:48', '2023-09-12 16:22:36');
-INSERT INTO `alarmmg` VALUES (1354, 'B01 IN pos error', '2023-09-12 16:16:48', '2023-09-12 16:22:36');
-INSERT INTO `alarmmg` VALUES (1355, 'B01 OUT pos error', '2023-09-12 16:16:48', '2023-09-12 16:22:36');
-INSERT INTO `alarmmg` VALUES (1356, 'B02 IN pos error', '2023-09-12 16:16:48', '2023-09-12 16:22:36');
-INSERT INTO `alarmmg` VALUES (1357, 'B02 OUT pos error', '2023-09-12 16:16:48', '2023-09-12 16:22:36');
-INSERT INTO `alarmmg` VALUES (1358, 'D01 VFD error', '2023-09-12 16:22:36', NULL);
-INSERT INTO `alarmmg` VALUES (1359, 'D03 VFD error', '2023-09-12 16:22:36', NULL);
-INSERT INTO `alarmmg` VALUES (1360, 'D05 VFD error', '2023-09-12 16:22:36', NULL);
-INSERT INTO `alarmmg` VALUES (1361, 'B01 VFD error', '2023-09-12 16:22:36', NULL);
-INSERT INTO `alarmmg` VALUES (1362, 'A01 VFD error', '2023-09-12 16:22:36', NULL);
-INSERT INTO `alarmmg` VALUES (1363, 'A01 servo turn error', '2023-09-12 16:22:36', NULL);
-INSERT INTO `alarmmg` VALUES (1364, 'A01 servo travel error', '2023-09-12 16:22:36', NULL);
-INSERT INTO `alarmmg` VALUES (1365, 'B01 servo travel error', '2023-09-12 16:22:36', NULL);
-INSERT INTO `alarmmg` VALUES (1366, 'D01 DEC error', '2023-09-12 16:22:36', NULL);
-INSERT INTO `alarmmg` VALUES (1367, 'D02 DEC error', '2023-09-12 16:22:36', NULL);
-INSERT INTO `alarmmg` VALUES (1368, 'D03 DEC error', '2023-09-12 16:22:36', NULL);
-INSERT INTO `alarmmg` VALUES (1369, 'D04 DEC error', '2023-09-12 16:22:36', NULL);
-INSERT INTO `alarmmg` VALUES (1370, 'D05 DEC error', '2023-09-12 16:22:36', NULL);
-INSERT INTO `alarmmg` VALUES (1371, 'D06 DEC error', '2023-09-12 16:22:36', NULL);
-INSERT INTO `alarmmg` VALUES (1372, 'A01 DEC error', '2023-09-12 16:22:36', NULL);
-INSERT INTO `alarmmg` VALUES (1373, 'A02 DEC error', '2023-09-12 16:22:36', NULL);
-INSERT INTO `alarmmg` VALUES (1374, 'B01 IN DEC error', '2023-09-12 16:22:36', NULL);
-INSERT INTO `alarmmg` VALUES (1375, 'B01 OUT DEC error', '2023-09-12 16:22:36', NULL);
-INSERT INTO `alarmmg` VALUES (1376, 'B02 IN DEC error', '2023-09-12 16:22:36', NULL);
-INSERT INTO `alarmmg` VALUES (1377, 'B02 OUT DEC error', '2023-09-12 16:22:36', NULL);
-
--- ----------------------------
--- Table structure for category
--- ----------------------------
-DROP TABLE IF EXISTS `category`;
-CREATE TABLE `category` (
- `id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭',
- `parent_id` bigint NULL DEFAULT NULL COMMENT '鐖剁骇id',
- `path` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '璺緞',
- `level` int NULL DEFAULT NULL COMMENT '绛夌骇',
- `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍚嶇О',
- `creator` bigint NULL DEFAULT NULL COMMENT '鍒涘缓浜�',
- `state` tinyint NOT NULL DEFAULT 1 COMMENT '鐘舵�侊細0/涓嬫灦 1/涓婃灦',
- `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '鍒涘缓鏃堕棿',
- `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '鏇存柊鏃堕棿',
- PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '鍟嗗搧鍒嗙被' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of category
--- ----------------------------
-INSERT INTO `category` VALUES (1, NULL, NULL, NULL, '娴嬭瘯鍒嗙被', 1, 1, '2021-11-28 15:08:32', '2021-11-28 15:08:32');
-
--- ----------------------------
--- Table structure for device
--- ----------------------------
-DROP TABLE IF EXISTS `device`;
-CREATE TABLE `device` (
- `id` bigint NOT NULL AUTO_INCREMENT,
- `device_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
- `create_user` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
- `create_time` datetime(0) NOT NULL,
- `device_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
- `status` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
- `info` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL,
- `model` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL,
- `count_time_flag` datetime(0) NULL DEFAULT NULL,
- `address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
- `gps` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
- `debug_time` date NULL DEFAULT NULL,
- `end_time` date NULL DEFAULT NULL,
- `customer_name` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
- `customer_device_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
- `last_product_count_date` date NULL DEFAULT NULL,
- PRIMARY KEY (`id`) USING BTREE,
- UNIQUE INDEX `device_id_idx`(`device_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 47 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of device
--- ----------------------------
-INSERT INTO `device` VALUES (31, 'LY140510-AG15B65R', 'admin', '2022-05-07 13:34:46', 'chen65璁惧', '鏈惎鐢�', '{\"Ver\":\"1.0\",\"iTopDos\":[160],\"iTopRightMerge\":[0],\"iBtmEnd\":[],\"iTopFront\":[],\"iBtmRow\":[10],\"iBtmLeftMerge\":[0],\"iTopLeftMerge\":[0],\"iTopColumn\":[8],\"iBtmDos\":[80],\"iBtmSingline\":[1],\"iBtmFront\":[],\"iBtmRightMerge\":[0],\"InterfaceName\":\"IDeviceInfor\",\"iTopEnd\":[],\"iTopRow\":[20],\"iTopSingline\":[1],\"DeviceName\":\"LY140510-AG15B65R\",\"iBtmColumn\":[8]}', '{\"Ver\":\"1.0\",\"Datas\":[{\"Binding\":\"Datas[0]\",\"Unit\":\"\",\"Name\":\"CurrentStatus\"},{\"Binding\":\"Datas[1]\",\"Unit\":\"鈩僜",\"Name\":\"RtTemperature\"},{\"Binding\":\"Datas[2]\",\"Unit\":\"%\",\"Name\":\"PvPower\"},{\"Binding\":\"Datas[3]\",\"Unit\":\"kw\",\"Name\":\"CurveTotalPower\"}],\"Segments\":[{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.2,\"Name\":\"Load\"},{\"Type\":\"Q\",\"Controls\":[{\"Binding\":\"GlassLength[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.2,\"Name\":\"5鍨嬮鏍呮\"},{\"Type\":\"F\",\"Controls\":[{\"Binding\":\"GlassLength[2]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.2,\"Name\":\"鐐変綋娈礬"},{\"Type\":\"Q\",\"Controls\":[{\"Binding\":\"GlassLength[3]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.2,\"Name\":\"椋庢爡娈礬"},{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[4]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.2,\"Name\":\"涓嬬墖娈礬"}],\"InterfaceName\":\"IDeviceMapInfor\",\"DeviceName\":\"LY140510-AG15B65R\"}', '2022-12-31 00:00:00', '娌冲崡鐪�/娲涢槼甯�/娑цタ鍖�/娲涢槼鍖楃幓涓夊厓娴侀鏈烘妧鏈湁闄愬叕鍙�', '112.36358,34.594068', '2022-05-07', '2022-05-07', '娲涢槼鍖楃幓', NULL, '2023-08-28');
-INSERT INTO `device` VALUES (32, 'NG10000', 'admin', '2022-05-13 08:53:52', 'Device 1', '鏈惎鐢�', '{\"Ver\":\"1.0\",\"iTopDos\":[108],\"iTopRightMerge\":[1],\"iBtmEnd\":[],\"iTopFront\":[],\"iBtmRow\":[12],\"iBtmLeftMerge\":[1],\"iTopLeftMerge\":[1],\"iTopColumn\":[10],\"iBtmDos\":[108],\"iBtmSingline\":[],\"iBtmFront\":[],\"iBtmRightMerge\":[1],\"InterfaceName\":\"IDeviceInfor\",\"iTopEnd\":[],\"iTopRow\":[12],\"iTopSingline\":[],\"DeviceName\":\"NG10000\",\"iBtmColumn\":[10]}', '{\"Ver\":\"1.0\",\"Datas\":[{\"Binding\":\"Datas[0]\",\"Unit\":\"\",\"Name\":\"CurrentStatus\"},{\"Binding\":\"Datas[1]\",\"Unit\":\"鈩僜",\"Name\":\"RtTemperature\"},{\"Binding\":\"Datas[2]\",\"Unit\":\"%\",\"Name\":\"PvPower\"},{\"Binding\":\"Datas[3]\",\"Unit\":\"kw\",\"Name\":\"CurveTotalPower\"}],\"Segments\":[{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"Load\"},{\"Type\":\"F\",\"Controls\":[{\"Binding\":\"GlassLength[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"鐐変綋娈礬"},{\"Type\":\"Q\",\"Controls\":[{\"Binding\":\"GlassLength[2]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"椋庢爡娈礬"},{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[3]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"涓嬬墖娈礬"}],\"InterfaceName\":\"IDeviceMapInfor\",\"DeviceName\":\"NG10000\"}', '2023-02-21 00:00:00', 'Address 1', '112.39741,34.61541', '2022-05-13', '2022-05-13', 'fsdfsdfs', NULL, '2022-10-28');
-INSERT INTO `device` VALUES (33, 'NGtest150130', 'admin', '2022-08-09 09:18:14', 'Device 2', '鏈惎鐢�', NULL, '{\"Ver\":\"1.1\",\"Datas\":[{\"Binding\":\"Datas[0]\",\"Unit\":\"\",\"Name\":\"CurrentStatus\"},{\"Binding\":\"Datas[1]\",\"Unit\":\"鈩僜",\"Name\":\"RtTemperature\"},{\"Binding\":\"Datas[2]\",\"Unit\":\"%\",\"Name\":\"PvPower\"},{\"Binding\":\"Datas[3]\",\"Unit\":\"kw\",\"Name\":\"CurveTotalPower\"}],\"Segments\":[{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"Load\"},{\"Type\":\"F\",\"Controls\":[{\"Binding\":\"GlassLength[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"鐐変綋娈礬"},{\"Type\":\"Q\",\"Controls\":[{\"Binding\":\"GlassLength[2]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"椋庢爡娈礬"},{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[3]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"涓嬬墖娈礬"}],\"InterfaceName\":\"IDeviceMapInfor\",\"DeviceName\":\"NGtest150130\"}', '2022-08-10 00:00:00', 'Address 2', '', '2022-08-09', '2022-08-09', '娲涢槼鐜荤拑鍏徃', NULL, NULL);
-INSERT INTO `device` VALUES (34, 'NG150130', 'admin', '2022-08-10 11:34:10', '榛戦噾鍒�', '鏈惎鐢�', NULL, '{\"Ver\":\"1.0\",\"Datas\":[{\"Binding\":\"Datas[0]\",\"Unit\":\"\",\"Name\":\"CurrentStatus\"},{\"Binding\":\"Datas[1]\",\"Unit\":\"鈩僜",\"Name\":\"RtTemperature\"},{\"Binding\":\"Datas[2]\",\"Unit\":\"%\",\"Name\":\"PvPower\"},{\"Binding\":\"Datas[3]\",\"Unit\":\"kw\",\"Name\":\"CurveTotalPower\"}],\"Segments\":[{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"Load\"},{\"Type\":\"F\",\"Controls\":[{\"Binding\":\"GlassLength[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"鐐変綋娈礬"},{\"Type\":\"Q\",\"Controls\":[{\"Binding\":\"GlassLength[2]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"椋庢爡娈礬"},{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[3]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"涓嬬墖娈礬"}],\"InterfaceName\":\"IDeviceMapInfor\",\"DeviceName\":\"NG150130\"}', '2022-09-07 00:00:00', '', '', '2022-08-10', '2022-08-10', '娲涢槼鐜荤拑鍏徃', NULL, NULL);
-INSERT INTO `device` VALUES (35, 'YL211116-AU1E60', 'admin', '2022-08-18 09:44:47', 'AU1E60', '鏈惎鐢�', NULL, NULL, '2022-08-18 09:44:47', '', '', '2022-08-10', '2022-08-10', NULL, NULL, NULL);
-INSERT INTO `device` VALUES (36, 'Lyyyyy', 'admin', '2022-08-30 15:01:16', 'cccccccccccc', '鏈惎鐢�', NULL, NULL, '2022-08-30 15:01:16', '', '', '2022-08-30', '2022-08-30', '娲涢槼鐜荤拑鍏徃', NULL, NULL);
-INSERT INTO `device` VALUES (38, 'NG20000', 'admin', '2022-10-21 16:36:03', '娴嬭瘯璁惧', '鏈惎鐢�', NULL, NULL, '2022-10-21 16:36:03', '', '', '2022-10-21', '2022-10-21', '娴嬭瘯鐢�', NULL, NULL);
-INSERT INTO `device` VALUES (39, 'FS221024-AU1E70', 'admin', '2023-03-14 14:42:27', '鍗氭槍涓�', '鏈惎鐢�', NULL, NULL, '2023-03-14 14:42:27', '', '', '2023-03-14', '2023-03-14', '浣涘北鍗氭槍涓�', NULL, NULL);
-INSERT INTO `device` VALUES (40, 'DG210978-A1B50', 'admin', '2023-03-21 14:21:22', '涓『A1B50', '鏈惎鐢�', '{\"Ver\":\"1.0\",\"iTopDos\":[70],\"iTopRightMerge\":[1],\"iBtmEnd\":[],\"iTopFront\":[],\"iBtmRow\":[10],\"iBtmLeftMerge\":[1],\"iTopLeftMerge\":[1],\"iTopColumn\":[8],\"iBtmDos\":[70],\"iBtmSingline\":[],\"iBtmFront\":[],\"iBtmRightMerge\":[1],\"InterfaceName\":\"IDeviceInfor\",\"iTopEnd\":[],\"iTopRow\":[10],\"iTopSingline\":[],\"DeviceName\":\"DG210978-A1B50\",\"iBtmColumn\":[8]}', '{\"Ver\":\"1.0\",\"Datas\":[{\"Binding\":\"Datas[0]\",\"Unit\":\"\",\"Name\":\"CurrentStatus\"},{\"Binding\":\"Datas[1]\",\"Unit\":\"鈩僜",\"Name\":\"RtTemperature\"},{\"Binding\":\"Datas[2]\",\"Unit\":\"%\",\"Name\":\"PvPower\"},{\"Binding\":\"Datas[3]\",\"Unit\":\"kw\",\"Name\":\"CurveTotalPower\"}],\"Segments\":[{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"Load\"},{\"Type\":\"F\",\"Controls\":[{\"Binding\":\"GlassLength[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"鐐変綋娈礬"},{\"Type\":\"Q\",\"Controls\":[{\"Binding\":\"GlassLength[2]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"椋庢爡娈礬"},{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[3]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"涓嬬墖娈礬"}],\"InterfaceName\":\"IDeviceMapInfor\",\"DeviceName\":\"DG210978-A1B50\"}', '2023-05-01 00:00:00', '', '', '2023-03-21', '2023-03-21', '涓滆帪涓『', NULL, NULL);
-INSERT INTO `device` VALUES (41, 'FS210305-AU1E60', 'admin', '2023-03-22 13:59:05', '榧庣珛涓欰U1E60', '鏈惎鐢�', '{\"Ver\":\"1.0\",\"iTopDos\":[96],\"iTopRightMerge\":[],\"iBtmEnd\":[],\"iTopFront\":[],\"iBtmRow\":[12],\"iBtmLeftMerge\":[],\"iTopLeftMerge\":[],\"iTopColumn\":[8],\"iBtmDos\":[96],\"iBtmSingline\":[],\"iBtmFront\":[],\"iBtmRightMerge\":[],\"InterfaceName\":\"IDeviceInfor\",\"iTopEnd\":[],\"iTopRow\":[12],\"iTopSingline\":[],\"DeviceName\":\"FS210305-AU1E60\",\"iBtmColumn\":[8]}', '{\"Ver\":\"1.0\",\"Datas\":[{\"Binding\":\"Datas[0]\",\"Unit\":\"\",\"Name\":\"CurrentStatus\"},{\"Binding\":\"Datas[1]\",\"Unit\":\"鈩僜",\"Name\":\"RtTemperature\"},{\"Binding\":\"Datas[2]\",\"Unit\":\"%\",\"Name\":\"PvPower\"},{\"Binding\":\"Datas[3]\",\"Unit\":\"kw\",\"Name\":\"CurveTotalPower\"}],\"Segments\":[{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"Load\"},{\"Type\":\"F\",\"Controls\":[{\"Binding\":\"GlassLength[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"鐐変綋娈礬"},{\"Type\":\"Q\",\"Controls\":[{\"Binding\":\"GlassLength[2]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"椋庢爡娈礬"},{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[3]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"涓嬬墖娈礬"}],\"InterfaceName\":\"IDeviceMapInfor\",\"DeviceName\":\"FS210305-AU1E60\"}', '2023-05-01 00:00:00', '', '', '2023-03-22', '2023-03-22', '浣涘北榧庣珛涓�', NULL, NULL);
-INSERT INTO `device` VALUES (42, 'FS220765-AU1E70', 'admin', '2023-03-28 15:08:56', '220765-AU1E70', '鏈惎鐢�', '{\"Ver\":\"1.0\",\"iTopDos\":[108],\"iTopRightMerge\":[1],\"iBtmEnd\":[],\"iTopFront\":[],\"iBtmRow\":[12],\"iBtmLeftMerge\":[1],\"iTopLeftMerge\":[1],\"iTopColumn\":[10],\"iBtmDos\":[108],\"iBtmSingline\":[],\"iBtmFront\":[],\"iBtmRightMerge\":[1],\"InterfaceName\":\"IDeviceInfor\",\"iTopEnd\":[],\"iTopRow\":[12],\"iTopSingline\":[],\"DeviceName\":\"FS220765-AU1E70\",\"iBtmColumn\":[10]}', '{\"Ver\":\"1.0\",\"Datas\":[{\"Binding\":\"Datas[0]\",\"Unit\":\"\",\"Name\":\"CurrentStatus\"},{\"Binding\":\"Datas[1]\",\"Unit\":\"鈩僜",\"Name\":\"RtTemperature\"},{\"Binding\":\"Datas[2]\",\"Unit\":\"%\",\"Name\":\"PvPower\"},{\"Binding\":\"Datas[3]\",\"Unit\":\"kw\",\"Name\":\"CurveTotalPower\"}],\"Segments\":[{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"Load\"},{\"Type\":\"F\",\"Controls\":[{\"Binding\":\"GlassLength[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"鐐変綋娈礬"},{\"Type\":\"Q\",\"Controls\":[{\"Binding\":\"GlassLength[2]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"椋庢爡娈礬"},{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[3]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"涓嬬墖娈礬"}],\"InterfaceName\":\"IDeviceMapInfor\",\"DeviceName\":\"FS220765-AU1E70\"}', '2023-04-01 00:00:00', '', '', '2023-03-28', '2023-03-28', '浣涘北鐜栫憺', NULL, NULL);
-INSERT INTO `device` VALUES (44, 'NG30000', 'admin', '2023-04-04 10:45:18', 'TEST', '鏈惎鐢�', NULL, NULL, '2023-04-04 10:45:18', '', '', '2023-04-04', '2023-04-04', NULL, NULL, NULL);
-INSERT INTO `device` VALUES (46, 'FS220666-AU1B60', 'admin', '2023-04-04 11:38:34', '寮犲媷AU1B60', '鏈惎鐢�', '{\"Ver\":\"1.0\",\"iTopDos\":[96],\"iTopRightMerge\":[],\"iBtmEnd\":[],\"iTopFront\":[],\"iBtmRow\":[12],\"iBtmLeftMerge\":[],\"iTopLeftMerge\":[],\"iTopColumn\":[8],\"iBtmDos\":[96],\"iBtmSingline\":[],\"iBtmFront\":[],\"iBtmRightMerge\":[],\"InterfaceName\":\"IDeviceInfor\",\"iTopEnd\":[],\"iTopRow\":[12],\"iTopSingline\":[],\"DeviceName\":\"FS220666-AU1B60\",\"iBtmColumn\":[8]}', '{\"Ver\":\"1.0\",\"Datas\":[{\"Binding\":\"Datas[0]\",\"Unit\":\"\",\"Name\":\"CurrentStatus\"},{\"Binding\":\"Datas[1]\",\"Unit\":\"鈩僜",\"Name\":\"RtTemperature\"},{\"Binding\":\"Datas[2]\",\"Unit\":\"%\",\"Name\":\"PvPower\"},{\"Binding\":\"Datas[3]\",\"Unit\":\"kw\",\"Name\":\"CurveTotalPower\"}],\"Segments\":[{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"Load\"},{\"Type\":\"F\",\"Controls\":[{\"Binding\":\"GlassLength[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"鐐変綋娈礬"},{\"Type\":\"Q\",\"Controls\":[{\"Binding\":\"GlassLength[2]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"椋庢爡娈礬"},{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[3]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"涓嬬墖娈礬"}],\"InterfaceName\":\"IDeviceMapInfor\",\"DeviceName\":\"FS220666-AU1B60\"}', '2023-04-04 11:38:34', '', '', '2023-04-04', '2023-04-04', NULL, NULL, NULL);
-
--- ----------------------------
--- Table structure for glass
--- ----------------------------
-DROP TABLE IF EXISTS `glass`;
-CREATE TABLE `glass` (
- `id` int NOT NULL AUTO_INCREMENT,
- `glassid` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
- `orderid` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
- `width` decimal(10, 2) NULL DEFAULT NULL,
- `height` decimal(10, 2) NULL DEFAULT NULL,
- PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of glass
--- ----------------------------
-INSERT INTO `glass` VALUES (1, '001', '1145', 1400.00, 1200.00);
-INSERT INTO `glass` VALUES (2, '002', '1145', 1500.00, 1100.00);
-INSERT INTO `glass` VALUES (3, '112', '1145', 1220.00, 1500.00);
-
--- ----------------------------
--- Table structure for menu_list
--- ----------------------------
-DROP TABLE IF EXISTS `menu_list`;
-CREATE TABLE `menu_list` (
- `id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭',
- `parent_id` bigint NULL DEFAULT NULL COMMENT '鐖剁骇id',
- `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍚嶇О',
- `icon` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鑿滃崟鍥炬爣',
- `priority` int NULL DEFAULT NULL COMMENT '浼樺厛绾�',
- `router` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '璺敱',
- `state` tinyint NOT NULL DEFAULT 1 COMMENT '鐘舵�� 1/姝ｅ父',
- `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '鍒涘缓鏃堕棿',
- `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '鏇存柊鏃堕棿',
- PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 61 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of menu_list
--- ----------------------------
-INSERT INTO `menu_list` VALUES (1, NULL, '鐢ㄦ埛绠＄悊', 'el-icon-user-solid', 1, '', 1, '2021-11-28 14:30:27', '2021-11-28 15:06:04');
-INSERT INTO `menu_list` VALUES (2, NULL, '鐢垫皵绠＄悊', 'el-icon-lollipop', 2, '', 1, '2023-08-23 20:11:38', '2023-09-01 16:34:36');
-INSERT INTO `menu_list` VALUES (5, NULL, '鏉冮檺绠＄悊', 'el-icon-collection-tag', 5, '', 1, '2021-11-28 14:30:27', '2021-11-28 15:06:04');
-INSERT INTO `menu_list` VALUES (6, NULL, '瑙掕壊绠＄悊', 'el-icon-s-flag', 6, '', 1, '2021-11-28 14:30:27', '2021-11-28 15:06:04');
-INSERT INTO `menu_list` VALUES (7, 1, '鐢ㄦ埛鍒楄〃', '', 7, 'user', 1, '2021-11-28 14:30:27', '2021-11-28 15:06:04');
-INSERT INTO `menu_list` VALUES (8, 9, '涓婚〉', 'el-icon-menu', 8, 'home', 1, '2023-09-08 10:56:12', '2023-09-08 11:02:36');
-INSERT INTO `menu_list` VALUES (9, NULL, '涓婚〉', 'el-icon-menu', 0, 'home', 1, '2023-09-08 10:43:34', '2023-09-08 11:02:32');
-INSERT INTO `menu_list` VALUES (11, 5, '鏉冮檺鍒楄〃', '', 11, 'power', 1, '2021-11-28 14:30:28', '2021-11-28 15:06:04');
-INSERT INTO `menu_list` VALUES (12, 6, '瑙掕壊鍒楄〃', '', 12, 'role', 1, '2021-11-28 14:30:28', '2021-11-28 15:06:04');
-INSERT INTO `menu_list` VALUES (49, 2, '鎶ヨ淇℃伅', '', 49, 'Electrical/alarm', 1, '2021-11-28 14:30:28', '2023-09-08 11:14:08');
-INSERT INTO `menu_list` VALUES (51, 2, '璁惧鐘舵��', NULL, 51, 'Electrical/State', 1, '2023-08-25 13:29:13', '2023-09-11 17:07:08');
-INSERT INTO `menu_list` VALUES (52, 2, '寮�鍏虫帶鍒�', NULL, 52, 'Electrical/Action', 1, '2023-08-25 13:29:18', '2023-09-12 17:02:54');
-INSERT INTO `menu_list` VALUES (53, 2, '鍙傛暟涓嬪彂', NULL, 53, 'Electrical/Parameter', 1, '2023-08-25 13:29:22', '2023-09-01 16:32:29');
-INSERT INTO `menu_list` VALUES (54, 2, 'IO鐘舵��', NULL, 53, 'Electrical/Sign', 1, '2023-08-25 13:29:22', '2023-09-11 17:06:16');
-
--- ----------------------------
--- Table structure for order_out
--- ----------------------------
-DROP TABLE IF EXISTS `order_out`;
-CREATE TABLE `order_out` (
- `id` int NOT NULL AUTO_INCREMENT COMMENT '搴忓彿',
- `order_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '璁㈠崟鍙�',
- `state` int NULL DEFAULT NULL COMMENT '鐘舵��(0锛氭寜姝よ鍗曞彿鍑虹墖锛�1缁撴潫鍑虹墖)',
- PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of order_out
--- ----------------------------
-INSERT INTO `order_out` VALUES (1, 'NG2202302', 1);
-INSERT INTO `order_out` VALUES (2, 'NG2202302', 0);
-
--- ----------------------------
--- Table structure for permission
--- ----------------------------
-DROP TABLE IF EXISTS `permission`;
-CREATE TABLE `permission` (
- `id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭',
- `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鏉冮檺鏍囪瘑',
- `description` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鏉冮檺鎻忚堪',
- `state` tinyint NOT NULL DEFAULT 1 COMMENT '鐘舵�� 1/姝ｅ父',
- `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '鍒涘缓鏃堕棿',
- `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '鏇存柊鏃堕棿',
- PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 32 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '鏉冮檺' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of permission
--- ----------------------------
-INSERT INTO `permission` VALUES (1, 'user:select', '鐢ㄦ埛鏌ヨ', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
-INSERT INTO `permission` VALUES (2, 'user:update', '鐢ㄦ埛淇敼', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
-INSERT INTO `permission` VALUES (3, 'user:delete', '鐢ㄦ埛鍒犻櫎', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
-INSERT INTO `permission` VALUES (7, 'role:add', '瑙掕壊娣诲姞', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
-INSERT INTO `permission` VALUES (8, 'role:update', '瑙掕壊淇敼', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
-INSERT INTO `permission` VALUES (9, 'role:delete', '瑙掕壊鍒犻櫎', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
-INSERT INTO `permission` VALUES (10, 'role:select', '瑙掕壊鏌ヨ', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
-INSERT INTO `permission` VALUES (11, 'menuList:delete', '鑿滃崟鍒犻櫎', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
-INSERT INTO `permission` VALUES (12, 'menuList:add', '鑿滃崟娣诲姞', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
-INSERT INTO `permission` VALUES (13, 'menuList:update', '鑿滃崟淇敼', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
-INSERT INTO `permission` VALUES (16, 'rolePermission:add', '鎺堟潈娣诲姞', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
-INSERT INTO `permission` VALUES (17, 'rolePermission:delete', '鎺堟潈鍒犻櫎', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
-INSERT INTO `permission` VALUES (18, 'rolePermission:select', '鎺堟潈鏌ヨ', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
-INSERT INTO `permission` VALUES (19, 'permission:select', '鏉冮檺鏌ヨ', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
-INSERT INTO `permission` VALUES (20, 'user:add', '鐢ㄦ埛娣诲姞', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
-INSERT INTO `permission` VALUES (22, 'menuList:select', '鑿滃崟鏌ヨ', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
-INSERT INTO `permission` VALUES (25, 'category:select', '鍒嗙被鏌ヨ', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
-INSERT INTO `permission` VALUES (26, 'category:delete', '鍒嗙被鍒犻櫎', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
-INSERT INTO `permission` VALUES (27, 'category:update', '鍒嗙被淇敼', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
-INSERT INTO `permission` VALUES (28, 'category:add', '鍒嗙被娣诲姞', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
-INSERT INTO `permission` VALUES (29, 'alarm:select', '鎶ヨ淇℃伅鏌ヨ', 1, '2021-11-28 15:07:36', '2023-08-28 15:16:24');
-INSERT INTO `permission` VALUES (30, 'alarm:add', '鎶ヨ淇℃伅娣诲姞', 1, '2023-08-24 08:48:53', '2023-08-28 15:16:27');
-INSERT INTO `permission` VALUES (31, 'alarm:update', '鎶ヨ淇℃伅淇敼', 1, '2023-08-24 08:49:23', '2023-08-28 15:16:29');
-
--- ----------------------------
--- Table structure for role
--- ----------------------------
-DROP TABLE IF EXISTS `role`;
-CREATE TABLE `role` (
- `id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭',
- `parent_id` bigint NULL DEFAULT NULL COMMENT '涓婄骇瑙掕壊',
- `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '瑙掕壊鍚嶇О',
- `description` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鎻忚堪',
- `state` tinyint NOT NULL DEFAULT 1 COMMENT '鐘舵�� 1/姝ｅ父',
- `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '鍒涘缓鏃堕棿',
- `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '鏇存柊鏃堕棿',
- PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '瑙掕壊' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of role
--- ----------------------------
-INSERT INTO `role` VALUES (1, NULL, 'admin', '绯荤粺绠＄悊鍛�', 1, '2021-01-10 22:49:17', '2021-03-29 15:19:15');
-INSERT INTO `role` VALUES (2, 1, 'user2', '鏅�氱敤鎴�', 1, '2021-01-13 00:28:58', '2021-03-29 15:19:15');
-INSERT INTO `role` VALUES (5, 1, 'user3', '777', 1, '2023-08-24 10:02:58', '2023-08-28 14:28:22');
-
--- ----------------------------
--- Table structure for role_menu_list
--- ----------------------------
-DROP TABLE IF EXISTS `role_menu_list`;
-CREATE TABLE `role_menu_list` (
- `id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭',
- `role_id` bigint NULL DEFAULT NULL COMMENT '瑙掕壊id',
- `menu_list_id` bigint NULL DEFAULT NULL COMMENT '鑿滃崟id',
- `state` tinyint NULL DEFAULT 1 COMMENT '鐘舵�� 1/姝ｅ父',
- `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '鍒涘缓鏃堕棿',
- `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '鏇存柊鏃堕棿',
- PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 57 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '瑙掕壊鍜岃彍鍗曞叧鑱旇〃' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of role_menu_list
--- ----------------------------
-INSERT INTO `role_menu_list` VALUES (1, 1, 1, 1, '2021-11-28 15:10:03', '2021-11-28 15:10:03');
-INSERT INTO `role_menu_list` VALUES (2, 1, 2, 1, '2021-11-28 15:10:03', '2021-11-28 15:10:03');
-INSERT INTO `role_menu_list` VALUES (3, 1, 3, 1, '2021-11-28 15:10:03', '2021-11-28 15:10:03');
-INSERT INTO `role_menu_list` VALUES (4, 1, 4, 1, '2021-11-28 15:10:03', '2021-11-28 15:10:03');
-INSERT INTO `role_menu_list` VALUES (5, 1, 5, 1, '2021-11-28 15:10:03', '2021-11-28 15:10:03');
-INSERT INTO `role_menu_list` VALUES (6, 1, 6, 1, '2021-11-28 15:10:03', '2021-11-28 15:10:03');
-INSERT INTO `role_menu_list` VALUES (7, 1, 7, 1, '2021-11-28 15:10:03', '2021-11-28 15:10:03');
-INSERT INTO `role_menu_list` VALUES (8, 1, 8, 1, '2021-11-28 15:10:03', '2021-11-28 15:10:03');
-INSERT INTO `role_menu_list` VALUES (9, 1, 9, 1, '2021-11-28 15:10:03', '2021-11-28 15:10:03');
-INSERT INTO `role_menu_list` VALUES (10, 1, 10, 1, '2021-11-28 15:10:03', '2021-11-28 15:10:03');
-INSERT INTO `role_menu_list` VALUES (11, 1, 11, 1, '2021-11-28 15:10:03', '2021-11-28 15:10:03');
-INSERT INTO `role_menu_list` VALUES (12, 1, 12, 1, '2021-11-28 15:10:03', '2021-11-28 15:10:03');
-INSERT INTO `role_menu_list` VALUES (19, 1, 50, 1, '2023-08-24 09:13:00', '2023-08-24 09:13:00');
-INSERT INTO `role_menu_list` VALUES (20, 1, 49, 1, '2023-08-24 10:08:38', '2023-08-28 15:39:54');
-INSERT INTO `role_menu_list` VALUES (21, 1, 51, 1, '2023-08-24 10:08:56', '2023-08-28 15:39:54');
-INSERT INTO `role_menu_list` VALUES (22, 1, 52, 1, '2023-08-24 10:08:56', '2023-08-28 15:39:54');
-INSERT INTO `role_menu_list` VALUES (23, 1, 53, 1, '2023-08-24 10:08:56', '2023-08-28 15:39:54');
-INSERT INTO `role_menu_list` VALUES (25, 1, 60, 1, '2023-08-25 13:05:53', '2023-08-25 13:05:53');
-INSERT INTO `role_menu_list` VALUES (26, 1, 1, 1, '2023-08-28 14:29:17', '2023-08-28 15:39:54');
-INSERT INTO `role_menu_list` VALUES (27, 1, 7, 1, '2023-08-28 15:11:09', '2023-08-28 15:39:54');
-INSERT INTO `role_menu_list` VALUES (28, 1, 2, 1, '2023-08-28 15:14:19', '2023-08-28 15:39:54');
-INSERT INTO `role_menu_list` VALUES (29, 1, 49, 1, '2023-08-28 15:14:27', '2023-08-28 15:39:54');
-INSERT INTO `role_menu_list` VALUES (31, 2, 2, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
-INSERT INTO `role_menu_list` VALUES (32, 2, 3, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
-INSERT INTO `role_menu_list` VALUES (33, 2, 4, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
-INSERT INTO `role_menu_list` VALUES (37, 2, 8, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
-INSERT INTO `role_menu_list` VALUES (38, 2, 9, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
-INSERT INTO `role_menu_list` VALUES (39, 2, 10, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
-INSERT INTO `role_menu_list` VALUES (42, 2, 50, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
-INSERT INTO `role_menu_list` VALUES (43, 2, 49, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
-INSERT INTO `role_menu_list` VALUES (44, 2, 51, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
-INSERT INTO `role_menu_list` VALUES (45, 2, 52, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
-INSERT INTO `role_menu_list` VALUES (46, 2, 53, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
-INSERT INTO `role_menu_list` VALUES (47, 2, 60, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
-INSERT INTO `role_menu_list` VALUES (50, 2, 2, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
-INSERT INTO `role_menu_list` VALUES (51, 2, 49, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
-INSERT INTO `role_menu_list` VALUES (52, 2, 1, 1, '2023-08-30 16:28:57', '2023-08-30 16:28:57');
-INSERT INTO `role_menu_list` VALUES (53, 2, 7, 1, '2023-08-30 16:29:05', '2023-08-30 16:29:05');
-INSERT INTO `role_menu_list` VALUES (54, 1, 9, 1, '2023-09-08 10:55:54', '2023-09-08 11:02:55');
-INSERT INTO `role_menu_list` VALUES (55, 1, 8, 1, '2023-09-08 10:56:45', '2023-09-08 11:01:43');
-INSERT INTO `role_menu_list` VALUES (56, 2, 54, 1, '2023-09-11 17:09:17', '2023-09-11 17:09:24');
-
--- ----------------------------
--- Table structure for role_permission
--- ----------------------------
-DROP TABLE IF EXISTS `role_permission`;
-CREATE TABLE `role_permission` (
- `id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭',
- `role_id` bigint NULL DEFAULT NULL COMMENT '瑙掕壊id',
- `permission_id` bigint NULL DEFAULT NULL COMMENT '鏉冮檺id',
- `state` tinyint NOT NULL DEFAULT 1 COMMENT '鐘舵�� 1/姝ｅ父',
- `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '鍒涘缓鏃堕棿',
- `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '鏇存柊鏃堕棿',
- PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 76 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '瑙掕壊鏉冮檺' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of role_permission
--- ----------------------------
-INSERT INTO `role_permission` VALUES (1, 1, 1, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (2, 1, 2, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (3, 1, 3, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (7, 1, 7, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (8, 1, 8, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (9, 1, 9, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (10, 1, 10, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (11, 1, 11, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (12, 1, 12, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (13, 1, 13, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (16, 1, 16, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (17, 1, 17, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (18, 1, 18, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (19, 1, 19, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (20, 1, 20, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (22, 1, 22, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (25, 1, 25, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (26, 1, 26, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (27, 1, 27, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (28, 1, 28, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (37, 2, 25, 1, '2021-11-28 16:30:57', '2021-11-28 16:31:04');
-INSERT INTO `role_permission` VALUES (38, 2, 26, 1, '2021-11-28 16:30:57', '2021-11-28 16:31:04');
-INSERT INTO `role_permission` VALUES (39, 2, 27, 1, '2021-11-28 16:30:57', '2021-11-28 16:31:04');
-INSERT INTO `role_permission` VALUES (40, 2, 28, 1, '2021-11-28 16:32:35', '2021-11-28 16:37:20');
-INSERT INTO `role_permission` VALUES (41, 2, 22, 1, '2021-11-28 19:57:35', '2021-11-28 19:57:35');
-INSERT INTO `role_permission` VALUES (42, 1, 30, 1, '2023-08-24 08:55:34', '2023-08-24 08:55:34');
-INSERT INTO `role_permission` VALUES (43, 1, 29, 1, '2023-08-24 08:56:15', '2023-08-24 08:56:15');
-INSERT INTO `role_permission` VALUES (44, 1, 31, 1, '2023-08-24 08:56:23', '2023-08-24 08:56:23');
-INSERT INTO `role_permission` VALUES (53, 2, 2, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (54, 2, 3, 0, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (56, 2, 8, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (57, 2, 9, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (58, 2, 10, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (61, 2, 13, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (62, 2, 16, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (63, 2, 17, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (64, 2, 18, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (65, 2, 19, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (66, 2, 20, 0, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (67, 2, 22, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (68, 2, 25, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (69, 2, 26, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (70, 2, 27, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (71, 2, 28, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
-INSERT INTO `role_permission` VALUES (72, 2, 30, 1, '2023-08-24 08:55:34', '2023-08-24 08:55:34');
-INSERT INTO `role_permission` VALUES (73, 2, 29, 1, '2023-08-24 08:56:15', '2023-08-28 15:33:14');
-INSERT INTO `role_permission` VALUES (74, 2, 1, 1, '2023-08-30 16:29:46', '2023-08-30 16:29:46');
-
--- ----------------------------
--- Table structure for storage_cage
--- ----------------------------
-DROP TABLE IF EXISTS `storage_cage`;
-CREATE TABLE `storage_cage` (
- `id` int NOT NULL AUTO_INCREMENT COMMENT '搴忓彿',
- `glass_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鐜荤拑id',
- `order_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '璁㈠崟id',
- `cage` int NULL DEFAULT NULL COMMENT '绗煎瓙id',
- `cell` int NULL DEFAULT NULL COMMENT '鏍煎瓙id',
- `tier` int NULL DEFAULT NULL COMMENT '鏍煎瓙灞俰d',
- `width` decimal(7, 2) NULL DEFAULT NULL COMMENT '鏍煎瓙瀹�',
- `glasswidth` decimal(7, 2) NULL DEFAULT NULL COMMENT '鐜荤拑瀹�',
- `glassheight` decimal(7, 2) NULL DEFAULT NULL COMMENT '鐜荤拑楂�',
- `state` int NULL DEFAULT NULL COMMENT '鐘舵�侊紙0锛氭棤鐜荤拑锛�1锛氭湁鐜荤拑锛�2锛氳繘鐗囦腑锛�3锛氬嚭鐗囦腑锛�4锛氳皟搴︿腑锛�',
- `coating` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '娑傚眰',
- PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 421 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of storage_cage
--- ----------------------------
-INSERT INTO `storage_cage` VALUES (1, NULL, NULL, 1, 1, 1, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (2, NULL, NULL, 1, 1, 2, 1760.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (3, NULL, NULL, 1, 2, 1, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (4, NULL, NULL, 1, 2, 2, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (5, NULL, NULL, 1, 3, 1, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (6, NULL, NULL, 1, 3, 2, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (7, NULL, NULL, 1, 4, 1, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (8, NULL, NULL, 1, 4, 2, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (9, NULL, NULL, 1, 5, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (10, NULL, NULL, 1, 5, 2, 1600.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (11, NULL, NULL, 1, 6, 1, 1600.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (12, '12', 'NG2202301', 1, 6, 2, 1602.00, 0.00, 2.00, 1, '2');
-INSERT INTO `storage_cage` VALUES (13, NULL, NULL, 1, 7, 1, 1600.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (14, NULL, NULL, 1, 7, 2, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (15, NULL, NULL, 1, 8, 1, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (16, NULL, NULL, 1, 8, 2, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (17, NULL, NULL, 1, 9, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (18, NULL, NULL, 1, 9, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (19, NULL, NULL, 1, 10, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (20, NULL, NULL, 1, 10, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (21, NULL, NULL, 1, 11, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (22, NULL, NULL, 1, 11, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (23, NULL, NULL, 1, 12, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (24, NULL, NULL, 1, 12, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (25, NULL, NULL, 1, 13, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (26, NULL, NULL, 1, 13, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (27, NULL, NULL, 1, 14, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (28, NULL, NULL, 1, 14, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (29, NULL, NULL, 1, 15, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (30, NULL, NULL, 1, 15, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (31, NULL, NULL, 1, 16, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (32, NULL, NULL, 1, 16, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (33, NULL, NULL, 1, 17, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (34, NULL, NULL, 1, 17, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (35, NULL, NULL, 1, 18, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (36, NULL, NULL, 1, 18, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (37, NULL, NULL, 1, 19, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (38, NULL, NULL, 1, 19, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (39, NULL, NULL, 1, 20, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (40, NULL, NULL, 1, 20, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (41, NULL, NULL, 1, 21, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (42, NULL, NULL, 1, 21, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (43, NULL, NULL, 2, 1, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (44, NULL, NULL, 2, 1, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (45, NULL, NULL, 2, 2, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (46, NULL, NULL, 2, 2, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (47, NULL, NULL, 2, 3, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (48, NULL, NULL, 2, 3, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (49, '112', '1145', 2, 4, 1, 330.00, 1220.00, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (50, NULL, NULL, 2, 4, 2, 1550.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (51, NULL, NULL, 2, 5, 1, 1550.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (52, NULL, NULL, 2, 5, 2, 1550.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (53, NULL, NULL, 2, 6, 1, 1550.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (54, NULL, NULL, 2, 6, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (55, NULL, NULL, 2, 7, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (56, NULL, NULL, 2, 7, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (57, NULL, NULL, 2, 8, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (58, NULL, NULL, 2, 8, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (59, NULL, NULL, 2, 9, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (60, NULL, NULL, 2, 9, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (61, NULL, NULL, 2, 10, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (62, NULL, NULL, 2, 10, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (63, NULL, NULL, 2, 11, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (64, NULL, NULL, 2, 11, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (65, NULL, NULL, 2, 12, 1, 1760.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (66, NULL, NULL, 2, 12, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (67, NULL, NULL, 2, 13, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (68, NULL, NULL, 2, 13, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (69, NULL, NULL, 2, 14, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (70, NULL, NULL, 2, 14, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (71, NULL, NULL, 2, 15, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (72, NULL, NULL, 2, 15, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (73, NULL, NULL, 2, 16, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (74, NULL, NULL, 2, 16, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (75, NULL, NULL, 2, 17, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (76, NULL, NULL, 2, 17, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (77, NULL, NULL, 2, 18, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (78, NULL, NULL, 2, 18, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (79, NULL, NULL, 2, 19, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (80, NULL, NULL, 2, 19, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (81, NULL, NULL, 2, 20, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (82, NULL, NULL, 2, 20, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (83, NULL, NULL, 2, 21, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (84, NULL, NULL, 2, 21, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (85, NULL, NULL, 3, 1, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (86, NULL, NULL, 3, 1, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (87, NULL, NULL, 3, 2, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (88, '116', '112', 3, 2, 2, 1500.00, 1200.00, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (89, '117', '112', 3, 3, 1, 1500.00, 1200.00, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (90, '118', '112', 3, 3, 2, 1500.00, 1200.00, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (91, '119', '112', 3, 4, 1, 1500.00, 1200.00, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (92, '120', '112', 3, 4, 2, 1500.00, 1200.00, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (93, '121', '112', 3, 5, 1, 1500.00, 1200.00, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (94, '', '', 3, 5, 2, 2700.00, 0.00, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (95, NULL, NULL, 3, 6, 1, 280.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (96, NULL, NULL, 3, 6, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (97, NULL, NULL, 3, 7, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (98, NULL, NULL, 3, 7, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (99, NULL, NULL, 3, 8, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (100, NULL, NULL, 3, 8, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (101, NULL, NULL, 3, 9, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (102, NULL, NULL, 3, 9, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (103, NULL, NULL, 3, 10, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (104, NULL, NULL, 3, 10, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (105, NULL, NULL, 3, 11, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (106, NULL, NULL, 3, 11, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (107, NULL, NULL, 3, 12, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (108, NULL, NULL, 3, 12, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (109, NULL, NULL, 3, 13, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (110, NULL, NULL, 3, 13, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (111, NULL, NULL, 3, 14, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (112, NULL, NULL, 3, 14, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (113, NULL, NULL, 3, 15, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (114, NULL, NULL, 3, 15, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (115, NULL, NULL, 3, 16, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (116, NULL, NULL, 3, 16, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (117, NULL, NULL, 3, 17, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (118, NULL, NULL, 3, 17, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (119, NULL, NULL, 3, 18, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (120, NULL, NULL, 3, 18, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (121, NULL, NULL, 3, 19, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (122, NULL, NULL, 3, 19, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (123, NULL, NULL, 3, 20, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (124, NULL, NULL, 3, 20, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (125, NULL, NULL, 3, 21, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (126, NULL, NULL, 3, 21, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (127, NULL, NULL, 4, 1, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (128, NULL, NULL, 4, 1, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (129, NULL, NULL, 4, 2, 1, 1550.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (130, NULL, NULL, 4, 2, 2, 1550.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (131, NULL, NULL, 4, 3, 1, 1550.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (132, NULL, NULL, 4, 3, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (133, NULL, NULL, 4, 4, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (134, NULL, NULL, 4, 4, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (135, NULL, NULL, 4, 5, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (136, NULL, NULL, 4, 5, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (137, NULL, NULL, 4, 6, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (138, NULL, NULL, 4, 6, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (139, NULL, NULL, 4, 7, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (140, NULL, NULL, 4, 7, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (141, '123', '112', 4, 8, 1, 1500.00, 1200.00, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (142, '124', '112', 4, 8, 2, 1500.00, 1200.00, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (143, '125', '112', 4, 9, 1, 1500.00, 1200.00, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (144, '126', '112', 4, 9, 2, 1500.00, 1200.00, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (145, '127', '112', 4, 10, 1, 1500.00, 1200.00, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (146, '128', '112', 4, 10, 2, 1500.00, 1200.00, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (147, NULL, NULL, 4, 11, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (148, NULL, NULL, 4, 11, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (149, NULL, NULL, 4, 12, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (150, NULL, NULL, 4, 12, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (151, NULL, NULL, 4, 13, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (152, NULL, NULL, 4, 13, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (153, NULL, NULL, 4, 14, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (154, NULL, NULL, 4, 14, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (155, NULL, NULL, 4, 15, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (156, NULL, NULL, 4, 15, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (157, NULL, NULL, 4, 16, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (158, NULL, NULL, 4, 16, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (159, NULL, NULL, 4, 17, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (160, NULL, NULL, 4, 17, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (161, NULL, NULL, 4, 18, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (162, NULL, NULL, 4, 18, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (163, NULL, NULL, 4, 19, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (164, NULL, NULL, 4, 19, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (165, NULL, NULL, 4, 20, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (166, NULL, NULL, 4, 20, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (167, NULL, NULL, 4, 21, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (168, NULL, NULL, 4, 21, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (169, NULL, NULL, 5, 1, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (170, NULL, NULL, 5, 1, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (171, NULL, NULL, 5, 2, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (172, NULL, NULL, 5, 2, 2, 1550.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (173, NULL, NULL, 5, 3, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (174, NULL, NULL, 5, 3, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (175, NULL, NULL, 5, 4, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (176, NULL, NULL, 5, 4, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (177, NULL, NULL, 5, 5, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (178, NULL, NULL, 5, 5, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (179, NULL, NULL, 5, 6, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (180, NULL, NULL, 5, 6, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (181, NULL, NULL, 5, 7, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (182, NULL, NULL, 5, 7, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (183, NULL, NULL, 5, 8, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (184, NULL, NULL, 5, 8, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (185, NULL, NULL, 5, 9, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (186, NULL, NULL, 5, 9, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (187, NULL, NULL, 5, 10, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (188, NULL, NULL, 5, 10, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (189, NULL, NULL, 5, 11, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (190, NULL, NULL, 5, 11, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (191, NULL, NULL, 5, 12, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (192, NULL, NULL, 5, 12, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (193, NULL, NULL, 5, 13, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (194, NULL, NULL, 5, 13, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (195, NULL, NULL, 5, 14, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (196, NULL, NULL, 5, 14, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (197, NULL, NULL, 5, 15, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (198, NULL, NULL, 5, 15, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (199, NULL, NULL, 5, 16, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (200, NULL, NULL, 5, 16, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (201, NULL, NULL, 5, 17, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (202, NULL, NULL, 5, 17, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (203, NULL, NULL, 5, 18, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (204, NULL, NULL, 5, 18, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (205, NULL, NULL, 5, 19, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (206, NULL, NULL, 5, 19, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (207, NULL, NULL, 5, 20, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (208, NULL, NULL, 5, 20, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (209, NULL, NULL, 5, 21, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (210, NULL, NULL, 5, 21, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (211, '129', '112', 6, 1, 1, 1500.00, 1200.00, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (212, '130', '113', 6, 1, 2, 1500.00, 1200.00, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (213, '', '', 6, 2, 1, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (214, NULL, NULL, 6, 2, 2, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (215, NULL, NULL, 6, 3, 1, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (216, NULL, NULL, 6, 3, 2, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (217, NULL, NULL, 6, 4, 1, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (218, NULL, NULL, 6, 4, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (219, NULL, NULL, 6, 5, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (220, NULL, NULL, 6, 5, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (221, NULL, NULL, 6, 6, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (222, NULL, NULL, 6, 6, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (223, NULL, NULL, 6, 7, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (224, NULL, NULL, 6, 7, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (225, NULL, NULL, 6, 8, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (226, NULL, NULL, 6, 8, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (227, NULL, NULL, 6, 9, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (228, NULL, NULL, 6, 9, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (229, NULL, NULL, 6, 10, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (230, NULL, NULL, 6, 10, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (231, NULL, NULL, 6, 11, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (232, NULL, NULL, 6, 11, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (233, NULL, NULL, 6, 12, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (234, NULL, NULL, 6, 12, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (235, NULL, NULL, 6, 13, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (236, NULL, NULL, 6, 13, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (237, NULL, NULL, 6, 14, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (238, NULL, NULL, 6, 14, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (239, NULL, NULL, 6, 15, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (240, NULL, NULL, 6, 15, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (241, NULL, NULL, 6, 16, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (242, NULL, NULL, 6, 16, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (243, NULL, NULL, 6, 17, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (244, NULL, NULL, 6, 17, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (245, NULL, NULL, 6, 18, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (246, NULL, NULL, 6, 18, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (247, NULL, NULL, 6, 19, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (248, NULL, NULL, 6, 19, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (249, NULL, NULL, 6, 20, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (250, NULL, NULL, 6, 20, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (251, NULL, NULL, 6, 21, 1, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (252, NULL, NULL, 6, 21, 2, 1788.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (253, '1', '1145', 7, 1, 1, 388.00, 1400.00, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (254, '112', '1145', 7, 1, 2, 568.00, 1220.00, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (255, '112', '1145', 7, 2, 1, 568.00, 1220.00, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (256, '001', '1145', 7, 2, 2, 1788.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (257, NULL, NULL, 7, 3, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (258, '112', '1145', 7, 3, 2, 280.00, 1220.00, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (259, NULL, NULL, 7, 4, 1, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (260, NULL, NULL, 7, 4, 2, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (261, NULL, NULL, 7, 5, 1, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (262, NULL, NULL, 7, 5, 2, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (263, NULL, NULL, 7, 6, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (264, NULL, NULL, 7, 6, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (265, NULL, NULL, 7, 7, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (266, NULL, NULL, 7, 7, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (267, NULL, NULL, 7, 8, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (268, NULL, NULL, 7, 8, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (269, NULL, NULL, 7, 9, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (270, NULL, NULL, 7, 9, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (271, NULL, NULL, 7, 10, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (272, NULL, NULL, 7, 10, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (273, NULL, NULL, 7, 11, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (274, NULL, NULL, 7, 11, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (275, NULL, NULL, 7, 12, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (276, NULL, NULL, 7, 12, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (277, NULL, NULL, 7, 13, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (278, NULL, NULL, 7, 13, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (279, NULL, NULL, 7, 14, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (280, NULL, NULL, 7, 14, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (281, NULL, NULL, 7, 15, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (282, NULL, NULL, 7, 15, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (283, NULL, NULL, 7, 16, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (284, NULL, NULL, 7, 16, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (285, NULL, NULL, 7, 17, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (286, NULL, NULL, 7, 17, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (287, NULL, NULL, 7, 18, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (288, NULL, NULL, 7, 18, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (289, NULL, NULL, 7, 19, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (290, NULL, NULL, 7, 19, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (291, NULL, NULL, 7, 20, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (292, NULL, NULL, 7, 20, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (293, NULL, NULL, 7, 21, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (294, NULL, NULL, 7, 21, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (295, NULL, NULL, 8, 1, 1, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (296, NULL, NULL, 8, 1, 2, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (297, NULL, NULL, 8, 2, 1, 1788.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (298, NULL, NULL, 8, 2, 2, 1788.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (299, NULL, NULL, 8, 3, 1, 1788.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (300, NULL, NULL, 8, 3, 2, 1788.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (301, NULL, NULL, 8, 4, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (302, NULL, NULL, 8, 4, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (303, NULL, NULL, 8, 5, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (304, NULL, NULL, 8, 5, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (305, NULL, NULL, 8, 6, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (306, NULL, NULL, 8, 6, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (307, NULL, NULL, 8, 7, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (308, NULL, NULL, 8, 7, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (309, NULL, NULL, 8, 8, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (310, NULL, NULL, 8, 8, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (311, NULL, NULL, 8, 9, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (312, NULL, NULL, 8, 9, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (313, NULL, NULL, 8, 10, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (314, NULL, NULL, 8, 10, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (315, NULL, NULL, 8, 11, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (316, NULL, NULL, 8, 11, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (317, NULL, NULL, 8, 12, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (318, NULL, NULL, 8, 12, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (319, NULL, NULL, 8, 13, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (320, NULL, NULL, 8, 13, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (321, NULL, NULL, 8, 14, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (322, NULL, NULL, 8, 14, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (323, NULL, NULL, 8, 15, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (324, NULL, NULL, 8, 15, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (325, NULL, NULL, 8, 16, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (326, NULL, NULL, 8, 16, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (327, NULL, NULL, 8, 17, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (328, NULL, NULL, 8, 17, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (329, NULL, NULL, 8, 18, 1, 1788.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (330, NULL, NULL, 8, 18, 2, 1788.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (331, NULL, NULL, 8, 19, 1, 1788.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (332, NULL, NULL, 8, 19, 2, 1788.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (333, NULL, NULL, 8, 20, 1, 1788.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (334, NULL, NULL, 8, 20, 2, 1788.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (335, NULL, NULL, 8, 21, 1, 1788.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (336, NULL, NULL, 8, 21, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (337, NULL, NULL, 9, 1, 1, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (338, NULL, NULL, 9, 1, 2, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (339, NULL, NULL, 9, 2, 1, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (340, NULL, NULL, 9, 2, 2, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (341, NULL, NULL, 9, 3, 1, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (342, NULL, NULL, 9, 3, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (343, NULL, NULL, 9, 4, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (344, NULL, NULL, 9, 4, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (345, NULL, NULL, 9, 5, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (346, NULL, NULL, 9, 5, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (347, NULL, NULL, 9, 6, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (348, NULL, NULL, 9, 6, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (349, NULL, NULL, 9, 7, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (350, NULL, NULL, 9, 7, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (351, NULL, NULL, 9, 8, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (352, NULL, NULL, 9, 8, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (353, NULL, NULL, 9, 9, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (354, NULL, NULL, 9, 9, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (355, NULL, NULL, 9, 10, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (356, NULL, NULL, 9, 10, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (357, NULL, NULL, 9, 11, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (358, NULL, NULL, 9, 11, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (359, NULL, NULL, 9, 12, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (360, NULL, NULL, 9, 12, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (361, NULL, NULL, 9, 13, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (362, NULL, NULL, 9, 13, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (363, NULL, NULL, 9, 14, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (364, NULL, NULL, 9, 14, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (365, NULL, NULL, 9, 15, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (366, NULL, NULL, 9, 15, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (367, NULL, NULL, 9, 16, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (368, NULL, NULL, 9, 16, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (369, NULL, NULL, 9, 17, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (370, NULL, NULL, 9, 17, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (371, NULL, NULL, 9, 18, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (372, NULL, NULL, 9, 18, 2, 1788.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (373, NULL, NULL, 9, 19, 1, 1788.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (374, NULL, NULL, 9, 19, 2, 1788.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (375, NULL, NULL, 9, 20, 1, 1788.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (376, NULL, NULL, 9, 20, 2, 1788.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (377, NULL, NULL, 9, 21, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (378, NULL, NULL, 9, 21, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (379, NULL, NULL, 10, 1, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (380, NULL, NULL, 10, 1, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (381, NULL, NULL, 10, 2, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (382, NULL, NULL, 10, 2, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (383, NULL, NULL, 10, 3, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (384, NULL, NULL, 10, 3, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (385, NULL, NULL, 10, 4, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (386, NULL, NULL, 10, 4, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (387, NULL, NULL, 10, 5, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (388, NULL, NULL, 10, 5, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (389, NULL, NULL, 10, 6, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (390, NULL, NULL, 10, 6, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (391, NULL, NULL, 10, 7, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (392, NULL, NULL, 10, 7, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (393, NULL, NULL, 10, 8, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (394, NULL, NULL, 10, 8, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (395, NULL, NULL, 10, 9, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (396, NULL, NULL, 10, 9, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (397, NULL, NULL, 10, 10, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (398, NULL, NULL, 10, 10, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (399, NULL, NULL, 10, 11, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (400, NULL, NULL, 10, 11, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (401, NULL, NULL, 10, 12, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (402, NULL, NULL, 10, 12, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (403, NULL, NULL, 10, 13, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (404, NULL, NULL, 10, 13, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (405, NULL, NULL, 10, 14, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (406, NULL, NULL, 10, 14, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (407, NULL, NULL, 10, 15, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (408, NULL, NULL, 10, 15, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (409, NULL, NULL, 10, 16, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (410, NULL, NULL, 10, 16, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (411, NULL, NULL, 10, 17, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (412, NULL, NULL, 10, 17, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (413, NULL, NULL, 10, 18, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (414, NULL, NULL, 10, 18, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (415, NULL, NULL, 10, 19, 1, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (416, NULL, NULL, 10, 19, 2, 1500.00, NULL, NULL, 1, NULL);
-INSERT INTO `storage_cage` VALUES (417, NULL, NULL, 10, 20, 1, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (418, NULL, NULL, 10, 20, 2, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (419, NULL, NULL, 10, 21, 1, 1500.00, NULL, NULL, 0, NULL);
-INSERT INTO `storage_cage` VALUES (420, NULL, NULL, 10, 21, 2, 1500.00, NULL, NULL, 0, NULL);
-
--- ----------------------------
--- Table structure for storage_rack
--- ----------------------------
-DROP TABLE IF EXISTS `storage_rack`;
-CREATE TABLE `storage_rack` (
- `id` bigint NOT NULL AUTO_INCREMENT,
- `number` int NULL DEFAULT NULL COMMENT '鏋跺瓙缂栧彿',
- `state` int NULL DEFAULT NULL COMMENT '鐘舵��',
- `raw_package_id` bigint NULL DEFAULT NULL COMMENT '鍖呭彿缂栧彿',
- `mod_time` datetime(0) NULL DEFAULT NULL COMMENT '淇敼鏃堕棿',
- `falg` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '绂佺敤鍚敤',
- `cell` int NULL DEFAULT NULL,
- `cageno` int NULL DEFAULT NULL COMMENT '绗煎瓙鍙�',
- PRIMARY KEY (`id`) USING BTREE,
- INDEX `raw_package_id1`(`raw_package_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 492 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of storage_rack
--- ----------------------------
-INSERT INTO `storage_rack` VALUES (72, 1, 1, NULL, NULL, NULL, 1, 1);
-INSERT INTO `storage_rack` VALUES (73, 1, 1, NULL, NULL, NULL, 2, 1);
-INSERT INTO `storage_rack` VALUES (74, 2, 1, NULL, NULL, NULL, 1, 1);
-INSERT INTO `storage_rack` VALUES (75, 2, 0, NULL, NULL, NULL, 2, 1);
-INSERT INTO `storage_rack` VALUES (76, 3, 1, NULL, NULL, NULL, 1, 1);
-INSERT INTO `storage_rack` VALUES (77, 3, 0, NULL, NULL, NULL, 2, 1);
-INSERT INTO `storage_rack` VALUES (78, 4, 3, NULL, NULL, NULL, 1, 1);
-INSERT INTO `storage_rack` VALUES (79, 4, 3, NULL, NULL, NULL, 2, 1);
-INSERT INTO `storage_rack` VALUES (80, 5, 3, NULL, NULL, NULL, 1, 1);
-INSERT INTO `storage_rack` VALUES (81, 5, 3, NULL, NULL, NULL, 2, 1);
-INSERT INTO `storage_rack` VALUES (82, 6, 0, NULL, NULL, NULL, 1, 1);
-INSERT INTO `storage_rack` VALUES (83, 6, 0, NULL, NULL, NULL, 2, 1);
-INSERT INTO `storage_rack` VALUES (84, 7, 0, NULL, NULL, NULL, 1, 1);
-INSERT INTO `storage_rack` VALUES (85, 7, 0, NULL, NULL, NULL, 2, 1);
-INSERT INTO `storage_rack` VALUES (86, 8, 0, NULL, NULL, NULL, 1, 1);
-INSERT INTO `storage_rack` VALUES (87, 8, 0, NULL, NULL, NULL, 2, 1);
-INSERT INTO `storage_rack` VALUES (88, 9, 1, NULL, NULL, NULL, 1, 1);
-INSERT INTO `storage_rack` VALUES (89, 9, 1, NULL, NULL, NULL, 2, 1);
-INSERT INTO `storage_rack` VALUES (90, 10, 1, NULL, NULL, NULL, 1, 1);
-INSERT INTO `storage_rack` VALUES (91, 10, 1, NULL, NULL, NULL, 2, 1);
-INSERT INTO `storage_rack` VALUES (92, 11, 1, NULL, NULL, NULL, 1, 1);
-INSERT INTO `storage_rack` VALUES (93, 11, 1, NULL, NULL, NULL, 2, 1);
-INSERT INTO `storage_rack` VALUES (94, 12, 1, NULL, NULL, NULL, 1, 1);
-INSERT INTO `storage_rack` VALUES (95, 12, 1, NULL, NULL, NULL, 2, 1);
-INSERT INTO `storage_rack` VALUES (96, 13, 1, NULL, NULL, NULL, 1, 1);
-INSERT INTO `storage_rack` VALUES (97, 13, 1, NULL, NULL, NULL, 2, 1);
-INSERT INTO `storage_rack` VALUES (98, 14, 1, NULL, NULL, NULL, 1, 1);
-INSERT INTO `storage_rack` VALUES (99, 14, 1, NULL, NULL, NULL, 2, 1);
-INSERT INTO `storage_rack` VALUES (100, 15, 1, NULL, NULL, NULL, 1, 1);
-INSERT INTO `storage_rack` VALUES (101, 15, 1, NULL, NULL, NULL, 2, 1);
-INSERT INTO `storage_rack` VALUES (102, 16, 1, NULL, NULL, NULL, 1, 1);
-INSERT INTO `storage_rack` VALUES (103, 16, 1, NULL, NULL, NULL, 2, 1);
-INSERT INTO `storage_rack` VALUES (104, 17, 1, NULL, NULL, NULL, 1, 1);
-INSERT INTO `storage_rack` VALUES (105, 17, 1, NULL, NULL, NULL, 2, 1);
-INSERT INTO `storage_rack` VALUES (106, 18, 1, NULL, NULL, NULL, 1, 1);
-INSERT INTO `storage_rack` VALUES (107, 18, 1, NULL, NULL, NULL, 2, 1);
-INSERT INTO `storage_rack` VALUES (108, 19, 1, NULL, NULL, NULL, 1, 1);
-INSERT INTO `storage_rack` VALUES (109, 19, 1, NULL, NULL, NULL, 2, 1);
-INSERT INTO `storage_rack` VALUES (110, 20, 1, NULL, NULL, NULL, 1, 1);
-INSERT INTO `storage_rack` VALUES (111, 20, 1, NULL, NULL, NULL, 2, 1);
-INSERT INTO `storage_rack` VALUES (112, 21, 1, NULL, NULL, NULL, 1, 1);
-INSERT INTO `storage_rack` VALUES (113, 21, 1, NULL, NULL, NULL, 2, 1);
-INSERT INTO `storage_rack` VALUES (114, 22, 1, NULL, NULL, NULL, 1, 2);
-INSERT INTO `storage_rack` VALUES (115, 22, 1, NULL, NULL, NULL, 2, 2);
-INSERT INTO `storage_rack` VALUES (116, 23, 1, NULL, NULL, NULL, 1, 2);
-INSERT INTO `storage_rack` VALUES (117, 23, 1, NULL, NULL, NULL, 2, 2);
-INSERT INTO `storage_rack` VALUES (118, 24, 1, NULL, NULL, NULL, 1, 2);
-INSERT INTO `storage_rack` VALUES (119, 24, 1, NULL, NULL, NULL, 2, 2);
-INSERT INTO `storage_rack` VALUES (120, 25, 1, NULL, NULL, NULL, 1, 2);
-INSERT INTO `storage_rack` VALUES (121, 25, 1, NULL, NULL, NULL, 2, 2);
-INSERT INTO `storage_rack` VALUES (122, 26, 1, NULL, NULL, NULL, 1, 2);
-INSERT INTO `storage_rack` VALUES (123, 26, 1, NULL, NULL, NULL, 2, 2);
-INSERT INTO `storage_rack` VALUES (124, 27, 1, NULL, NULL, NULL, 1, 2);
-INSERT INTO `storage_rack` VALUES (125, 27, 1, NULL, NULL, NULL, 2, 2);
-INSERT INTO `storage_rack` VALUES (126, 28, 1, NULL, NULL, NULL, 1, 2);
-INSERT INTO `storage_rack` VALUES (127, 28, 1, NULL, NULL, NULL, 2, 2);
-INSERT INTO `storage_rack` VALUES (128, 29, 1, NULL, NULL, NULL, 1, 2);
-INSERT INTO `storage_rack` VALUES (129, 29, 1, NULL, NULL, NULL, 2, 2);
-INSERT INTO `storage_rack` VALUES (130, 30, 1, NULL, NULL, NULL, 1, 2);
-INSERT INTO `storage_rack` VALUES (131, 30, 1, NULL, NULL, NULL, 2, 2);
-INSERT INTO `storage_rack` VALUES (132, 31, 1, NULL, NULL, NULL, 1, 2);
-INSERT INTO `storage_rack` VALUES (133, 31, 1, NULL, NULL, NULL, 2, 2);
-INSERT INTO `storage_rack` VALUES (134, 32, 1, NULL, NULL, NULL, 1, 2);
-INSERT INTO `storage_rack` VALUES (135, 32, 1, NULL, NULL, NULL, 2, 2);
-INSERT INTO `storage_rack` VALUES (136, 33, 1, NULL, NULL, NULL, 1, 2);
-INSERT INTO `storage_rack` VALUES (137, 33, 1, NULL, NULL, NULL, 2, 2);
-INSERT INTO `storage_rack` VALUES (138, 34, 1, NULL, NULL, NULL, 1, 2);
-INSERT INTO `storage_rack` VALUES (139, 34, 1, NULL, NULL, NULL, 2, 2);
-INSERT INTO `storage_rack` VALUES (140, 35, 1, NULL, NULL, NULL, 1, 2);
-INSERT INTO `storage_rack` VALUES (141, 35, 1, NULL, NULL, NULL, 2, 2);
-INSERT INTO `storage_rack` VALUES (142, 36, 1, NULL, NULL, NULL, 1, 2);
-INSERT INTO `storage_rack` VALUES (143, 36, 1, NULL, NULL, NULL, 2, 2);
-INSERT INTO `storage_rack` VALUES (144, 37, 1, NULL, NULL, NULL, 1, 2);
-INSERT INTO `storage_rack` VALUES (145, 37, 1, NULL, NULL, NULL, 2, 2);
-INSERT INTO `storage_rack` VALUES (146, 38, 1, NULL, NULL, NULL, 1, 2);
-INSERT INTO `storage_rack` VALUES (147, 38, 1, NULL, NULL, NULL, 2, 2);
-INSERT INTO `storage_rack` VALUES (148, 39, 1, NULL, NULL, NULL, 1, 2);
-INSERT INTO `storage_rack` VALUES (149, 39, 1, NULL, NULL, NULL, 2, 2);
-INSERT INTO `storage_rack` VALUES (150, 40, 1, NULL, NULL, NULL, 1, 2);
-INSERT INTO `storage_rack` VALUES (151, 40, 1, NULL, NULL, NULL, 2, 2);
-INSERT INTO `storage_rack` VALUES (152, 41, 1, NULL, NULL, NULL, 1, 2);
-INSERT INTO `storage_rack` VALUES (153, 41, 1, NULL, NULL, NULL, 2, 2);
-INSERT INTO `storage_rack` VALUES (154, 42, 1, NULL, NULL, NULL, 1, 2);
-INSERT INTO `storage_rack` VALUES (155, 42, 1, NULL, NULL, NULL, 2, 2);
-INSERT INTO `storage_rack` VALUES (156, 43, 1, NULL, NULL, NULL, 1, 3);
-INSERT INTO `storage_rack` VALUES (157, 43, 1, NULL, NULL, NULL, 2, 3);
-INSERT INTO `storage_rack` VALUES (158, 44, 1, NULL, NULL, NULL, 1, 3);
-INSERT INTO `storage_rack` VALUES (159, 44, 1, NULL, NULL, NULL, 2, 3);
-INSERT INTO `storage_rack` VALUES (160, 45, 1, NULL, NULL, NULL, 1, 3);
-INSERT INTO `storage_rack` VALUES (161, 45, 1, NULL, NULL, NULL, 2, 3);
-INSERT INTO `storage_rack` VALUES (162, 46, 1, NULL, NULL, NULL, 1, 3);
-INSERT INTO `storage_rack` VALUES (163, 46, 1, NULL, NULL, NULL, 2, 3);
-INSERT INTO `storage_rack` VALUES (164, 47, 1, NULL, NULL, NULL, 1, 3);
-INSERT INTO `storage_rack` VALUES (165, 47, 1, NULL, NULL, NULL, 2, 3);
-INSERT INTO `storage_rack` VALUES (166, 48, 1, NULL, NULL, NULL, 1, 3);
-INSERT INTO `storage_rack` VALUES (167, 48, 1, NULL, NULL, NULL, 2, 3);
-INSERT INTO `storage_rack` VALUES (168, 49, 1, NULL, NULL, NULL, 1, 3);
-INSERT INTO `storage_rack` VALUES (169, 49, 1, NULL, NULL, NULL, 2, 3);
-INSERT INTO `storage_rack` VALUES (170, 50, 1, NULL, NULL, NULL, 1, 3);
-INSERT INTO `storage_rack` VALUES (171, 50, 1, NULL, NULL, NULL, 2, 3);
-INSERT INTO `storage_rack` VALUES (172, 51, 1, NULL, NULL, NULL, 1, 3);
-INSERT INTO `storage_rack` VALUES (173, 51, 1, NULL, NULL, NULL, 2, 3);
-INSERT INTO `storage_rack` VALUES (174, 52, 1, NULL, NULL, NULL, 1, 3);
-INSERT INTO `storage_rack` VALUES (175, 52, 1, NULL, NULL, NULL, 2, 3);
-INSERT INTO `storage_rack` VALUES (176, 53, 1, NULL, NULL, NULL, 1, 3);
-INSERT INTO `storage_rack` VALUES (177, 53, 1, NULL, NULL, NULL, 2, 3);
-INSERT INTO `storage_rack` VALUES (178, 54, 1, NULL, NULL, NULL, 1, 3);
-INSERT INTO `storage_rack` VALUES (179, 54, 1, NULL, NULL, NULL, 2, 3);
-INSERT INTO `storage_rack` VALUES (180, 55, 1, NULL, NULL, NULL, 1, 3);
-INSERT INTO `storage_rack` VALUES (181, 55, 1, NULL, NULL, NULL, 2, 3);
-INSERT INTO `storage_rack` VALUES (182, 56, 1, NULL, NULL, NULL, 1, 3);
-INSERT INTO `storage_rack` VALUES (183, 56, 1, NULL, NULL, NULL, 2, 3);
-INSERT INTO `storage_rack` VALUES (184, 57, 1, NULL, NULL, NULL, 1, 3);
-INSERT INTO `storage_rack` VALUES (185, 57, 1, NULL, NULL, NULL, 2, 3);
-INSERT INTO `storage_rack` VALUES (186, 58, 1, NULL, NULL, NULL, 1, 3);
-INSERT INTO `storage_rack` VALUES (187, 58, 1, NULL, NULL, NULL, 2, 3);
-INSERT INTO `storage_rack` VALUES (188, 59, 1, NULL, NULL, NULL, 1, 3);
-INSERT INTO `storage_rack` VALUES (189, 59, 1, NULL, NULL, NULL, 2, 3);
-INSERT INTO `storage_rack` VALUES (190, 60, 1, NULL, NULL, NULL, 1, 3);
-INSERT INTO `storage_rack` VALUES (191, 60, 1, NULL, NULL, NULL, 2, 3);
-INSERT INTO `storage_rack` VALUES (192, 61, 1, NULL, NULL, NULL, 1, 3);
-INSERT INTO `storage_rack` VALUES (193, 61, 1, NULL, NULL, NULL, 2, 3);
-INSERT INTO `storage_rack` VALUES (194, 62, 1, NULL, NULL, NULL, 1, 3);
-INSERT INTO `storage_rack` VALUES (195, 62, 1, NULL, NULL, NULL, 2, 3);
-INSERT INTO `storage_rack` VALUES (196, 63, 1, NULL, NULL, NULL, 1, 3);
-INSERT INTO `storage_rack` VALUES (197, 63, 1, NULL, NULL, NULL, 2, 3);
-INSERT INTO `storage_rack` VALUES (198, 64, 1, NULL, NULL, NULL, 1, 4);
-INSERT INTO `storage_rack` VALUES (199, 64, 1, NULL, NULL, NULL, 2, 4);
-INSERT INTO `storage_rack` VALUES (200, 65, 1, NULL, NULL, NULL, 1, 4);
-INSERT INTO `storage_rack` VALUES (201, 65, 1, NULL, NULL, NULL, 2, 4);
-INSERT INTO `storage_rack` VALUES (202, 66, 1, NULL, NULL, NULL, 1, 4);
-INSERT INTO `storage_rack` VALUES (203, 66, 1, NULL, NULL, NULL, 2, 4);
-INSERT INTO `storage_rack` VALUES (204, 67, 1, NULL, NULL, NULL, 1, 4);
-INSERT INTO `storage_rack` VALUES (205, 67, 1, NULL, NULL, NULL, 2, 4);
-INSERT INTO `storage_rack` VALUES (206, 68, 1, NULL, NULL, NULL, 1, 4);
-INSERT INTO `storage_rack` VALUES (207, 68, 1, NULL, NULL, NULL, 2, 4);
-INSERT INTO `storage_rack` VALUES (208, 69, 1, NULL, NULL, NULL, 1, 4);
-INSERT INTO `storage_rack` VALUES (209, 69, 1, NULL, NULL, NULL, 2, 4);
-INSERT INTO `storage_rack` VALUES (210, 70, 1, NULL, NULL, NULL, 1, 4);
-INSERT INTO `storage_rack` VALUES (211, 70, 1, NULL, NULL, NULL, 2, 4);
-INSERT INTO `storage_rack` VALUES (212, 71, 1, NULL, NULL, NULL, 1, 4);
-INSERT INTO `storage_rack` VALUES (213, 71, 1, NULL, NULL, NULL, 2, 4);
-INSERT INTO `storage_rack` VALUES (214, 72, 1, NULL, NULL, NULL, 1, 4);
-INSERT INTO `storage_rack` VALUES (215, 72, 1, NULL, NULL, NULL, 2, 4);
-INSERT INTO `storage_rack` VALUES (216, 73, 1, NULL, NULL, NULL, 1, 4);
-INSERT INTO `storage_rack` VALUES (217, 73, 1, NULL, NULL, NULL, 2, 4);
-INSERT INTO `storage_rack` VALUES (218, 74, 1, NULL, NULL, NULL, 1, 4);
-INSERT INTO `storage_rack` VALUES (219, 74, 1, NULL, NULL, NULL, 2, 4);
-INSERT INTO `storage_rack` VALUES (220, 75, 1, NULL, NULL, NULL, 1, 4);
-INSERT INTO `storage_rack` VALUES (221, 75, 1, NULL, NULL, NULL, 2, 4);
-INSERT INTO `storage_rack` VALUES (222, 76, 1, NULL, NULL, NULL, 1, 4);
-INSERT INTO `storage_rack` VALUES (223, 76, 1, NULL, NULL, NULL, 2, 4);
-INSERT INTO `storage_rack` VALUES (224, 77, 1, NULL, NULL, NULL, 1, 4);
-INSERT INTO `storage_rack` VALUES (225, 77, 1, NULL, NULL, NULL, 2, 4);
-INSERT INTO `storage_rack` VALUES (226, 78, 1, NULL, NULL, NULL, 1, 4);
-INSERT INTO `storage_rack` VALUES (227, 78, 1, NULL, NULL, NULL, 2, 4);
-INSERT INTO `storage_rack` VALUES (228, 79, 1, NULL, NULL, NULL, 1, 4);
-INSERT INTO `storage_rack` VALUES (229, 79, 1, NULL, NULL, NULL, 2, 4);
-INSERT INTO `storage_rack` VALUES (230, 80, 1, NULL, NULL, NULL, 1, 4);
-INSERT INTO `storage_rack` VALUES (231, 80, 1, NULL, NULL, NULL, 2, 4);
-INSERT INTO `storage_rack` VALUES (232, 81, 1, NULL, NULL, NULL, 1, 4);
-INSERT INTO `storage_rack` VALUES (233, 81, 1, NULL, NULL, NULL, 2, 4);
-INSERT INTO `storage_rack` VALUES (234, 82, 1, NULL, NULL, NULL, 1, 4);
-INSERT INTO `storage_rack` VALUES (235, 82, 1, NULL, NULL, NULL, 2, 4);
-INSERT INTO `storage_rack` VALUES (236, 83, 1, NULL, NULL, NULL, 1, 4);
-INSERT INTO `storage_rack` VALUES (237, 83, 1, NULL, NULL, NULL, 2, 4);
-INSERT INTO `storage_rack` VALUES (238, 84, 1, NULL, NULL, NULL, 1, 4);
-INSERT INTO `storage_rack` VALUES (239, 84, 1, NULL, NULL, NULL, 2, 4);
-INSERT INTO `storage_rack` VALUES (240, 85, 1, NULL, NULL, NULL, 1, 5);
-INSERT INTO `storage_rack` VALUES (241, 85, 1, NULL, NULL, NULL, 2, 5);
-INSERT INTO `storage_rack` VALUES (242, 86, 1, NULL, NULL, NULL, 1, 5);
-INSERT INTO `storage_rack` VALUES (243, 86, 1, NULL, NULL, NULL, 2, 5);
-INSERT INTO `storage_rack` VALUES (244, 87, 1, NULL, NULL, NULL, 1, 5);
-INSERT INTO `storage_rack` VALUES (245, 87, 1, NULL, NULL, NULL, 2, 5);
-INSERT INTO `storage_rack` VALUES (246, 88, 1, NULL, NULL, NULL, 1, 5);
-INSERT INTO `storage_rack` VALUES (247, 88, 1, NULL, NULL, NULL, 2, 5);
-INSERT INTO `storage_rack` VALUES (248, 89, 1, NULL, NULL, NULL, 1, 5);
-INSERT INTO `storage_rack` VALUES (249, 89, 1, NULL, NULL, NULL, 2, 5);
-INSERT INTO `storage_rack` VALUES (250, 90, 1, NULL, NULL, NULL, 1, 5);
-INSERT INTO `storage_rack` VALUES (251, 90, 1, NULL, NULL, NULL, 2, 5);
-INSERT INTO `storage_rack` VALUES (252, 91, 1, NULL, NULL, NULL, 1, 5);
-INSERT INTO `storage_rack` VALUES (253, 91, 1, NULL, NULL, NULL, 2, 5);
-INSERT INTO `storage_rack` VALUES (254, 92, 1, NULL, NULL, NULL, 1, 5);
-INSERT INTO `storage_rack` VALUES (255, 92, 1, NULL, NULL, NULL, 2, 5);
-INSERT INTO `storage_rack` VALUES (256, 93, 1, NULL, NULL, NULL, 1, 5);
-INSERT INTO `storage_rack` VALUES (257, 93, 1, NULL, NULL, NULL, 2, 5);
-INSERT INTO `storage_rack` VALUES (258, 94, 1, NULL, NULL, NULL, 1, 5);
-INSERT INTO `storage_rack` VALUES (259, 94, 1, NULL, NULL, NULL, 2, 5);
-INSERT INTO `storage_rack` VALUES (260, 95, 1, NULL, NULL, NULL, 1, 5);
-INSERT INTO `storage_rack` VALUES (261, 95, 1, NULL, NULL, NULL, 2, 5);
-INSERT INTO `storage_rack` VALUES (262, 96, 1, NULL, NULL, NULL, 1, 5);
-INSERT INTO `storage_rack` VALUES (263, 96, 1, NULL, NULL, NULL, 2, 5);
-INSERT INTO `storage_rack` VALUES (264, 97, 1, NULL, NULL, NULL, 1, 5);
-INSERT INTO `storage_rack` VALUES (265, 97, 1, NULL, NULL, NULL, 2, 5);
-INSERT INTO `storage_rack` VALUES (266, 98, 1, NULL, NULL, NULL, 1, 5);
-INSERT INTO `storage_rack` VALUES (267, 98, 1, NULL, NULL, NULL, 2, 5);
-INSERT INTO `storage_rack` VALUES (268, 99, 1, NULL, NULL, NULL, 1, 5);
-INSERT INTO `storage_rack` VALUES (269, 99, 1, NULL, NULL, NULL, 2, 5);
-INSERT INTO `storage_rack` VALUES (270, 100, 1, NULL, NULL, NULL, 1, 5);
-INSERT INTO `storage_rack` VALUES (271, 100, 1, NULL, NULL, NULL, 2, 5);
-INSERT INTO `storage_rack` VALUES (272, 101, 1, NULL, NULL, NULL, 1, 5);
-INSERT INTO `storage_rack` VALUES (273, 101, 1, NULL, NULL, NULL, 2, 5);
-INSERT INTO `storage_rack` VALUES (274, 102, 1, NULL, NULL, NULL, 1, 5);
-INSERT INTO `storage_rack` VALUES (275, 102, 1, NULL, NULL, NULL, 2, 5);
-INSERT INTO `storage_rack` VALUES (276, 103, 1, NULL, NULL, NULL, 1, 5);
-INSERT INTO `storage_rack` VALUES (277, 103, 1, NULL, NULL, NULL, 2, 5);
-INSERT INTO `storage_rack` VALUES (278, 104, 1, NULL, NULL, NULL, 1, 5);
-INSERT INTO `storage_rack` VALUES (279, 104, 1, NULL, NULL, NULL, 2, 5);
-INSERT INTO `storage_rack` VALUES (280, 105, 1, NULL, NULL, NULL, 1, 5);
-INSERT INTO `storage_rack` VALUES (281, 105, 1, NULL, NULL, NULL, 2, 5);
-INSERT INTO `storage_rack` VALUES (282, 106, 1, NULL, NULL, NULL, 1, 6);
-INSERT INTO `storage_rack` VALUES (283, 106, 1, NULL, NULL, NULL, 2, 6);
-INSERT INTO `storage_rack` VALUES (284, 107, 1, NULL, NULL, NULL, 1, 6);
-INSERT INTO `storage_rack` VALUES (285, 107, 1, NULL, NULL, NULL, 2, 6);
-INSERT INTO `storage_rack` VALUES (286, 108, 1, NULL, NULL, NULL, 1, 6);
-INSERT INTO `storage_rack` VALUES (287, 108, 1, NULL, NULL, NULL, 2, 6);
-INSERT INTO `storage_rack` VALUES (288, 109, 1, NULL, NULL, NULL, 1, 6);
-INSERT INTO `storage_rack` VALUES (289, 109, 1, NULL, NULL, NULL, 2, 6);
-INSERT INTO `storage_rack` VALUES (290, 110, 1, NULL, NULL, NULL, 1, 6);
-INSERT INTO `storage_rack` VALUES (291, 110, 1, NULL, NULL, NULL, 2, 6);
-INSERT INTO `storage_rack` VALUES (292, 111, 1, NULL, NULL, NULL, 1, 6);
-INSERT INTO `storage_rack` VALUES (293, 111, 1, NULL, NULL, NULL, 2, 6);
-INSERT INTO `storage_rack` VALUES (294, 112, 1, NULL, NULL, NULL, 1, 6);
-INSERT INTO `storage_rack` VALUES (295, 112, 1, NULL, NULL, NULL, 2, 6);
-INSERT INTO `storage_rack` VALUES (296, 113, 1, NULL, NULL, NULL, 1, 6);
-INSERT INTO `storage_rack` VALUES (297, 113, 1, NULL, NULL, NULL, 2, 6);
-INSERT INTO `storage_rack` VALUES (298, 114, 1, NULL, NULL, NULL, 1, 6);
-INSERT INTO `storage_rack` VALUES (299, 114, 1, NULL, NULL, NULL, 2, 6);
-INSERT INTO `storage_rack` VALUES (300, 115, 1, NULL, NULL, NULL, 1, 6);
-INSERT INTO `storage_rack` VALUES (301, 115, 1, NULL, NULL, NULL, 2, 6);
-INSERT INTO `storage_rack` VALUES (302, 116, 1, NULL, NULL, NULL, 1, 6);
-INSERT INTO `storage_rack` VALUES (303, 116, 1, NULL, NULL, NULL, 2, 6);
-INSERT INTO `storage_rack` VALUES (304, 117, 1, NULL, NULL, NULL, 1, 6);
-INSERT INTO `storage_rack` VALUES (305, 117, 1, NULL, NULL, NULL, 2, 6);
-INSERT INTO `storage_rack` VALUES (306, 118, 1, NULL, NULL, NULL, 1, 6);
-INSERT INTO `storage_rack` VALUES (307, 118, 1, NULL, NULL, NULL, 2, 6);
-INSERT INTO `storage_rack` VALUES (308, 119, 1, NULL, NULL, NULL, 1, 6);
-INSERT INTO `storage_rack` VALUES (309, 119, 1, NULL, NULL, NULL, 2, 6);
-INSERT INTO `storage_rack` VALUES (310, 120, 1, NULL, NULL, NULL, 1, 6);
-INSERT INTO `storage_rack` VALUES (311, 120, 1, NULL, NULL, NULL, 2, 6);
-INSERT INTO `storage_rack` VALUES (312, 121, 1, NULL, NULL, NULL, 1, 6);
-INSERT INTO `storage_rack` VALUES (313, 121, 1, NULL, NULL, NULL, 2, 6);
-INSERT INTO `storage_rack` VALUES (314, 122, 1, NULL, NULL, NULL, 1, 6);
-INSERT INTO `storage_rack` VALUES (315, 122, 1, NULL, NULL, NULL, 2, 6);
-INSERT INTO `storage_rack` VALUES (316, 123, 1, NULL, NULL, NULL, 1, 6);
-INSERT INTO `storage_rack` VALUES (317, 123, 1, NULL, NULL, NULL, 2, 6);
-INSERT INTO `storage_rack` VALUES (318, 124, 1, NULL, NULL, NULL, 1, 6);
-INSERT INTO `storage_rack` VALUES (319, 124, 1, NULL, NULL, NULL, 2, 6);
-INSERT INTO `storage_rack` VALUES (320, 125, 1, NULL, NULL, NULL, 1, 6);
-INSERT INTO `storage_rack` VALUES (321, 125, 1, NULL, NULL, NULL, 2, 6);
-INSERT INTO `storage_rack` VALUES (322, 126, 1, NULL, NULL, NULL, 1, 6);
-INSERT INTO `storage_rack` VALUES (323, 126, 1, NULL, NULL, NULL, 2, 6);
-INSERT INTO `storage_rack` VALUES (324, 127, 1, NULL, NULL, NULL, 1, 7);
-INSERT INTO `storage_rack` VALUES (325, 127, 1, NULL, NULL, NULL, 2, 7);
-INSERT INTO `storage_rack` VALUES (326, 128, 1, NULL, NULL, NULL, 1, 7);
-INSERT INTO `storage_rack` VALUES (327, 128, 1, NULL, NULL, NULL, 2, 7);
-INSERT INTO `storage_rack` VALUES (328, 129, 1, NULL, NULL, NULL, 1, 7);
-INSERT INTO `storage_rack` VALUES (329, 129, 1, NULL, NULL, NULL, 2, 7);
-INSERT INTO `storage_rack` VALUES (330, 130, 1, NULL, NULL, NULL, 1, 7);
-INSERT INTO `storage_rack` VALUES (331, 130, 1, NULL, NULL, NULL, 2, 7);
-INSERT INTO `storage_rack` VALUES (332, 131, 1, NULL, NULL, NULL, 1, 7);
-INSERT INTO `storage_rack` VALUES (333, 131, 1, NULL, NULL, NULL, 2, 7);
-INSERT INTO `storage_rack` VALUES (334, 132, 1, NULL, NULL, NULL, 1, 7);
-INSERT INTO `storage_rack` VALUES (335, 132, 1, NULL, NULL, NULL, 2, 7);
-INSERT INTO `storage_rack` VALUES (336, 133, 1, NULL, NULL, NULL, 1, 7);
-INSERT INTO `storage_rack` VALUES (337, 133, 1, NULL, NULL, NULL, 2, 7);
-INSERT INTO `storage_rack` VALUES (338, 134, 1, NULL, NULL, NULL, 1, 7);
-INSERT INTO `storage_rack` VALUES (339, 134, 1, NULL, NULL, NULL, 2, 7);
-INSERT INTO `storage_rack` VALUES (340, 135, 1, NULL, NULL, NULL, 1, 7);
-INSERT INTO `storage_rack` VALUES (341, 135, 1, NULL, NULL, NULL, 2, 7);
-INSERT INTO `storage_rack` VALUES (342, 136, 1, NULL, NULL, NULL, 1, 7);
-INSERT INTO `storage_rack` VALUES (343, 136, 1, NULL, NULL, NULL, 2, 7);
-INSERT INTO `storage_rack` VALUES (344, 137, 1, NULL, NULL, NULL, 1, 7);
-INSERT INTO `storage_rack` VALUES (345, 137, 1, NULL, NULL, NULL, 2, 7);
-INSERT INTO `storage_rack` VALUES (346, 138, 1, NULL, NULL, NULL, 1, 7);
-INSERT INTO `storage_rack` VALUES (347, 138, 1, NULL, NULL, NULL, 2, 7);
-INSERT INTO `storage_rack` VALUES (348, 139, 1, NULL, NULL, NULL, 1, 7);
-INSERT INTO `storage_rack` VALUES (349, 139, 1, NULL, NULL, NULL, 2, 7);
-INSERT INTO `storage_rack` VALUES (350, 140, 1, NULL, NULL, NULL, 1, 7);
-INSERT INTO `storage_rack` VALUES (351, 140, 1, NULL, NULL, NULL, 2, 7);
-INSERT INTO `storage_rack` VALUES (352, 141, 1, NULL, NULL, NULL, 1, 7);
-INSERT INTO `storage_rack` VALUES (353, 141, 1, NULL, NULL, NULL, 2, 7);
-INSERT INTO `storage_rack` VALUES (354, 142, 1, NULL, NULL, NULL, 1, 7);
-INSERT INTO `storage_rack` VALUES (355, 142, 1, NULL, NULL, NULL, 2, 7);
-INSERT INTO `storage_rack` VALUES (356, 143, 1, NULL, NULL, NULL, 1, 7);
-INSERT INTO `storage_rack` VALUES (357, 143, 1, NULL, NULL, NULL, 2, 7);
-INSERT INTO `storage_rack` VALUES (358, 144, 1, NULL, NULL, NULL, 1, 7);
-INSERT INTO `storage_rack` VALUES (359, 144, 1, NULL, NULL, NULL, 2, 7);
-INSERT INTO `storage_rack` VALUES (360, 145, 1, NULL, NULL, NULL, 1, 7);
-INSERT INTO `storage_rack` VALUES (361, 145, 1, NULL, NULL, NULL, 2, 7);
-INSERT INTO `storage_rack` VALUES (362, 146, 1, NULL, NULL, NULL, 1, 7);
-INSERT INTO `storage_rack` VALUES (363, 146, 1, NULL, NULL, NULL, 2, 7);
-INSERT INTO `storage_rack` VALUES (364, 147, 1, NULL, NULL, NULL, 1, 7);
-INSERT INTO `storage_rack` VALUES (365, 147, 1, NULL, NULL, NULL, 2, 7);
-INSERT INTO `storage_rack` VALUES (366, 148, 1, NULL, NULL, NULL, 1, 8);
-INSERT INTO `storage_rack` VALUES (367, 148, 1, NULL, NULL, NULL, 2, 8);
-INSERT INTO `storage_rack` VALUES (368, 149, 1, NULL, NULL, NULL, 1, 8);
-INSERT INTO `storage_rack` VALUES (369, 149, 1, NULL, NULL, NULL, 2, 8);
-INSERT INTO `storage_rack` VALUES (370, 150, 1, NULL, NULL, NULL, 1, 8);
-INSERT INTO `storage_rack` VALUES (371, 150, 1, NULL, NULL, NULL, 2, 8);
-INSERT INTO `storage_rack` VALUES (372, 151, 1, NULL, NULL, NULL, 1, 8);
-INSERT INTO `storage_rack` VALUES (373, 151, 1, NULL, NULL, NULL, 2, 8);
-INSERT INTO `storage_rack` VALUES (374, 152, 1, NULL, NULL, NULL, 1, 8);
-INSERT INTO `storage_rack` VALUES (375, 152, 1, NULL, NULL, NULL, 2, 8);
-INSERT INTO `storage_rack` VALUES (376, 153, 1, NULL, NULL, NULL, 1, 8);
-INSERT INTO `storage_rack` VALUES (377, 153, 1, NULL, NULL, NULL, 2, 8);
-INSERT INTO `storage_rack` VALUES (378, 154, 1, NULL, NULL, NULL, 1, 8);
-INSERT INTO `storage_rack` VALUES (379, 154, 1, NULL, NULL, NULL, 2, 8);
-INSERT INTO `storage_rack` VALUES (380, 155, 1, NULL, NULL, NULL, 1, 8);
-INSERT INTO `storage_rack` VALUES (381, 155, 1, NULL, NULL, NULL, 2, 8);
-INSERT INTO `storage_rack` VALUES (382, 156, 1, NULL, NULL, NULL, 1, 8);
-INSERT INTO `storage_rack` VALUES (383, 156, 1, NULL, NULL, NULL, 2, 8);
-INSERT INTO `storage_rack` VALUES (384, 157, 1, NULL, NULL, NULL, 1, 8);
-INSERT INTO `storage_rack` VALUES (385, 157, 1, NULL, NULL, NULL, 2, 8);
-INSERT INTO `storage_rack` VALUES (386, 158, 1, NULL, NULL, NULL, 1, 8);
-INSERT INTO `storage_rack` VALUES (387, 158, 1, NULL, NULL, NULL, 2, 8);
-INSERT INTO `storage_rack` VALUES (388, 159, 1, NULL, NULL, NULL, 1, 8);
-INSERT INTO `storage_rack` VALUES (389, 159, 1, NULL, NULL, NULL, 2, 8);
-INSERT INTO `storage_rack` VALUES (390, 160, 1, NULL, NULL, NULL, 1, 8);
-INSERT INTO `storage_rack` VALUES (391, 160, 1, NULL, NULL, NULL, 2, 8);
-INSERT INTO `storage_rack` VALUES (392, 161, 1, NULL, NULL, NULL, 1, 8);
-INSERT INTO `storage_rack` VALUES (393, 161, 1, NULL, NULL, NULL, 2, 8);
-INSERT INTO `storage_rack` VALUES (394, 162, 1, NULL, NULL, NULL, 1, 8);
-INSERT INTO `storage_rack` VALUES (395, 162, 1, NULL, NULL, NULL, 2, 8);
-INSERT INTO `storage_rack` VALUES (396, 163, 1, NULL, NULL, NULL, 1, 8);
-INSERT INTO `storage_rack` VALUES (397, 163, 1, NULL, NULL, NULL, 2, 8);
-INSERT INTO `storage_rack` VALUES (398, 164, 1, NULL, NULL, NULL, 1, 8);
-INSERT INTO `storage_rack` VALUES (399, 164, 1, NULL, NULL, NULL, 2, 8);
-INSERT INTO `storage_rack` VALUES (400, 165, 1, NULL, NULL, NULL, 1, 8);
-INSERT INTO `storage_rack` VALUES (401, 165, 1, NULL, NULL, NULL, 2, 8);
-INSERT INTO `storage_rack` VALUES (402, 166, 1, NULL, NULL, NULL, 1, 8);
-INSERT INTO `storage_rack` VALUES (403, 166, 1, NULL, NULL, NULL, 2, 8);
-INSERT INTO `storage_rack` VALUES (404, 167, 1, NULL, NULL, NULL, 1, 8);
-INSERT INTO `storage_rack` VALUES (405, 167, 1, NULL, NULL, NULL, 2, 8);
-INSERT INTO `storage_rack` VALUES (406, 168, 1, NULL, NULL, NULL, 1, 8);
-INSERT INTO `storage_rack` VALUES (407, 168, 1, NULL, NULL, NULL, 2, 8);
-INSERT INTO `storage_rack` VALUES (408, 169, 1, NULL, NULL, NULL, 1, 9);
-INSERT INTO `storage_rack` VALUES (409, 169, 1, NULL, NULL, NULL, 2, 9);
-INSERT INTO `storage_rack` VALUES (410, 170, 1, NULL, NULL, NULL, 1, 9);
-INSERT INTO `storage_rack` VALUES (411, 170, 1, NULL, NULL, NULL, 2, 9);
-INSERT INTO `storage_rack` VALUES (412, 171, 1, NULL, NULL, NULL, 1, 9);
-INSERT INTO `storage_rack` VALUES (413, 171, 1, NULL, NULL, NULL, 2, 9);
-INSERT INTO `storage_rack` VALUES (414, 172, 1, NULL, NULL, NULL, 1, 9);
-INSERT INTO `storage_rack` VALUES (415, 172, 1, NULL, NULL, NULL, 2, 9);
-INSERT INTO `storage_rack` VALUES (416, 173, 1, NULL, NULL, NULL, 1, 9);
-INSERT INTO `storage_rack` VALUES (417, 173, 1, NULL, NULL, NULL, 2, 9);
-INSERT INTO `storage_rack` VALUES (418, 174, 1, NULL, NULL, NULL, 1, 9);
-INSERT INTO `storage_rack` VALUES (419, 174, 1, NULL, NULL, NULL, 2, 9);
-INSERT INTO `storage_rack` VALUES (420, 175, 1, NULL, NULL, NULL, 1, 9);
-INSERT INTO `storage_rack` VALUES (421, 175, 1, NULL, NULL, NULL, 2, 9);
-INSERT INTO `storage_rack` VALUES (422, 176, 1, NULL, NULL, NULL, 1, 9);
-INSERT INTO `storage_rack` VALUES (423, 176, 1, NULL, NULL, NULL, 2, 9);
-INSERT INTO `storage_rack` VALUES (424, 177, 1, NULL, NULL, NULL, 1, 9);
-INSERT INTO `storage_rack` VALUES (425, 177, 1, NULL, NULL, NULL, 2, 9);
-INSERT INTO `storage_rack` VALUES (426, 178, 1, NULL, NULL, NULL, 1, 9);
-INSERT INTO `storage_rack` VALUES (427, 178, 1, NULL, NULL, NULL, 2, 9);
-INSERT INTO `storage_rack` VALUES (428, 179, 1, NULL, NULL, NULL, 1, 9);
-INSERT INTO `storage_rack` VALUES (429, 179, 1, NULL, NULL, NULL, 2, 9);
-INSERT INTO `storage_rack` VALUES (430, 180, 1, NULL, NULL, NULL, 1, 9);
-INSERT INTO `storage_rack` VALUES (431, 180, 1, NULL, NULL, NULL, 2, 9);
-INSERT INTO `storage_rack` VALUES (432, 181, 1, NULL, NULL, NULL, 1, 9);
-INSERT INTO `storage_rack` VALUES (433, 181, 1, NULL, NULL, NULL, 2, 9);
-INSERT INTO `storage_rack` VALUES (434, 182, 1, NULL, NULL, NULL, 1, 9);
-INSERT INTO `storage_rack` VALUES (435, 182, 1, NULL, NULL, NULL, 2, 9);
-INSERT INTO `storage_rack` VALUES (436, 183, 1, NULL, NULL, NULL, 1, 9);
-INSERT INTO `storage_rack` VALUES (437, 183, 1, NULL, NULL, NULL, 2, 9);
-INSERT INTO `storage_rack` VALUES (438, 184, 1, NULL, NULL, NULL, 1, 9);
-INSERT INTO `storage_rack` VALUES (439, 184, 1, NULL, NULL, NULL, 2, 9);
-INSERT INTO `storage_rack` VALUES (440, 185, 1, NULL, NULL, NULL, 1, 9);
-INSERT INTO `storage_rack` VALUES (441, 185, 1, NULL, NULL, NULL, 2, 9);
-INSERT INTO `storage_rack` VALUES (442, 186, 1, NULL, NULL, NULL, 1, 9);
-INSERT INTO `storage_rack` VALUES (443, 186, 1, NULL, NULL, NULL, 2, 9);
-INSERT INTO `storage_rack` VALUES (444, 187, 1, NULL, NULL, NULL, 1, 9);
-INSERT INTO `storage_rack` VALUES (445, 187, 1, NULL, NULL, NULL, 2, 9);
-INSERT INTO `storage_rack` VALUES (446, 188, 1, NULL, NULL, NULL, 1, 9);
-INSERT INTO `storage_rack` VALUES (447, 188, 1, NULL, NULL, NULL, 2, 9);
-INSERT INTO `storage_rack` VALUES (448, 189, 1, NULL, NULL, NULL, 1, 9);
-INSERT INTO `storage_rack` VALUES (449, 189, 1, NULL, NULL, NULL, 2, 9);
-INSERT INTO `storage_rack` VALUES (450, 190, 1, NULL, NULL, NULL, 1, 10);
-INSERT INTO `storage_rack` VALUES (451, 190, 1, NULL, NULL, NULL, 2, 10);
-INSERT INTO `storage_rack` VALUES (452, 191, 1, NULL, NULL, NULL, 1, 10);
-INSERT INTO `storage_rack` VALUES (453, 191, 1, NULL, NULL, NULL, 2, 10);
-INSERT INTO `storage_rack` VALUES (454, 192, 1, NULL, NULL, NULL, 1, 10);
-INSERT INTO `storage_rack` VALUES (455, 192, 1, NULL, NULL, NULL, 2, 10);
-INSERT INTO `storage_rack` VALUES (456, 193, 1, NULL, NULL, NULL, 1, 10);
-INSERT INTO `storage_rack` VALUES (457, 193, 1, NULL, NULL, NULL, 2, 10);
-INSERT INTO `storage_rack` VALUES (458, 194, 1, NULL, NULL, NULL, 1, 10);
-INSERT INTO `storage_rack` VALUES (459, 194, 1, NULL, NULL, NULL, 2, 10);
-INSERT INTO `storage_rack` VALUES (460, 195, 1, NULL, NULL, NULL, 1, 10);
-INSERT INTO `storage_rack` VALUES (461, 195, 1, NULL, NULL, NULL, 2, 10);
-INSERT INTO `storage_rack` VALUES (462, 196, 1, NULL, NULL, NULL, 1, 10);
-INSERT INTO `storage_rack` VALUES (463, 196, 1, NULL, NULL, NULL, 2, 10);
-INSERT INTO `storage_rack` VALUES (464, 197, 1, NULL, NULL, NULL, 1, 10);
-INSERT INTO `storage_rack` VALUES (465, 197, 1, NULL, NULL, NULL, 2, 10);
-INSERT INTO `storage_rack` VALUES (466, 198, 1, NULL, NULL, NULL, 1, 10);
-INSERT INTO `storage_rack` VALUES (467, 198, 1, NULL, NULL, NULL, 2, 10);
-INSERT INTO `storage_rack` VALUES (468, 199, 1, NULL, NULL, NULL, 1, 10);
-INSERT INTO `storage_rack` VALUES (469, 199, 1, NULL, NULL, NULL, 2, 10);
-INSERT INTO `storage_rack` VALUES (470, 200, 1, NULL, NULL, NULL, 1, 10);
-INSERT INTO `storage_rack` VALUES (471, 200, 1, NULL, NULL, NULL, 2, 10);
-INSERT INTO `storage_rack` VALUES (472, 201, 1, NULL, NULL, NULL, 1, 10);
-INSERT INTO `storage_rack` VALUES (473, 201, 1, NULL, NULL, NULL, 2, 10);
-INSERT INTO `storage_rack` VALUES (474, 202, 1, NULL, NULL, NULL, 1, 10);
-INSERT INTO `storage_rack` VALUES (475, 202, 1, NULL, NULL, NULL, 2, 10);
-INSERT INTO `storage_rack` VALUES (476, 203, 1, NULL, NULL, NULL, 1, 10);
-INSERT INTO `storage_rack` VALUES (477, 203, 1, NULL, NULL, NULL, 2, 10);
-INSERT INTO `storage_rack` VALUES (478, 204, 1, NULL, NULL, NULL, 1, 10);
-INSERT INTO `storage_rack` VALUES (479, 204, 1, NULL, NULL, NULL, 2, 10);
-INSERT INTO `storage_rack` VALUES (480, 205, 1, NULL, NULL, NULL, 1, 10);
-INSERT INTO `storage_rack` VALUES (481, 205, 1, NULL, NULL, NULL, 2, 10);
-INSERT INTO `storage_rack` VALUES (482, 206, 1, NULL, NULL, NULL, 1, 10);
-INSERT INTO `storage_rack` VALUES (483, 206, 1, NULL, NULL, NULL, 2, 10);
-INSERT INTO `storage_rack` VALUES (484, 207, 1, NULL, NULL, NULL, 1, 10);
-INSERT INTO `storage_rack` VALUES (485, 207, 1, NULL, NULL, NULL, 2, 10);
-INSERT INTO `storage_rack` VALUES (486, 208, 1, NULL, NULL, NULL, 1, 10);
-INSERT INTO `storage_rack` VALUES (487, 208, 1, NULL, NULL, NULL, 2, 10);
-INSERT INTO `storage_rack` VALUES (488, 209, 1, NULL, NULL, NULL, 1, 10);
-INSERT INTO `storage_rack` VALUES (489, 209, 1, NULL, NULL, NULL, 2, 10);
-INSERT INTO `storage_rack` VALUES (490, 210, 1, NULL, NULL, NULL, 1, 10);
-INSERT INTO `storage_rack` VALUES (491, 210, 1, NULL, NULL, NULL, 2, 10);
-
--- ----------------------------
--- Table structure for storage_task
--- ----------------------------
-DROP TABLE IF EXISTS `storage_task`;
-CREATE TABLE `storage_task` (
- `id` int NOT NULL AUTO_INCREMENT COMMENT '搴忓彿',
- `task_type` int NULL DEFAULT NULL COMMENT '浠诲姟绫诲瀷锛�0锛氳繘鐗囷紝1锛氬嚭鐗囷紝2锛氳皟搴︼級',
- `task_state` int NULL DEFAULT NULL COMMENT '浠诲姟鐘舵�侊紙0锛氭湭瀹屾垚锛�1锛氬畬鎴愶級',
- `shelf_rack` int NULL DEFAULT NULL COMMENT '寮�濮嬩綅缃�',
- `load_rack` int NULL DEFAULT NULL COMMENT '缁撴潫浣嶇疆',
- `start_time` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '浠诲姟寮�濮嬫椂闂�',
- `finsh_time` datetime(0) NULL DEFAULT NULL COMMENT '浠诲姟缁撴潫鏃堕棿',
- PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of storage_task
--- ----------------------------
-INSERT INTO `storage_task` VALUES (1, 0, 1, 6, 105, '2023-09-07 10:11:47', '2023-08-29 00:00:00');
-INSERT INTO `storage_task` VALUES (2, 1, 1, 7, 99, '2023-09-07 16:53:35', '2023-08-29 00:00:00');
-INSERT INTO `storage_task` VALUES (3, 2, 0, 26, 105, '2023-09-05 16:24:30', '2023-08-29 00:00:00');
-
--- ----------------------------
--- Table structure for user
--- ----------------------------
-DROP TABLE IF EXISTS `user`;
-CREATE TABLE `user` (
- `id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭',
- `parent_id` bigint NOT NULL DEFAULT 1 COMMENT '涓婄骇id',
- `path` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '1-' COMMENT '璺緞',
- `level` int NOT NULL DEFAULT 1 COMMENT '绛夌骇',
- `role_id` bigint NOT NULL DEFAULT 2 COMMENT '瑙掕壊id',
- `username` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '鐢ㄦ埛鍚�',
- `password` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '瀵嗙爜',
- `email` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '閭',
- `qq` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'qq鍙�',
- `phone` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鑱旂郴鏂瑰紡',
- `state` tinyint(1) NOT NULL DEFAULT 1 COMMENT '鐘舵�侊細0/绂佹 1/姝ｅ父',
- `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '鍒涘缓鏃堕棿',
- `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '鏇存柊鏃堕棿',
- PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 23 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Records of user
--- ----------------------------
-INSERT INTO `user` VALUES (1, 0, '', 0, 1, 'admin', 'b2f0c414a5ffb6944c424bc18ae3a8a0', NULL, NULL, NULL, 1, '2023-08-25 08:58:58', '2023-09-05 16:12:28');
-INSERT INTO `user` VALUES (2, 1, '1-', 1, 2, 'user1', '601b99523f82de29f87771d5f95accdc', 'user1@qq.com', NULL, NULL, 1, '2021-11-28 14:31:39', '2021-11-28 15:09:36');
-INSERT INTO `user` VALUES (3, 1, '1-', 1, 2, 'user2', 'f403c87893db29eb71b21905b57bbd0d', 'user2@qq.com', NULL, NULL, 1, '2021-11-28 14:31:39', '2021-11-28 15:09:36');
-INSERT INTO `user` VALUES (10, 1, '1-', 1, 2, '767655555', '500637c0d48b442a3be6d4fce12e0910', NULL, NULL, NULL, 1, '2023-08-23 20:42:58', '2023-08-23 20:42:58');
-INSERT INTO `user` VALUES (11, 1, '1-', 1, 5, 'uiuyiuy', 'e046c4175152aa3001d2c71c5bc1aee5', '767676767tt@qq.com', NULL, NULL, 1, '2023-08-23 20:43:42', '2023-08-23 20:43:42');
-INSERT INTO `user` VALUES (13, 1, '1-', 1, 2, 'user3', 'b2f0c414a5ffb6944c424bc18ae3a8a0', '2265557345@qq.com', NULL, NULL, 1, '2023-08-24 09:58:40', '2023-08-24 09:58:40');
-INSERT INTO `user` VALUES (15, 1, '1-', 1, 2, '99999', 'b2f0c414a5ffb6944c424bc18ae3a8a0', '2267666@qq.com', NULL, NULL, 1, '2023-08-25 09:37:05', '2023-08-28 14:37:27');
-INSERT INTO `user` VALUES (16, 1, '1-', 1, 2, '5656tttt', 'b2f0c414a5ffb6944c424bc18ae3a8a0', '5454@qq.com', NULL, NULL, 1, '2023-08-28 14:17:44', '2023-08-28 14:37:24');
-INSERT INTO `user` VALUES (18, 1, '1-', 1, 2, '8989ttt', 'b2f0c414a5ffb6944c424bc18ae3a8a0', '224@qq.com', NULL, NULL, 1, '2023-08-28 14:26:17', '2023-08-28 14:37:22');
-INSERT INTO `user` VALUES (19, 1, '1-', 1, 5, '8080ttt', 'b2f0c414a5ffb6944c424bc18ae3a8a0', '87@qq.com', NULL, NULL, 1, '2023-08-28 14:34:39', '2023-08-29 16:03:38');
-
--- ----------------------------
--- Procedure structure for Your_Stored_Procedure
--- ----------------------------
-DROP PROCEDURE IF EXISTS `Your_Stored_Procedure`;
-delimiter ;;
-CREATE PROCEDURE `Your_Stored_Procedure`(in id VARCHAR(20) ,in name VARCHAR(20))
-BEGIN
-select * from device;
-END
-;;
-delimiter ;
-
-SET FOREIGN_KEY_CHECKS = 1;
+/*
+ Navicat MySQL Data Transfer
+
+ Source Server : 鏈湴
+ Source Server Type : MySQL
+ Source Server Version : 80022
+ Source Host : localhost:3306
+ Source Schema : canadames
+
+ Target Server Type : MySQL
+ Target Server Version : 80022
+ File Encoding : 65001
+
+ Date: 14/09/2023 09:47:12
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for alarmmg
+-- ----------------------------
+DROP TABLE IF EXISTS `alarmmg`;
+CREATE TABLE `alarmmg` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT '涓婚敭',
+ `content` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鎶ヨ淇℃伅',
+ `timeon` datetime(0) NULL DEFAULT NULL COMMENT '寮�濮嬫椂闂�',
+ `endTime` datetime(0) NULL DEFAULT NULL COMMENT '缁撴潫鏃堕棿',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1378 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of alarmmg
+-- ----------------------------
+INSERT INTO `alarmmg` VALUES (1, 'D01 VFD error', '2023-09-11 10:07:17', '2023-09-11 10:07:51');
+INSERT INTO `alarmmg` VALUES (2, 'D02 VFD error', '2023-09-07 10:07:17', '2023-09-07 10:07:51');
+INSERT INTO `alarmmg` VALUES (1338, 'D02 VFD error', '2023-09-12 16:10:32', '2023-09-12 16:22:36');
+INSERT INTO `alarmmg` VALUES (1339, 'D04 VFD error', '2023-09-12 16:10:32', '2023-09-12 16:22:36');
+INSERT INTO `alarmmg` VALUES (1340, 'D06 VFD error', '2023-09-12 16:10:32', '2023-09-12 16:22:36');
+INSERT INTO `alarmmg` VALUES (1341, 'B02 VFD error', '2023-09-12 16:10:32', '2023-09-12 16:22:36');
+INSERT INTO `alarmmg` VALUES (1342, 'A02 VFD error', '2023-09-12 16:10:32', '2023-09-12 16:22:36');
+INSERT INTO `alarmmg` VALUES (1343, 'A02 servo turn error', '2023-09-12 16:10:32', '2023-09-12 16:22:36');
+INSERT INTO `alarmmg` VALUES (1344, 'A02 servo travel error', '2023-09-12 16:10:32', '2023-09-12 16:22:36');
+INSERT INTO `alarmmg` VALUES (1345, 'B02 servo travel error', '2023-09-12 16:10:32', '2023-09-12 16:22:36');
+INSERT INTO `alarmmg` VALUES (1346, 'D01 pos error', '2023-09-12 16:10:32', '2023-09-12 16:22:36');
+INSERT INTO `alarmmg` VALUES (1347, 'D02 pos error', '2023-09-12 16:10:32', '2023-09-12 16:22:36');
+INSERT INTO `alarmmg` VALUES (1348, 'D03 pos error', '2023-09-12 16:10:32', '2023-09-12 16:22:36');
+INSERT INTO `alarmmg` VALUES (1349, 'D04 pos error', '2023-09-12 16:16:48', '2023-09-12 16:22:36');
+INSERT INTO `alarmmg` VALUES (1350, 'D05 pos error', '2023-09-12 16:16:48', '2023-09-12 16:22:36');
+INSERT INTO `alarmmg` VALUES (1351, 'D06 pos error', '2023-09-12 16:16:48', '2023-09-12 16:22:36');
+INSERT INTO `alarmmg` VALUES (1352, 'A01 pos error', '2023-09-12 16:16:48', '2023-09-12 16:22:36');
+INSERT INTO `alarmmg` VALUES (1353, 'A02 pos error', '2023-09-12 16:16:48', '2023-09-12 16:22:36');
+INSERT INTO `alarmmg` VALUES (1354, 'B01 IN pos error', '2023-09-12 16:16:48', '2023-09-12 16:22:36');
+INSERT INTO `alarmmg` VALUES (1355, 'B01 OUT pos error', '2023-09-12 16:16:48', '2023-09-12 16:22:36');
+INSERT INTO `alarmmg` VALUES (1356, 'B02 IN pos error', '2023-09-12 16:16:48', '2023-09-12 16:22:36');
+INSERT INTO `alarmmg` VALUES (1357, 'B02 OUT pos error', '2023-09-12 16:16:48', '2023-09-12 16:22:36');
+INSERT INTO `alarmmg` VALUES (1358, 'D01 VFD error', '2023-09-12 16:22:36', NULL);
+INSERT INTO `alarmmg` VALUES (1359, 'D03 VFD error', '2023-09-12 16:22:36', NULL);
+INSERT INTO `alarmmg` VALUES (1360, 'D05 VFD error', '2023-09-12 16:22:36', NULL);
+INSERT INTO `alarmmg` VALUES (1361, 'B01 VFD error', '2023-09-12 16:22:36', NULL);
+INSERT INTO `alarmmg` VALUES (1362, 'A01 VFD error', '2023-09-12 16:22:36', NULL);
+INSERT INTO `alarmmg` VALUES (1363, 'A01 servo turn error', '2023-09-12 16:22:36', NULL);
+INSERT INTO `alarmmg` VALUES (1364, 'A01 servo travel error', '2023-09-12 16:22:36', NULL);
+INSERT INTO `alarmmg` VALUES (1365, 'B01 servo travel error', '2023-09-12 16:22:36', NULL);
+INSERT INTO `alarmmg` VALUES (1366, 'D01 DEC error', '2023-09-12 16:22:36', NULL);
+INSERT INTO `alarmmg` VALUES (1367, 'D02 DEC error', '2023-09-12 16:22:36', NULL);
+INSERT INTO `alarmmg` VALUES (1368, 'D03 DEC error', '2023-09-12 16:22:36', NULL);
+INSERT INTO `alarmmg` VALUES (1369, 'D04 DEC error', '2023-09-12 16:22:36', NULL);
+INSERT INTO `alarmmg` VALUES (1370, 'D05 DEC error', '2023-09-12 16:22:36', NULL);
+INSERT INTO `alarmmg` VALUES (1371, 'D06 DEC error', '2023-09-12 16:22:36', NULL);
+INSERT INTO `alarmmg` VALUES (1372, 'A01 DEC error', '2023-09-12 16:22:36', NULL);
+INSERT INTO `alarmmg` VALUES (1373, 'A02 DEC error', '2023-09-12 16:22:36', NULL);
+INSERT INTO `alarmmg` VALUES (1374, 'B01 IN DEC error', '2023-09-12 16:22:36', NULL);
+INSERT INTO `alarmmg` VALUES (1375, 'B01 OUT DEC error', '2023-09-12 16:22:36', NULL);
+INSERT INTO `alarmmg` VALUES (1376, 'B02 IN DEC error', '2023-09-12 16:22:36', NULL);
+INSERT INTO `alarmmg` VALUES (1377, 'B02 OUT DEC error', '2023-09-12 16:22:36', NULL);
+
+-- ----------------------------
+-- Table structure for category
+-- ----------------------------
+DROP TABLE IF EXISTS `category`;
+CREATE TABLE `category` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭',
+ `parent_id` bigint NULL DEFAULT NULL COMMENT '鐖剁骇id',
+ `path` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '璺緞',
+ `level` int NULL DEFAULT NULL COMMENT '绛夌骇',
+ `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍚嶇О',
+ `creator` bigint NULL DEFAULT NULL COMMENT '鍒涘缓浜�',
+ `state` tinyint NOT NULL DEFAULT 1 COMMENT '鐘舵�侊細0/涓嬫灦 1/涓婃灦',
+ `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '鍒涘缓鏃堕棿',
+ `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '鏇存柊鏃堕棿',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '鍟嗗搧鍒嗙被' ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of category
+-- ----------------------------
+INSERT INTO `category` VALUES (1, NULL, NULL, NULL, '娴嬭瘯鍒嗙被', 1, 1, '2021-11-28 15:08:32', '2021-11-28 15:08:32');
+
+-- ----------------------------
+-- Table structure for device
+-- ----------------------------
+DROP TABLE IF EXISTS `device`;
+CREATE TABLE `device` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `device_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+ `create_user` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+ `create_time` datetime(0) NOT NULL,
+ `device_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+ `status` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+ `info` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL,
+ `model` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL,
+ `count_time_flag` datetime(0) NULL DEFAULT NULL,
+ `address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+ `gps` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+ `debug_time` date NULL DEFAULT NULL,
+ `end_time` date NULL DEFAULT NULL,
+ `customer_name` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+ `customer_device_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+ `last_product_count_date` date NULL DEFAULT NULL,
+ PRIMARY KEY (`id`) USING BTREE,
+ UNIQUE INDEX `device_id_idx`(`device_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 47 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of device
+-- ----------------------------
+INSERT INTO `device` VALUES (31, 'LY140510-AG15B65R', 'admin', '2022-05-07 13:34:46', 'chen65璁惧', '鏈惎鐢�', '{\"Ver\":\"1.0\",\"iTopDos\":[160],\"iTopRightMerge\":[0],\"iBtmEnd\":[],\"iTopFront\":[],\"iBtmRow\":[10],\"iBtmLeftMerge\":[0],\"iTopLeftMerge\":[0],\"iTopColumn\":[8],\"iBtmDos\":[80],\"iBtmSingline\":[1],\"iBtmFront\":[],\"iBtmRightMerge\":[0],\"InterfaceName\":\"IDeviceInfor\",\"iTopEnd\":[],\"iTopRow\":[20],\"iTopSingline\":[1],\"DeviceName\":\"LY140510-AG15B65R\",\"iBtmColumn\":[8]}', '{\"Ver\":\"1.0\",\"Datas\":[{\"Binding\":\"Datas[0]\",\"Unit\":\"\",\"Name\":\"CurrentStatus\"},{\"Binding\":\"Datas[1]\",\"Unit\":\"鈩僜",\"Name\":\"RtTemperature\"},{\"Binding\":\"Datas[2]\",\"Unit\":\"%\",\"Name\":\"PvPower\"},{\"Binding\":\"Datas[3]\",\"Unit\":\"kw\",\"Name\":\"CurveTotalPower\"}],\"Segments\":[{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.2,\"Name\":\"Load\"},{\"Type\":\"Q\",\"Controls\":[{\"Binding\":\"GlassLength[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.2,\"Name\":\"5鍨嬮鏍呮\"},{\"Type\":\"F\",\"Controls\":[{\"Binding\":\"GlassLength[2]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.2,\"Name\":\"鐐変綋娈礬"},{\"Type\":\"Q\",\"Controls\":[{\"Binding\":\"GlassLength[3]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.2,\"Name\":\"椋庢爡娈礬"},{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[4]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.2,\"Name\":\"涓嬬墖娈礬"}],\"InterfaceName\":\"IDeviceMapInfor\",\"DeviceName\":\"LY140510-AG15B65R\"}', '2022-12-31 00:00:00', '娌冲崡鐪�/娲涢槼甯�/娑цタ鍖�/娲涢槼鍖楃幓涓夊厓娴侀鏈烘妧鏈湁闄愬叕鍙�', '112.36358,34.594068', '2022-05-07', '2022-05-07', '娲涢槼鍖楃幓', NULL, '2023-08-28');
+INSERT INTO `device` VALUES (32, 'NG10000', 'admin', '2022-05-13 08:53:52', 'Device 1', '鏈惎鐢�', '{\"Ver\":\"1.0\",\"iTopDos\":[108],\"iTopRightMerge\":[1],\"iBtmEnd\":[],\"iTopFront\":[],\"iBtmRow\":[12],\"iBtmLeftMerge\":[1],\"iTopLeftMerge\":[1],\"iTopColumn\":[10],\"iBtmDos\":[108],\"iBtmSingline\":[],\"iBtmFront\":[],\"iBtmRightMerge\":[1],\"InterfaceName\":\"IDeviceInfor\",\"iTopEnd\":[],\"iTopRow\":[12],\"iTopSingline\":[],\"DeviceName\":\"NG10000\",\"iBtmColumn\":[10]}', '{\"Ver\":\"1.0\",\"Datas\":[{\"Binding\":\"Datas[0]\",\"Unit\":\"\",\"Name\":\"CurrentStatus\"},{\"Binding\":\"Datas[1]\",\"Unit\":\"鈩僜",\"Name\":\"RtTemperature\"},{\"Binding\":\"Datas[2]\",\"Unit\":\"%\",\"Name\":\"PvPower\"},{\"Binding\":\"Datas[3]\",\"Unit\":\"kw\",\"Name\":\"CurveTotalPower\"}],\"Segments\":[{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"Load\"},{\"Type\":\"F\",\"Controls\":[{\"Binding\":\"GlassLength[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"鐐変綋娈礬"},{\"Type\":\"Q\",\"Controls\":[{\"Binding\":\"GlassLength[2]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"椋庢爡娈礬"},{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[3]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"涓嬬墖娈礬"}],\"InterfaceName\":\"IDeviceMapInfor\",\"DeviceName\":\"NG10000\"}', '2023-02-21 00:00:00', 'Address 1', '112.39741,34.61541', '2022-05-13', '2022-05-13', 'fsdfsdfs', NULL, '2022-10-28');
+INSERT INTO `device` VALUES (33, 'NGtest150130', 'admin', '2022-08-09 09:18:14', 'Device 2', '鏈惎鐢�', NULL, '{\"Ver\":\"1.1\",\"Datas\":[{\"Binding\":\"Datas[0]\",\"Unit\":\"\",\"Name\":\"CurrentStatus\"},{\"Binding\":\"Datas[1]\",\"Unit\":\"鈩僜",\"Name\":\"RtTemperature\"},{\"Binding\":\"Datas[2]\",\"Unit\":\"%\",\"Name\":\"PvPower\"},{\"Binding\":\"Datas[3]\",\"Unit\":\"kw\",\"Name\":\"CurveTotalPower\"}],\"Segments\":[{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"Load\"},{\"Type\":\"F\",\"Controls\":[{\"Binding\":\"GlassLength[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"鐐変綋娈礬"},{\"Type\":\"Q\",\"Controls\":[{\"Binding\":\"GlassLength[2]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"椋庢爡娈礬"},{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[3]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"涓嬬墖娈礬"}],\"InterfaceName\":\"IDeviceMapInfor\",\"DeviceName\":\"NGtest150130\"}', '2022-08-10 00:00:00', 'Address 2', '', '2022-08-09', '2022-08-09', '娲涢槼鐜荤拑鍏徃', NULL, NULL);
+INSERT INTO `device` VALUES (34, 'NG150130', 'admin', '2022-08-10 11:34:10', '榛戦噾鍒�', '鏈惎鐢�', NULL, '{\"Ver\":\"1.0\",\"Datas\":[{\"Binding\":\"Datas[0]\",\"Unit\":\"\",\"Name\":\"CurrentStatus\"},{\"Binding\":\"Datas[1]\",\"Unit\":\"鈩僜",\"Name\":\"RtTemperature\"},{\"Binding\":\"Datas[2]\",\"Unit\":\"%\",\"Name\":\"PvPower\"},{\"Binding\":\"Datas[3]\",\"Unit\":\"kw\",\"Name\":\"CurveTotalPower\"}],\"Segments\":[{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"Load\"},{\"Type\":\"F\",\"Controls\":[{\"Binding\":\"GlassLength[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"鐐変綋娈礬"},{\"Type\":\"Q\",\"Controls\":[{\"Binding\":\"GlassLength[2]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"椋庢爡娈礬"},{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[3]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"涓嬬墖娈礬"}],\"InterfaceName\":\"IDeviceMapInfor\",\"DeviceName\":\"NG150130\"}', '2022-09-07 00:00:00', '', '', '2022-08-10', '2022-08-10', '娲涢槼鐜荤拑鍏徃', NULL, NULL);
+INSERT INTO `device` VALUES (35, 'YL211116-AU1E60', 'admin', '2022-08-18 09:44:47', 'AU1E60', '鏈惎鐢�', NULL, NULL, '2022-08-18 09:44:47', '', '', '2022-08-10', '2022-08-10', NULL, NULL, NULL);
+INSERT INTO `device` VALUES (36, 'Lyyyyy', 'admin', '2022-08-30 15:01:16', 'cccccccccccc', '鏈惎鐢�', NULL, NULL, '2022-08-30 15:01:16', '', '', '2022-08-30', '2022-08-30', '娲涢槼鐜荤拑鍏徃', NULL, NULL);
+INSERT INTO `device` VALUES (38, 'NG20000', 'admin', '2022-10-21 16:36:03', '娴嬭瘯璁惧', '鏈惎鐢�', NULL, NULL, '2022-10-21 16:36:03', '', '', '2022-10-21', '2022-10-21', '娴嬭瘯鐢�', NULL, NULL);
+INSERT INTO `device` VALUES (39, 'FS221024-AU1E70', 'admin', '2023-03-14 14:42:27', '鍗氭槍涓�', '鏈惎鐢�', NULL, NULL, '2023-03-14 14:42:27', '', '', '2023-03-14', '2023-03-14', '浣涘北鍗氭槍涓�', NULL, NULL);
+INSERT INTO `device` VALUES (40, 'DG210978-A1B50', 'admin', '2023-03-21 14:21:22', '涓『A1B50', '鏈惎鐢�', '{\"Ver\":\"1.0\",\"iTopDos\":[70],\"iTopRightMerge\":[1],\"iBtmEnd\":[],\"iTopFront\":[],\"iBtmRow\":[10],\"iBtmLeftMerge\":[1],\"iTopLeftMerge\":[1],\"iTopColumn\":[8],\"iBtmDos\":[70],\"iBtmSingline\":[],\"iBtmFront\":[],\"iBtmRightMerge\":[1],\"InterfaceName\":\"IDeviceInfor\",\"iTopEnd\":[],\"iTopRow\":[10],\"iTopSingline\":[],\"DeviceName\":\"DG210978-A1B50\",\"iBtmColumn\":[8]}', '{\"Ver\":\"1.0\",\"Datas\":[{\"Binding\":\"Datas[0]\",\"Unit\":\"\",\"Name\":\"CurrentStatus\"},{\"Binding\":\"Datas[1]\",\"Unit\":\"鈩僜",\"Name\":\"RtTemperature\"},{\"Binding\":\"Datas[2]\",\"Unit\":\"%\",\"Name\":\"PvPower\"},{\"Binding\":\"Datas[3]\",\"Unit\":\"kw\",\"Name\":\"CurveTotalPower\"}],\"Segments\":[{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"Load\"},{\"Type\":\"F\",\"Controls\":[{\"Binding\":\"GlassLength[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"鐐変綋娈礬"},{\"Type\":\"Q\",\"Controls\":[{\"Binding\":\"GlassLength[2]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"椋庢爡娈礬"},{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[3]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"涓嬬墖娈礬"}],\"InterfaceName\":\"IDeviceMapInfor\",\"DeviceName\":\"DG210978-A1B50\"}', '2023-05-01 00:00:00', '', '', '2023-03-21', '2023-03-21', '涓滆帪涓『', NULL, NULL);
+INSERT INTO `device` VALUES (41, 'FS210305-AU1E60', 'admin', '2023-03-22 13:59:05', '榧庣珛涓欰U1E60', '鏈惎鐢�', '{\"Ver\":\"1.0\",\"iTopDos\":[96],\"iTopRightMerge\":[],\"iBtmEnd\":[],\"iTopFront\":[],\"iBtmRow\":[12],\"iBtmLeftMerge\":[],\"iTopLeftMerge\":[],\"iTopColumn\":[8],\"iBtmDos\":[96],\"iBtmSingline\":[],\"iBtmFront\":[],\"iBtmRightMerge\":[],\"InterfaceName\":\"IDeviceInfor\",\"iTopEnd\":[],\"iTopRow\":[12],\"iTopSingline\":[],\"DeviceName\":\"FS210305-AU1E60\",\"iBtmColumn\":[8]}', '{\"Ver\":\"1.0\",\"Datas\":[{\"Binding\":\"Datas[0]\",\"Unit\":\"\",\"Name\":\"CurrentStatus\"},{\"Binding\":\"Datas[1]\",\"Unit\":\"鈩僜",\"Name\":\"RtTemperature\"},{\"Binding\":\"Datas[2]\",\"Unit\":\"%\",\"Name\":\"PvPower\"},{\"Binding\":\"Datas[3]\",\"Unit\":\"kw\",\"Name\":\"CurveTotalPower\"}],\"Segments\":[{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"Load\"},{\"Type\":\"F\",\"Controls\":[{\"Binding\":\"GlassLength[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"鐐変綋娈礬"},{\"Type\":\"Q\",\"Controls\":[{\"Binding\":\"GlassLength[2]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"椋庢爡娈礬"},{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[3]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"涓嬬墖娈礬"}],\"InterfaceName\":\"IDeviceMapInfor\",\"DeviceName\":\"FS210305-AU1E60\"}', '2023-05-01 00:00:00', '', '', '2023-03-22', '2023-03-22', '浣涘北榧庣珛涓�', NULL, NULL);
+INSERT INTO `device` VALUES (42, 'FS220765-AU1E70', 'admin', '2023-03-28 15:08:56', '220765-AU1E70', '鏈惎鐢�', '{\"Ver\":\"1.0\",\"iTopDos\":[108],\"iTopRightMerge\":[1],\"iBtmEnd\":[],\"iTopFront\":[],\"iBtmRow\":[12],\"iBtmLeftMerge\":[1],\"iTopLeftMerge\":[1],\"iTopColumn\":[10],\"iBtmDos\":[108],\"iBtmSingline\":[],\"iBtmFront\":[],\"iBtmRightMerge\":[1],\"InterfaceName\":\"IDeviceInfor\",\"iTopEnd\":[],\"iTopRow\":[12],\"iTopSingline\":[],\"DeviceName\":\"FS220765-AU1E70\",\"iBtmColumn\":[10]}', '{\"Ver\":\"1.0\",\"Datas\":[{\"Binding\":\"Datas[0]\",\"Unit\":\"\",\"Name\":\"CurrentStatus\"},{\"Binding\":\"Datas[1]\",\"Unit\":\"鈩僜",\"Name\":\"RtTemperature\"},{\"Binding\":\"Datas[2]\",\"Unit\":\"%\",\"Name\":\"PvPower\"},{\"Binding\":\"Datas[3]\",\"Unit\":\"kw\",\"Name\":\"CurveTotalPower\"}],\"Segments\":[{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"Load\"},{\"Type\":\"F\",\"Controls\":[{\"Binding\":\"GlassLength[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"鐐変綋娈礬"},{\"Type\":\"Q\",\"Controls\":[{\"Binding\":\"GlassLength[2]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"椋庢爡娈礬"},{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[3]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"涓嬬墖娈礬"}],\"InterfaceName\":\"IDeviceMapInfor\",\"DeviceName\":\"FS220765-AU1E70\"}', '2023-04-01 00:00:00', '', '', '2023-03-28', '2023-03-28', '浣涘北鐜栫憺', NULL, NULL);
+INSERT INTO `device` VALUES (44, 'NG30000', 'admin', '2023-04-04 10:45:18', 'TEST', '鏈惎鐢�', NULL, NULL, '2023-04-04 10:45:18', '', '', '2023-04-04', '2023-04-04', NULL, NULL, NULL);
+INSERT INTO `device` VALUES (46, 'FS220666-AU1B60', 'admin', '2023-04-04 11:38:34', '寮犲媷AU1B60', '鏈惎鐢�', '{\"Ver\":\"1.0\",\"iTopDos\":[96],\"iTopRightMerge\":[],\"iBtmEnd\":[],\"iTopFront\":[],\"iBtmRow\":[12],\"iBtmLeftMerge\":[],\"iTopLeftMerge\":[],\"iTopColumn\":[8],\"iBtmDos\":[96],\"iBtmSingline\":[],\"iBtmFront\":[],\"iBtmRightMerge\":[],\"InterfaceName\":\"IDeviceInfor\",\"iTopEnd\":[],\"iTopRow\":[12],\"iTopSingline\":[],\"DeviceName\":\"FS220666-AU1B60\",\"iBtmColumn\":[8]}', '{\"Ver\":\"1.0\",\"Datas\":[{\"Binding\":\"Datas[0]\",\"Unit\":\"\",\"Name\":\"CurrentStatus\"},{\"Binding\":\"Datas[1]\",\"Unit\":\"鈩僜",\"Name\":\"RtTemperature\"},{\"Binding\":\"Datas[2]\",\"Unit\":\"%\",\"Name\":\"PvPower\"},{\"Binding\":\"Datas[3]\",\"Unit\":\"kw\",\"Name\":\"CurveTotalPower\"}],\"Segments\":[{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"Load\"},{\"Type\":\"F\",\"Controls\":[{\"Binding\":\"GlassLength[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmHeatFansFrequency[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"Hz\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"鐐変綋娈礬"},{\"Type\":\"Q\",\"Controls\":[{\"Binding\":\"GlassLength[2]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"TopQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":0,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"},{\"Binding\":\"BtmQuenchDist[0]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"\"}],\"Width\":0.25,\"Name\":\"椋庢爡娈礬"},{\"Type\":\"O\",\"Controls\":[{\"Binding\":\"GlassLength[3]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":3,\"Unit\":\"mm\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"ToolGlassLength\"},{\"Binding\":\"YieldCount[1]\",\"Col\":1,\"Type\":\"var\",\"Foreground\":\"black\",\"Row\":4,\"Unit\":\"\",\"Font\":\"榛戜綋 14px black\",\"Name\":\"GlassOutPut\"}],\"Width\":0.25,\"Name\":\"涓嬬墖娈礬"}],\"InterfaceName\":\"IDeviceMapInfor\",\"DeviceName\":\"FS220666-AU1B60\"}', '2023-04-04 11:38:34', '', '', '2023-04-04', '2023-04-04', NULL, NULL, NULL);
+
+-- ----------------------------
+-- Table structure for glass
+-- ----------------------------
+DROP TABLE IF EXISTS `glass`;
+CREATE TABLE `glass` (
+ `id` int NOT NULL AUTO_INCREMENT,
+ `glassid` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+ `orderid` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+ `width` decimal(10, 2) NULL DEFAULT NULL,
+ `height` decimal(10, 2) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of glass
+-- ----------------------------
+INSERT INTO `glass` VALUES (1, '001', '1145', 1400.00, 1200.00);
+INSERT INTO `glass` VALUES (2, '002', '1145', 1500.00, 1100.00);
+INSERT INTO `glass` VALUES (3, '112', '1145', 1220.00, 1500.00);
+
+-- ----------------------------
+-- Table structure for menu_list
+-- ----------------------------
+DROP TABLE IF EXISTS `menu_list`;
+CREATE TABLE `menu_list` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭',
+ `parent_id` bigint NULL DEFAULT NULL COMMENT '鐖剁骇id',
+ `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍚嶇О',
+ `icon` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鑿滃崟鍥炬爣',
+ `priority` int NULL DEFAULT NULL COMMENT '浼樺厛绾�',
+ `router` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '璺敱',
+ `state` tinyint NOT NULL DEFAULT 1 COMMENT '鐘舵�� 1/姝ｅ父',
+ `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '鍒涘缓鏃堕棿',
+ `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '鏇存柊鏃堕棿',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 61 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of menu_list
+-- ----------------------------
+INSERT INTO `menu_list` VALUES (1, NULL, '鐢ㄦ埛绠＄悊', 'el-icon-user-solid', 1, '', 1, '2021-11-28 14:30:27', '2021-11-28 15:06:04');
+INSERT INTO `menu_list` VALUES (2, NULL, '鐢垫皵绠＄悊', 'el-icon-lollipop', 2, '', 1, '2023-08-23 20:11:38', '2023-09-01 16:34:36');
+INSERT INTO `menu_list` VALUES (5, NULL, '鏉冮檺绠＄悊', 'el-icon-collection-tag', 5, '', 1, '2021-11-28 14:30:27', '2021-11-28 15:06:04');
+INSERT INTO `menu_list` VALUES (6, NULL, '瑙掕壊绠＄悊', 'el-icon-s-flag', 6, '', 1, '2021-11-28 14:30:27', '2021-11-28 15:06:04');
+INSERT INTO `menu_list` VALUES (7, 1, '鐢ㄦ埛鍒楄〃', '', 7, 'user', 1, '2021-11-28 14:30:27', '2021-11-28 15:06:04');
+INSERT INTO `menu_list` VALUES (8, 9, '涓婚〉', 'el-icon-menu', 8, 'home', 1, '2023-09-08 10:56:12', '2023-09-08 11:02:36');
+INSERT INTO `menu_list` VALUES (9, NULL, '涓婚〉', 'el-icon-menu', 0, 'home', 1, '2023-09-08 10:43:34', '2023-09-08 11:02:32');
+INSERT INTO `menu_list` VALUES (11, 5, '鏉冮檺鍒楄〃', '', 11, 'power', 1, '2021-11-28 14:30:28', '2021-11-28 15:06:04');
+INSERT INTO `menu_list` VALUES (12, 6, '瑙掕壊鍒楄〃', '', 12, 'role', 1, '2021-11-28 14:30:28', '2021-11-28 15:06:04');
+INSERT INTO `menu_list` VALUES (49, 2, '鎶ヨ淇℃伅', '', 49, 'Electrical/alarm', 1, '2021-11-28 14:30:28', '2023-09-08 11:14:08');
+INSERT INTO `menu_list` VALUES (51, 2, '璁惧鐘舵��', NULL, 51, 'Electrical/State', 1, '2023-08-25 13:29:13', '2023-09-11 17:07:08');
+INSERT INTO `menu_list` VALUES (52, 2, '寮�鍏虫帶鍒�', NULL, 52, 'Electrical/Action', 1, '2023-08-25 13:29:18', '2023-09-12 17:02:54');
+INSERT INTO `menu_list` VALUES (53, 2, '鍙傛暟涓嬪彂', NULL, 53, 'Electrical/Parameter', 1, '2023-08-25 13:29:22', '2023-09-01 16:32:29');
+INSERT INTO `menu_list` VALUES (54, 2, 'IO鐘舵��', NULL, 53, 'Electrical/Sign', 1, '2023-08-25 13:29:22', '2023-09-11 17:06:16');
+
+-- ----------------------------
+-- Table structure for order_out
+-- ----------------------------
+DROP TABLE IF EXISTS `order_out`;
+CREATE TABLE `order_out` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT '搴忓彿',
+ `order_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '璁㈠崟鍙�',
+ `state` int NULL DEFAULT NULL COMMENT '鐘舵��(0锛氭寜姝よ鍗曞彿鍑虹墖锛�1缁撴潫鍑虹墖)',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of order_out
+-- ----------------------------
+INSERT INTO `order_out` VALUES (1, 'NG2202302', 1);
+INSERT INTO `order_out` VALUES (2, 'NG2202302', 0);
+
+-- ----------------------------
+-- Table structure for permission
+-- ----------------------------
+DROP TABLE IF EXISTS `permission`;
+CREATE TABLE `permission` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭',
+ `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鏉冮檺鏍囪瘑',
+ `description` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鏉冮檺鎻忚堪',
+ `state` tinyint NOT NULL DEFAULT 1 COMMENT '鐘舵�� 1/姝ｅ父',
+ `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '鍒涘缓鏃堕棿',
+ `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '鏇存柊鏃堕棿',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 32 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '鏉冮檺' ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of permission
+-- ----------------------------
+INSERT INTO `permission` VALUES (1, 'user:select', '鐢ㄦ埛鏌ヨ', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
+INSERT INTO `permission` VALUES (2, 'user:update', '鐢ㄦ埛淇敼', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
+INSERT INTO `permission` VALUES (3, 'user:delete', '鐢ㄦ埛鍒犻櫎', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
+INSERT INTO `permission` VALUES (7, 'role:add', '瑙掕壊娣诲姞', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
+INSERT INTO `permission` VALUES (8, 'role:update', '瑙掕壊淇敼', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
+INSERT INTO `permission` VALUES (9, 'role:delete', '瑙掕壊鍒犻櫎', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
+INSERT INTO `permission` VALUES (10, 'role:select', '瑙掕壊鏌ヨ', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
+INSERT INTO `permission` VALUES (11, 'menuList:delete', '鑿滃崟鍒犻櫎', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
+INSERT INTO `permission` VALUES (12, 'menuList:add', '鑿滃崟娣诲姞', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
+INSERT INTO `permission` VALUES (13, 'menuList:update', '鑿滃崟淇敼', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
+INSERT INTO `permission` VALUES (16, 'rolePermission:add', '鎺堟潈娣诲姞', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
+INSERT INTO `permission` VALUES (17, 'rolePermission:delete', '鎺堟潈鍒犻櫎', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
+INSERT INTO `permission` VALUES (18, 'rolePermission:select', '鎺堟潈鏌ヨ', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
+INSERT INTO `permission` VALUES (19, 'permission:select', '鏉冮檺鏌ヨ', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
+INSERT INTO `permission` VALUES (20, 'user:add', '鐢ㄦ埛娣诲姞', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
+INSERT INTO `permission` VALUES (22, 'menuList:select', '鑿滃崟鏌ヨ', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
+INSERT INTO `permission` VALUES (25, 'category:select', '鍒嗙被鏌ヨ', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
+INSERT INTO `permission` VALUES (26, 'category:delete', '鍒嗙被鍒犻櫎', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
+INSERT INTO `permission` VALUES (27, 'category:update', '鍒嗙被淇敼', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
+INSERT INTO `permission` VALUES (28, 'category:add', '鍒嗙被娣诲姞', 1, '2021-11-28 15:07:36', '2021-11-28 15:07:36');
+INSERT INTO `permission` VALUES (29, 'alarm:select', '鎶ヨ淇℃伅鏌ヨ', 1, '2021-11-28 15:07:36', '2023-08-28 15:16:24');
+INSERT INTO `permission` VALUES (30, 'alarm:add', '鎶ヨ淇℃伅娣诲姞', 1, '2023-08-24 08:48:53', '2023-08-28 15:16:27');
+INSERT INTO `permission` VALUES (31, 'alarm:update', '鎶ヨ淇℃伅淇敼', 1, '2023-08-24 08:49:23', '2023-08-28 15:16:29');
+
+-- ----------------------------
+-- Table structure for role
+-- ----------------------------
+DROP TABLE IF EXISTS `role`;
+CREATE TABLE `role` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭',
+ `parent_id` bigint NULL DEFAULT NULL COMMENT '涓婄骇瑙掕壊',
+ `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '瑙掕壊鍚嶇О',
+ `description` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鎻忚堪',
+ `state` tinyint NOT NULL DEFAULT 1 COMMENT '鐘舵�� 1/姝ｅ父',
+ `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '鍒涘缓鏃堕棿',
+ `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '鏇存柊鏃堕棿',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '瑙掕壊' ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of role
+-- ----------------------------
+INSERT INTO `role` VALUES (1, NULL, 'admin', '绯荤粺绠＄悊鍛�', 1, '2021-01-10 22:49:17', '2021-03-29 15:19:15');
+INSERT INTO `role` VALUES (2, 1, 'user2', '鏅�氱敤鎴�', 1, '2021-01-13 00:28:58', '2021-03-29 15:19:15');
+INSERT INTO `role` VALUES (5, 1, 'user3', '777', 1, '2023-08-24 10:02:58', '2023-08-28 14:28:22');
+
+-- ----------------------------
+-- Table structure for role_menu_list
+-- ----------------------------
+DROP TABLE IF EXISTS `role_menu_list`;
+CREATE TABLE `role_menu_list` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭',
+ `role_id` bigint NULL DEFAULT NULL COMMENT '瑙掕壊id',
+ `menu_list_id` bigint NULL DEFAULT NULL COMMENT '鑿滃崟id',
+ `state` tinyint NULL DEFAULT 1 COMMENT '鐘舵�� 1/姝ｅ父',
+ `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '鍒涘缓鏃堕棿',
+ `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '鏇存柊鏃堕棿',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 57 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '瑙掕壊鍜岃彍鍗曞叧鑱旇〃' ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of role_menu_list
+-- ----------------------------
+INSERT INTO `role_menu_list` VALUES (1, 1, 1, 1, '2021-11-28 15:10:03', '2021-11-28 15:10:03');
+INSERT INTO `role_menu_list` VALUES (2, 1, 2, 1, '2021-11-28 15:10:03', '2021-11-28 15:10:03');
+INSERT INTO `role_menu_list` VALUES (3, 1, 3, 1, '2021-11-28 15:10:03', '2021-11-28 15:10:03');
+INSERT INTO `role_menu_list` VALUES (4, 1, 4, 1, '2021-11-28 15:10:03', '2021-11-28 15:10:03');
+INSERT INTO `role_menu_list` VALUES (5, 1, 5, 1, '2021-11-28 15:10:03', '2021-11-28 15:10:03');
+INSERT INTO `role_menu_list` VALUES (6, 1, 6, 1, '2021-11-28 15:10:03', '2021-11-28 15:10:03');
+INSERT INTO `role_menu_list` VALUES (7, 1, 7, 1, '2021-11-28 15:10:03', '2021-11-28 15:10:03');
+INSERT INTO `role_menu_list` VALUES (8, 1, 8, 1, '2021-11-28 15:10:03', '2021-11-28 15:10:03');
+INSERT INTO `role_menu_list` VALUES (9, 1, 9, 1, '2021-11-28 15:10:03', '2021-11-28 15:10:03');
+INSERT INTO `role_menu_list` VALUES (10, 1, 10, 1, '2021-11-28 15:10:03', '2021-11-28 15:10:03');
+INSERT INTO `role_menu_list` VALUES (11, 1, 11, 1, '2021-11-28 15:10:03', '2021-11-28 15:10:03');
+INSERT INTO `role_menu_list` VALUES (12, 1, 12, 1, '2021-11-28 15:10:03', '2021-11-28 15:10:03');
+INSERT INTO `role_menu_list` VALUES (19, 1, 50, 1, '2023-08-24 09:13:00', '2023-08-24 09:13:00');
+INSERT INTO `role_menu_list` VALUES (20, 1, 49, 1, '2023-08-24 10:08:38', '2023-08-28 15:39:54');
+INSERT INTO `role_menu_list` VALUES (21, 1, 51, 1, '2023-08-24 10:08:56', '2023-08-28 15:39:54');
+INSERT INTO `role_menu_list` VALUES (22, 1, 52, 1, '2023-08-24 10:08:56', '2023-08-28 15:39:54');
+INSERT INTO `role_menu_list` VALUES (23, 1, 53, 1, '2023-08-24 10:08:56', '2023-08-28 15:39:54');
+INSERT INTO `role_menu_list` VALUES (25, 1, 60, 1, '2023-08-25 13:05:53', '2023-08-25 13:05:53');
+INSERT INTO `role_menu_list` VALUES (26, 1, 1, 1, '2023-08-28 14:29:17', '2023-08-28 15:39:54');
+INSERT INTO `role_menu_list` VALUES (27, 1, 7, 1, '2023-08-28 15:11:09', '2023-08-28 15:39:54');
+INSERT INTO `role_menu_list` VALUES (28, 1, 2, 1, '2023-08-28 15:14:19', '2023-08-28 15:39:54');
+INSERT INTO `role_menu_list` VALUES (29, 1, 49, 1, '2023-08-28 15:14:27', '2023-08-28 15:39:54');
+INSERT INTO `role_menu_list` VALUES (31, 2, 2, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
+INSERT INTO `role_menu_list` VALUES (32, 2, 3, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
+INSERT INTO `role_menu_list` VALUES (33, 2, 4, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
+INSERT INTO `role_menu_list` VALUES (37, 2, 8, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
+INSERT INTO `role_menu_list` VALUES (38, 2, 9, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
+INSERT INTO `role_menu_list` VALUES (39, 2, 10, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
+INSERT INTO `role_menu_list` VALUES (42, 2, 50, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
+INSERT INTO `role_menu_list` VALUES (43, 2, 49, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
+INSERT INTO `role_menu_list` VALUES (44, 2, 51, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
+INSERT INTO `role_menu_list` VALUES (45, 2, 52, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
+INSERT INTO `role_menu_list` VALUES (46, 2, 53, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
+INSERT INTO `role_menu_list` VALUES (47, 2, 60, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
+INSERT INTO `role_menu_list` VALUES (50, 2, 2, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
+INSERT INTO `role_menu_list` VALUES (51, 2, 49, 1, '2023-08-28 15:14:27', '2023-08-28 15:53:34');
+INSERT INTO `role_menu_list` VALUES (52, 2, 1, 1, '2023-08-30 16:28:57', '2023-08-30 16:28:57');
+INSERT INTO `role_menu_list` VALUES (53, 2, 7, 1, '2023-08-30 16:29:05', '2023-08-30 16:29:05');
+INSERT INTO `role_menu_list` VALUES (54, 1, 9, 1, '2023-09-08 10:55:54', '2023-09-08 11:02:55');
+INSERT INTO `role_menu_list` VALUES (55, 1, 8, 1, '2023-09-08 10:56:45', '2023-09-08 11:01:43');
+INSERT INTO `role_menu_list` VALUES (56, 2, 54, 1, '2023-09-11 17:09:17', '2023-09-11 17:09:24');
+
+-- ----------------------------
+-- Table structure for role_permission
+-- ----------------------------
+DROP TABLE IF EXISTS `role_permission`;
+CREATE TABLE `role_permission` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭',
+ `role_id` bigint NULL DEFAULT NULL COMMENT '瑙掕壊id',
+ `permission_id` bigint NULL DEFAULT NULL COMMENT '鏉冮檺id',
+ `state` tinyint NOT NULL DEFAULT 1 COMMENT '鐘舵�� 1/姝ｅ父',
+ `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '鍒涘缓鏃堕棿',
+ `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '鏇存柊鏃堕棿',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 76 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '瑙掕壊鏉冮檺' ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of role_permission
+-- ----------------------------
+INSERT INTO `role_permission` VALUES (1, 1, 1, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (2, 1, 2, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (3, 1, 3, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (7, 1, 7, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (8, 1, 8, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (9, 1, 9, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (10, 1, 10, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (11, 1, 11, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (12, 1, 12, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (13, 1, 13, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (16, 1, 16, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (17, 1, 17, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (18, 1, 18, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (19, 1, 19, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (20, 1, 20, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (22, 1, 22, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (25, 1, 25, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (26, 1, 26, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (27, 1, 27, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (28, 1, 28, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (37, 2, 25, 1, '2021-11-28 16:30:57', '2021-11-28 16:31:04');
+INSERT INTO `role_permission` VALUES (38, 2, 26, 1, '2021-11-28 16:30:57', '2021-11-28 16:31:04');
+INSERT INTO `role_permission` VALUES (39, 2, 27, 1, '2021-11-28 16:30:57', '2021-11-28 16:31:04');
+INSERT INTO `role_permission` VALUES (40, 2, 28, 1, '2021-11-28 16:32:35', '2021-11-28 16:37:20');
+INSERT INTO `role_permission` VALUES (41, 2, 22, 1, '2021-11-28 19:57:35', '2021-11-28 19:57:35');
+INSERT INTO `role_permission` VALUES (42, 1, 30, 1, '2023-08-24 08:55:34', '2023-08-24 08:55:34');
+INSERT INTO `role_permission` VALUES (43, 1, 29, 1, '2023-08-24 08:56:15', '2023-08-24 08:56:15');
+INSERT INTO `role_permission` VALUES (44, 1, 31, 1, '2023-08-24 08:56:23', '2023-08-24 08:56:23');
+INSERT INTO `role_permission` VALUES (53, 2, 2, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (54, 2, 3, 0, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (56, 2, 8, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (57, 2, 9, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (58, 2, 10, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (61, 2, 13, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (62, 2, 16, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (63, 2, 17, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (64, 2, 18, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (65, 2, 19, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (66, 2, 20, 0, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (67, 2, 22, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (68, 2, 25, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (69, 2, 26, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (70, 2, 27, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (71, 2, 28, 1, '2021-11-28 15:07:54', '2021-11-28 15:07:54');
+INSERT INTO `role_permission` VALUES (72, 2, 30, 1, '2023-08-24 08:55:34', '2023-08-24 08:55:34');
+INSERT INTO `role_permission` VALUES (73, 2, 29, 1, '2023-08-24 08:56:15', '2023-08-28 15:33:14');
+INSERT INTO `role_permission` VALUES (74, 2, 1, 1, '2023-08-30 16:29:46', '2023-08-30 16:29:46');
+
+-- ----------------------------
+-- Table structure for storage_cage
+-- ----------------------------
+DROP TABLE IF EXISTS `storage_cage`;
+CREATE TABLE `storage_cage` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT '搴忓彿',
+ `glass_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鐜荤拑id',
+ `order_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '璁㈠崟id',
+ `cage` int NULL DEFAULT NULL COMMENT '绗煎瓙id',
+ `cell` int NULL DEFAULT NULL COMMENT '鏍煎瓙id',
+ `tier` int NULL DEFAULT NULL COMMENT '鏍煎瓙灞俰d',
+ `width` decimal(7, 2) NULL DEFAULT NULL COMMENT '鏍煎瓙瀹�',
+ `glasswidth` decimal(7, 2) NULL DEFAULT NULL COMMENT '鐜荤拑瀹�',
+ `glassheight` decimal(7, 2) NULL DEFAULT NULL COMMENT '鐜荤拑楂�',
+ `state` int NULL DEFAULT NULL COMMENT '鐘舵�侊紙0锛氭棤鐜荤拑锛�1锛氭湁鐜荤拑锛�2锛氳繘鐗囦腑锛�3锛氬嚭鐗囦腑锛�4锛氳皟搴︿腑锛�',
+ `coating` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '娑傚眰',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 421 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of storage_cage
+-- ----------------------------
+INSERT INTO `storage_cage` VALUES (1, NULL, NULL, 1, 1, 1, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (2, NULL, NULL, 1, 1, 2, 1760.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (3, NULL, NULL, 1, 2, 1, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (4, NULL, NULL, 1, 2, 2, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (5, NULL, NULL, 1, 3, 1, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (6, NULL, NULL, 1, 3, 2, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (7, NULL, NULL, 1, 4, 1, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (8, NULL, NULL, 1, 4, 2, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (9, NULL, NULL, 1, 5, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (10, NULL, NULL, 1, 5, 2, 1600.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (11, NULL, NULL, 1, 6, 1, 1600.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (12, '12', 'NG2202301', 1, 6, 2, 1602.00, 0.00, 2.00, 1, '2');
+INSERT INTO `storage_cage` VALUES (13, NULL, NULL, 1, 7, 1, 1600.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (14, NULL, NULL, 1, 7, 2, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (15, NULL, NULL, 1, 8, 1, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (16, NULL, NULL, 1, 8, 2, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (17, NULL, NULL, 1, 9, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (18, NULL, NULL, 1, 9, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (19, NULL, NULL, 1, 10, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (20, NULL, NULL, 1, 10, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (21, NULL, NULL, 1, 11, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (22, NULL, NULL, 1, 11, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (23, NULL, NULL, 1, 12, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (24, NULL, NULL, 1, 12, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (25, NULL, NULL, 1, 13, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (26, NULL, NULL, 1, 13, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (27, NULL, NULL, 1, 14, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (28, NULL, NULL, 1, 14, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (29, NULL, NULL, 1, 15, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (30, NULL, NULL, 1, 15, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (31, NULL, NULL, 1, 16, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (32, NULL, NULL, 1, 16, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (33, NULL, NULL, 1, 17, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (34, NULL, NULL, 1, 17, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (35, NULL, NULL, 1, 18, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (36, NULL, NULL, 1, 18, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (37, NULL, NULL, 1, 19, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (38, NULL, NULL, 1, 19, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (39, NULL, NULL, 1, 20, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (40, NULL, NULL, 1, 20, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (41, NULL, NULL, 1, 21, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (42, NULL, NULL, 1, 21, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (43, NULL, NULL, 2, 1, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (44, NULL, NULL, 2, 1, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (45, NULL, NULL, 2, 2, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (46, NULL, NULL, 2, 2, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (47, NULL, NULL, 2, 3, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (48, NULL, NULL, 2, 3, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (49, '112', '1145', 2, 4, 1, 330.00, 1220.00, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (50, NULL, NULL, 2, 4, 2, 1550.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (51, NULL, NULL, 2, 5, 1, 1550.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (52, NULL, NULL, 2, 5, 2, 1550.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (53, NULL, NULL, 2, 6, 1, 1550.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (54, NULL, NULL, 2, 6, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (55, NULL, NULL, 2, 7, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (56, NULL, NULL, 2, 7, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (57, NULL, NULL, 2, 8, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (58, NULL, NULL, 2, 8, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (59, NULL, NULL, 2, 9, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (60, NULL, NULL, 2, 9, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (61, NULL, NULL, 2, 10, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (62, NULL, NULL, 2, 10, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (63, NULL, NULL, 2, 11, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (64, NULL, NULL, 2, 11, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (65, NULL, NULL, 2, 12, 1, 1760.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (66, NULL, NULL, 2, 12, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (67, NULL, NULL, 2, 13, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (68, NULL, NULL, 2, 13, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (69, NULL, NULL, 2, 14, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (70, NULL, NULL, 2, 14, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (71, NULL, NULL, 2, 15, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (72, NULL, NULL, 2, 15, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (73, NULL, NULL, 2, 16, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (74, NULL, NULL, 2, 16, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (75, NULL, NULL, 2, 17, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (76, NULL, NULL, 2, 17, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (77, NULL, NULL, 2, 18, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (78, NULL, NULL, 2, 18, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (79, NULL, NULL, 2, 19, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (80, NULL, NULL, 2, 19, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (81, NULL, NULL, 2, 20, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (82, NULL, NULL, 2, 20, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (83, NULL, NULL, 2, 21, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (84, NULL, NULL, 2, 21, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (85, NULL, NULL, 3, 1, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (86, NULL, NULL, 3, 1, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (87, NULL, NULL, 3, 2, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (88, '116', '112', 3, 2, 2, 1500.00, 1200.00, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (89, '117', '112', 3, 3, 1, 1500.00, 1200.00, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (90, '118', '112', 3, 3, 2, 1500.00, 1200.00, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (91, '119', '112', 3, 4, 1, 1500.00, 1200.00, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (92, '120', '112', 3, 4, 2, 1500.00, 1200.00, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (93, '121', '112', 3, 5, 1, 1500.00, 1200.00, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (94, '', '', 3, 5, 2, 2700.00, 0.00, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (95, NULL, NULL, 3, 6, 1, 280.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (96, NULL, NULL, 3, 6, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (97, NULL, NULL, 3, 7, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (98, NULL, NULL, 3, 7, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (99, NULL, NULL, 3, 8, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (100, NULL, NULL, 3, 8, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (101, NULL, NULL, 3, 9, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (102, NULL, NULL, 3, 9, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (103, NULL, NULL, 3, 10, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (104, NULL, NULL, 3, 10, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (105, NULL, NULL, 3, 11, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (106, NULL, NULL, 3, 11, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (107, NULL, NULL, 3, 12, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (108, NULL, NULL, 3, 12, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (109, NULL, NULL, 3, 13, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (110, NULL, NULL, 3, 13, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (111, NULL, NULL, 3, 14, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (112, NULL, NULL, 3, 14, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (113, NULL, NULL, 3, 15, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (114, NULL, NULL, 3, 15, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (115, NULL, NULL, 3, 16, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (116, NULL, NULL, 3, 16, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (117, NULL, NULL, 3, 17, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (118, NULL, NULL, 3, 17, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (119, NULL, NULL, 3, 18, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (120, NULL, NULL, 3, 18, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (121, NULL, NULL, 3, 19, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (122, NULL, NULL, 3, 19, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (123, NULL, NULL, 3, 20, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (124, NULL, NULL, 3, 20, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (125, NULL, NULL, 3, 21, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (126, NULL, NULL, 3, 21, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (127, NULL, NULL, 4, 1, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (128, NULL, NULL, 4, 1, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (129, NULL, NULL, 4, 2, 1, 1550.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (130, NULL, NULL, 4, 2, 2, 1550.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (131, NULL, NULL, 4, 3, 1, 1550.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (132, NULL, NULL, 4, 3, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (133, NULL, NULL, 4, 4, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (134, NULL, NULL, 4, 4, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (135, NULL, NULL, 4, 5, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (136, NULL, NULL, 4, 5, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (137, NULL, NULL, 4, 6, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (138, NULL, NULL, 4, 6, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (139, NULL, NULL, 4, 7, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (140, NULL, NULL, 4, 7, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (141, '123', '112', 4, 8, 1, 1500.00, 1200.00, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (142, '124', '112', 4, 8, 2, 1500.00, 1200.00, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (143, '125', '112', 4, 9, 1, 1500.00, 1200.00, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (144, '126', '112', 4, 9, 2, 1500.00, 1200.00, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (145, '127', '112', 4, 10, 1, 1500.00, 1200.00, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (146, '128', '112', 4, 10, 2, 1500.00, 1200.00, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (147, NULL, NULL, 4, 11, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (148, NULL, NULL, 4, 11, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (149, NULL, NULL, 4, 12, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (150, NULL, NULL, 4, 12, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (151, NULL, NULL, 4, 13, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (152, NULL, NULL, 4, 13, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (153, NULL, NULL, 4, 14, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (154, NULL, NULL, 4, 14, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (155, NULL, NULL, 4, 15, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (156, NULL, NULL, 4, 15, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (157, NULL, NULL, 4, 16, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (158, NULL, NULL, 4, 16, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (159, NULL, NULL, 4, 17, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (160, NULL, NULL, 4, 17, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (161, NULL, NULL, 4, 18, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (162, NULL, NULL, 4, 18, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (163, NULL, NULL, 4, 19, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (164, NULL, NULL, 4, 19, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (165, NULL, NULL, 4, 20, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (166, NULL, NULL, 4, 20, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (167, NULL, NULL, 4, 21, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (168, NULL, NULL, 4, 21, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (169, NULL, NULL, 5, 1, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (170, NULL, NULL, 5, 1, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (171, NULL, NULL, 5, 2, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (172, NULL, NULL, 5, 2, 2, 1550.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (173, NULL, NULL, 5, 3, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (174, NULL, NULL, 5, 3, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (175, NULL, NULL, 5, 4, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (176, NULL, NULL, 5, 4, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (177, NULL, NULL, 5, 5, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (178, NULL, NULL, 5, 5, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (179, NULL, NULL, 5, 6, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (180, NULL, NULL, 5, 6, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (181, NULL, NULL, 5, 7, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (182, NULL, NULL, 5, 7, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (183, NULL, NULL, 5, 8, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (184, NULL, NULL, 5, 8, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (185, NULL, NULL, 5, 9, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (186, NULL, NULL, 5, 9, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (187, NULL, NULL, 5, 10, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (188, NULL, NULL, 5, 10, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (189, NULL, NULL, 5, 11, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (190, NULL, NULL, 5, 11, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (191, NULL, NULL, 5, 12, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (192, NULL, NULL, 5, 12, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (193, NULL, NULL, 5, 13, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (194, NULL, NULL, 5, 13, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (195, NULL, NULL, 5, 14, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (196, NULL, NULL, 5, 14, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (197, NULL, NULL, 5, 15, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (198, NULL, NULL, 5, 15, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (199, NULL, NULL, 5, 16, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (200, NULL, NULL, 5, 16, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (201, NULL, NULL, 5, 17, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (202, NULL, NULL, 5, 17, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (203, NULL, NULL, 5, 18, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (204, NULL, NULL, 5, 18, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (205, NULL, NULL, 5, 19, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (206, NULL, NULL, 5, 19, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (207, NULL, NULL, 5, 20, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (208, NULL, NULL, 5, 20, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (209, NULL, NULL, 5, 21, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (210, NULL, NULL, 5, 21, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (211, '129', '112', 6, 1, 1, 1500.00, 1200.00, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (212, '130', '113', 6, 1, 2, 1500.00, 1200.00, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (213, '', '', 6, 2, 1, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (214, NULL, NULL, 6, 2, 2, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (215, NULL, NULL, 6, 3, 1, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (216, NULL, NULL, 6, 3, 2, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (217, NULL, NULL, 6, 4, 1, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (218, NULL, NULL, 6, 4, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (219, NULL, NULL, 6, 5, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (220, NULL, NULL, 6, 5, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (221, NULL, NULL, 6, 6, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (222, NULL, NULL, 6, 6, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (223, NULL, NULL, 6, 7, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (224, NULL, NULL, 6, 7, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (225, NULL, NULL, 6, 8, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (226, NULL, NULL, 6, 8, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (227, NULL, NULL, 6, 9, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (228, NULL, NULL, 6, 9, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (229, NULL, NULL, 6, 10, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (230, NULL, NULL, 6, 10, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (231, NULL, NULL, 6, 11, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (232, NULL, NULL, 6, 11, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (233, NULL, NULL, 6, 12, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (234, NULL, NULL, 6, 12, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (235, NULL, NULL, 6, 13, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (236, NULL, NULL, 6, 13, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (237, NULL, NULL, 6, 14, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (238, NULL, NULL, 6, 14, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (239, NULL, NULL, 6, 15, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (240, NULL, NULL, 6, 15, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (241, NULL, NULL, 6, 16, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (242, NULL, NULL, 6, 16, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (243, NULL, NULL, 6, 17, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (244, NULL, NULL, 6, 17, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (245, NULL, NULL, 6, 18, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (246, NULL, NULL, 6, 18, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (247, NULL, NULL, 6, 19, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (248, NULL, NULL, 6, 19, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (249, NULL, NULL, 6, 20, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (250, NULL, NULL, 6, 20, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (251, NULL, NULL, 6, 21, 1, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (252, NULL, NULL, 6, 21, 2, 1788.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (253, '1', '1145', 7, 1, 1, 388.00, 1400.00, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (254, '112', '1145', 7, 1, 2, 568.00, 1220.00, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (255, '112', '1145', 7, 2, 1, 568.00, 1220.00, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (256, '001', '1145', 7, 2, 2, 1788.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (257, NULL, NULL, 7, 3, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (258, '112', '1145', 7, 3, 2, 280.00, 1220.00, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (259, NULL, NULL, 7, 4, 1, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (260, NULL, NULL, 7, 4, 2, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (261, NULL, NULL, 7, 5, 1, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (262, NULL, NULL, 7, 5, 2, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (263, NULL, NULL, 7, 6, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (264, NULL, NULL, 7, 6, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (265, NULL, NULL, 7, 7, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (266, NULL, NULL, 7, 7, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (267, NULL, NULL, 7, 8, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (268, NULL, NULL, 7, 8, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (269, NULL, NULL, 7, 9, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (270, NULL, NULL, 7, 9, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (271, NULL, NULL, 7, 10, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (272, NULL, NULL, 7, 10, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (273, NULL, NULL, 7, 11, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (274, NULL, NULL, 7, 11, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (275, NULL, NULL, 7, 12, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (276, NULL, NULL, 7, 12, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (277, NULL, NULL, 7, 13, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (278, NULL, NULL, 7, 13, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (279, NULL, NULL, 7, 14, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (280, NULL, NULL, 7, 14, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (281, NULL, NULL, 7, 15, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (282, NULL, NULL, 7, 15, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (283, NULL, NULL, 7, 16, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (284, NULL, NULL, 7, 16, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (285, NULL, NULL, 7, 17, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (286, NULL, NULL, 7, 17, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (287, NULL, NULL, 7, 18, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (288, NULL, NULL, 7, 18, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (289, NULL, NULL, 7, 19, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (290, NULL, NULL, 7, 19, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (291, NULL, NULL, 7, 20, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (292, NULL, NULL, 7, 20, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (293, NULL, NULL, 7, 21, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (294, NULL, NULL, 7, 21, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (295, NULL, NULL, 8, 1, 1, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (296, NULL, NULL, 8, 1, 2, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (297, NULL, NULL, 8, 2, 1, 1788.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (298, NULL, NULL, 8, 2, 2, 1788.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (299, NULL, NULL, 8, 3, 1, 1788.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (300, NULL, NULL, 8, 3, 2, 1788.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (301, NULL, NULL, 8, 4, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (302, NULL, NULL, 8, 4, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (303, NULL, NULL, 8, 5, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (304, NULL, NULL, 8, 5, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (305, NULL, NULL, 8, 6, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (306, NULL, NULL, 8, 6, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (307, NULL, NULL, 8, 7, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (308, NULL, NULL, 8, 7, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (309, NULL, NULL, 8, 8, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (310, NULL, NULL, 8, 8, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (311, NULL, NULL, 8, 9, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (312, NULL, NULL, 8, 9, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (313, NULL, NULL, 8, 10, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (314, NULL, NULL, 8, 10, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (315, NULL, NULL, 8, 11, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (316, NULL, NULL, 8, 11, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (317, NULL, NULL, 8, 12, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (318, NULL, NULL, 8, 12, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (319, NULL, NULL, 8, 13, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (320, NULL, NULL, 8, 13, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (321, NULL, NULL, 8, 14, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (322, NULL, NULL, 8, 14, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (323, NULL, NULL, 8, 15, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (324, NULL, NULL, 8, 15, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (325, NULL, NULL, 8, 16, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (326, NULL, NULL, 8, 16, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (327, NULL, NULL, 8, 17, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (328, NULL, NULL, 8, 17, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (329, NULL, NULL, 8, 18, 1, 1788.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (330, NULL, NULL, 8, 18, 2, 1788.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (331, NULL, NULL, 8, 19, 1, 1788.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (332, NULL, NULL, 8, 19, 2, 1788.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (333, NULL, NULL, 8, 20, 1, 1788.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (334, NULL, NULL, 8, 20, 2, 1788.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (335, NULL, NULL, 8, 21, 1, 1788.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (336, NULL, NULL, 8, 21, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (337, NULL, NULL, 9, 1, 1, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (338, NULL, NULL, 9, 1, 2, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (339, NULL, NULL, 9, 2, 1, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (340, NULL, NULL, 9, 2, 2, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (341, NULL, NULL, 9, 3, 1, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (342, NULL, NULL, 9, 3, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (343, NULL, NULL, 9, 4, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (344, NULL, NULL, 9, 4, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (345, NULL, NULL, 9, 5, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (346, NULL, NULL, 9, 5, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (347, NULL, NULL, 9, 6, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (348, NULL, NULL, 9, 6, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (349, NULL, NULL, 9, 7, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (350, NULL, NULL, 9, 7, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (351, NULL, NULL, 9, 8, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (352, NULL, NULL, 9, 8, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (353, NULL, NULL, 9, 9, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (354, NULL, NULL, 9, 9, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (355, NULL, NULL, 9, 10, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (356, NULL, NULL, 9, 10, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (357, NULL, NULL, 9, 11, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (358, NULL, NULL, 9, 11, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (359, NULL, NULL, 9, 12, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (360, NULL, NULL, 9, 12, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (361, NULL, NULL, 9, 13, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (362, NULL, NULL, 9, 13, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (363, NULL, NULL, 9, 14, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (364, NULL, NULL, 9, 14, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (365, NULL, NULL, 9, 15, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (366, NULL, NULL, 9, 15, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (367, NULL, NULL, 9, 16, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (368, NULL, NULL, 9, 16, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (369, NULL, NULL, 9, 17, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (370, NULL, NULL, 9, 17, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (371, NULL, NULL, 9, 18, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (372, NULL, NULL, 9, 18, 2, 1788.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (373, NULL, NULL, 9, 19, 1, 1788.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (374, NULL, NULL, 9, 19, 2, 1788.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (375, NULL, NULL, 9, 20, 1, 1788.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (376, NULL, NULL, 9, 20, 2, 1788.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (377, NULL, NULL, 9, 21, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (378, NULL, NULL, 9, 21, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (379, NULL, NULL, 10, 1, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (380, NULL, NULL, 10, 1, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (381, NULL, NULL, 10, 2, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (382, NULL, NULL, 10, 2, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (383, NULL, NULL, 10, 3, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (384, NULL, NULL, 10, 3, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (385, NULL, NULL, 10, 4, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (386, NULL, NULL, 10, 4, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (387, NULL, NULL, 10, 5, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (388, NULL, NULL, 10, 5, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (389, NULL, NULL, 10, 6, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (390, NULL, NULL, 10, 6, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (391, NULL, NULL, 10, 7, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (392, NULL, NULL, 10, 7, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (393, NULL, NULL, 10, 8, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (394, NULL, NULL, 10, 8, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (395, NULL, NULL, 10, 9, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (396, NULL, NULL, 10, 9, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (397, NULL, NULL, 10, 10, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (398, NULL, NULL, 10, 10, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (399, NULL, NULL, 10, 11, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (400, NULL, NULL, 10, 11, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (401, NULL, NULL, 10, 12, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (402, NULL, NULL, 10, 12, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (403, NULL, NULL, 10, 13, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (404, NULL, NULL, 10, 13, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (405, NULL, NULL, 10, 14, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (406, NULL, NULL, 10, 14, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (407, NULL, NULL, 10, 15, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (408, NULL, NULL, 10, 15, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (409, NULL, NULL, 10, 16, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (410, NULL, NULL, 10, 16, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (411, NULL, NULL, 10, 17, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (412, NULL, NULL, 10, 17, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (413, NULL, NULL, 10, 18, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (414, NULL, NULL, 10, 18, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (415, NULL, NULL, 10, 19, 1, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (416, NULL, NULL, 10, 19, 2, 1500.00, NULL, NULL, 1, NULL);
+INSERT INTO `storage_cage` VALUES (417, NULL, NULL, 10, 20, 1, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (418, NULL, NULL, 10, 20, 2, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (419, NULL, NULL, 10, 21, 1, 1500.00, NULL, NULL, 0, NULL);
+INSERT INTO `storage_cage` VALUES (420, NULL, NULL, 10, 21, 2, 1500.00, NULL, NULL, 0, NULL);
+
+-- ----------------------------
+-- Table structure for storage_rack
+-- ----------------------------
+DROP TABLE IF EXISTS `storage_rack`;
+CREATE TABLE `storage_rack` (
+ `id` bigint NOT NULL AUTO_INCREMENT,
+ `number` int NULL DEFAULT NULL COMMENT '鏋跺瓙缂栧彿',
+ `state` int NULL DEFAULT NULL COMMENT '鐘舵��',
+ `raw_package_id` bigint NULL DEFAULT NULL COMMENT '鍖呭彿缂栧彿',
+ `mod_time` datetime(0) NULL DEFAULT NULL COMMENT '淇敼鏃堕棿',
+ `falg` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '绂佺敤鍚敤',
+ `cell` int NULL DEFAULT NULL,
+ `cageno` int NULL DEFAULT NULL COMMENT '绗煎瓙鍙�',
+ PRIMARY KEY (`id`) USING BTREE,
+ INDEX `raw_package_id1`(`raw_package_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 492 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of storage_rack
+-- ----------------------------
+INSERT INTO `storage_rack` VALUES (72, 1, 1, NULL, NULL, NULL, 1, 1);
+INSERT INTO `storage_rack` VALUES (73, 1, 1, NULL, NULL, NULL, 2, 1);
+INSERT INTO `storage_rack` VALUES (74, 2, 1, NULL, NULL, NULL, 1, 1);
+INSERT INTO `storage_rack` VALUES (75, 2, 0, NULL, NULL, NULL, 2, 1);
+INSERT INTO `storage_rack` VALUES (76, 3, 1, NULL, NULL, NULL, 1, 1);
+INSERT INTO `storage_rack` VALUES (77, 3, 0, NULL, NULL, NULL, 2, 1);
+INSERT INTO `storage_rack` VALUES (78, 4, 3, NULL, NULL, NULL, 1, 1);
+INSERT INTO `storage_rack` VALUES (79, 4, 3, NULL, NULL, NULL, 2, 1);
+INSERT INTO `storage_rack` VALUES (80, 5, 3, NULL, NULL, NULL, 1, 1);
+INSERT INTO `storage_rack` VALUES (81, 5, 3, NULL, NULL, NULL, 2, 1);
+INSERT INTO `storage_rack` VALUES (82, 6, 0, NULL, NULL, NULL, 1, 1);
+INSERT INTO `storage_rack` VALUES (83, 6, 0, NULL, NULL, NULL, 2, 1);
+INSERT INTO `storage_rack` VALUES (84, 7, 0, NULL, NULL, NULL, 1, 1);
+INSERT INTO `storage_rack` VALUES (85, 7, 0, NULL, NULL, NULL, 2, 1);
+INSERT INTO `storage_rack` VALUES (86, 8, 0, NULL, NULL, NULL, 1, 1);
+INSERT INTO `storage_rack` VALUES (87, 8, 0, NULL, NULL, NULL, 2, 1);
+INSERT INTO `storage_rack` VALUES (88, 9, 1, NULL, NULL, NULL, 1, 1);
+INSERT INTO `storage_rack` VALUES (89, 9, 1, NULL, NULL, NULL, 2, 1);
+INSERT INTO `storage_rack` VALUES (90, 10, 1, NULL, NULL, NULL, 1, 1);
+INSERT INTO `storage_rack` VALUES (91, 10, 1, NULL, NULL, NULL, 2, 1);
+INSERT INTO `storage_rack` VALUES (92, 11, 1, NULL, NULL, NULL, 1, 1);
+INSERT INTO `storage_rack` VALUES (93, 11, 1, NULL, NULL, NULL, 2, 1);
+INSERT INTO `storage_rack` VALUES (94, 12, 1, NULL, NULL, NULL, 1, 1);
+INSERT INTO `storage_rack` VALUES (95, 12, 1, NULL, NULL, NULL, 2, 1);
+INSERT INTO `storage_rack` VALUES (96, 13, 1, NULL, NULL, NULL, 1, 1);
+INSERT INTO `storage_rack` VALUES (97, 13, 1, NULL, NULL, NULL, 2, 1);
+INSERT INTO `storage_rack` VALUES (98, 14, 1, NULL, NULL, NULL, 1, 1);
+INSERT INTO `storage_rack` VALUES (99, 14, 1, NULL, NULL, NULL, 2, 1);
+INSERT INTO `storage_rack` VALUES (100, 15, 1, NULL, NULL, NULL, 1, 1);
+INSERT INTO `storage_rack` VALUES (101, 15, 1, NULL, NULL, NULL, 2, 1);
+INSERT INTO `storage_rack` VALUES (102, 16, 1, NULL, NULL, NULL, 1, 1);
+INSERT INTO `storage_rack` VALUES (103, 16, 1, NULL, NULL, NULL, 2, 1);
+INSERT INTO `storage_rack` VALUES (104, 17, 1, NULL, NULL, NULL, 1, 1);
+INSERT INTO `storage_rack` VALUES (105, 17, 1, NULL, NULL, NULL, 2, 1);
+INSERT INTO `storage_rack` VALUES (106, 18, 1, NULL, NULL, NULL, 1, 1);
+INSERT INTO `storage_rack` VALUES (107, 18, 1, NULL, NULL, NULL, 2, 1);
+INSERT INTO `storage_rack` VALUES (108, 19, 1, NULL, NULL, NULL, 1, 1);
+INSERT INTO `storage_rack` VALUES (109, 19, 1, NULL, NULL, NULL, 2, 1);
+INSERT INTO `storage_rack` VALUES (110, 20, 1, NULL, NULL, NULL, 1, 1);
+INSERT INTO `storage_rack` VALUES (111, 20, 1, NULL, NULL, NULL, 2, 1);
+INSERT INTO `storage_rack` VALUES (112, 21, 1, NULL, NULL, NULL, 1, 1);
+INSERT INTO `storage_rack` VALUES (113, 21, 1, NULL, NULL, NULL, 2, 1);
+INSERT INTO `storage_rack` VALUES (114, 22, 1, NULL, NULL, NULL, 1, 2);
+INSERT INTO `storage_rack` VALUES (115, 22, 1, NULL, NULL, NULL, 2, 2);
+INSERT INTO `storage_rack` VALUES (116, 23, 1, NULL, NULL, NULL, 1, 2);
+INSERT INTO `storage_rack` VALUES (117, 23, 1, NULL, NULL, NULL, 2, 2);
+INSERT INTO `storage_rack` VALUES (118, 24, 1, NULL, NULL, NULL, 1, 2);
+INSERT INTO `storage_rack` VALUES (119, 24, 1, NULL, NULL, NULL, 2, 2);
+INSERT INTO `storage_rack` VALUES (120, 25, 1, NULL, NULL, NULL, 1, 2);
+INSERT INTO `storage_rack` VALUES (121, 25, 1, NULL, NULL, NULL, 2, 2);
+INSERT INTO `storage_rack` VALUES (122, 26, 1, NULL, NULL, NULL, 1, 2);
+INSERT INTO `storage_rack` VALUES (123, 26, 1, NULL, NULL, NULL, 2, 2);
+INSERT INTO `storage_rack` VALUES (124, 27, 1, NULL, NULL, NULL, 1, 2);
+INSERT INTO `storage_rack` VALUES (125, 27, 1, NULL, NULL, NULL, 2, 2);
+INSERT INTO `storage_rack` VALUES (126, 28, 1, NULL, NULL, NULL, 1, 2);
+INSERT INTO `storage_rack` VALUES (127, 28, 1, NULL, NULL, NULL, 2, 2);
+INSERT INTO `storage_rack` VALUES (128, 29, 1, NULL, NULL, NULL, 1, 2);
+INSERT INTO `storage_rack` VALUES (129, 29, 1, NULL, NULL, NULL, 2, 2);
+INSERT INTO `storage_rack` VALUES (130, 30, 1, NULL, NULL, NULL, 1, 2);
+INSERT INTO `storage_rack` VALUES (131, 30, 1, NULL, NULL, NULL, 2, 2);
+INSERT INTO `storage_rack` VALUES (132, 31, 1, NULL, NULL, NULL, 1, 2);
+INSERT INTO `storage_rack` VALUES (133, 31, 1, NULL, NULL, NULL, 2, 2);
+INSERT INTO `storage_rack` VALUES (134, 32, 1, NULL, NULL, NULL, 1, 2);
+INSERT INTO `storage_rack` VALUES (135, 32, 1, NULL, NULL, NULL, 2, 2);
+INSERT INTO `storage_rack` VALUES (136, 33, 1, NULL, NULL, NULL, 1, 2);
+INSERT INTO `storage_rack` VALUES (137, 33, 1, NULL, NULL, NULL, 2, 2);
+INSERT INTO `storage_rack` VALUES (138, 34, 1, NULL, NULL, NULL, 1, 2);
+INSERT INTO `storage_rack` VALUES (139, 34, 1, NULL, NULL, NULL, 2, 2);
+INSERT INTO `storage_rack` VALUES (140, 35, 1, NULL, NULL, NULL, 1, 2);
+INSERT INTO `storage_rack` VALUES (141, 35, 1, NULL, NULL, NULL, 2, 2);
+INSERT INTO `storage_rack` VALUES (142, 36, 1, NULL, NULL, NULL, 1, 2);
+INSERT INTO `storage_rack` VALUES (143, 36, 1, NULL, NULL, NULL, 2, 2);
+INSERT INTO `storage_rack` VALUES (144, 37, 1, NULL, NULL, NULL, 1, 2);
+INSERT INTO `storage_rack` VALUES (145, 37, 1, NULL, NULL, NULL, 2, 2);
+INSERT INTO `storage_rack` VALUES (146, 38, 1, NULL, NULL, NULL, 1, 2);
+INSERT INTO `storage_rack` VALUES (147, 38, 1, NULL, NULL, NULL, 2, 2);
+INSERT INTO `storage_rack` VALUES (148, 39, 1, NULL, NULL, NULL, 1, 2);
+INSERT INTO `storage_rack` VALUES (149, 39, 1, NULL, NULL, NULL, 2, 2);
+INSERT INTO `storage_rack` VALUES (150, 40, 1, NULL, NULL, NULL, 1, 2);
+INSERT INTO `storage_rack` VALUES (151, 40, 1, NULL, NULL, NULL, 2, 2);
+INSERT INTO `storage_rack` VALUES (152, 41, 1, NULL, NULL, NULL, 1, 2);
+INSERT INTO `storage_rack` VALUES (153, 41, 1, NULL, NULL, NULL, 2, 2);
+INSERT INTO `storage_rack` VALUES (154, 42, 1, NULL, NULL, NULL, 1, 2);
+INSERT INTO `storage_rack` VALUES (155, 42, 1, NULL, NULL, NULL, 2, 2);
+INSERT INTO `storage_rack` VALUES (156, 43, 1, NULL, NULL, NULL, 1, 3);
+INSERT INTO `storage_rack` VALUES (157, 43, 1, NULL, NULL, NULL, 2, 3);
+INSERT INTO `storage_rack` VALUES (158, 44, 1, NULL, NULL, NULL, 1, 3);
+INSERT INTO `storage_rack` VALUES (159, 44, 1, NULL, NULL, NULL, 2, 3);
+INSERT INTO `storage_rack` VALUES (160, 45, 1, NULL, NULL, NULL, 1, 3);
+INSERT INTO `storage_rack` VALUES (161, 45, 1, NULL, NULL, NULL, 2, 3);
+INSERT INTO `storage_rack` VALUES (162, 46, 1, NULL, NULL, NULL, 1, 3);
+INSERT INTO `storage_rack` VALUES (163, 46, 1, NULL, NULL, NULL, 2, 3);
+INSERT INTO `storage_rack` VALUES (164, 47, 1, NULL, NULL, NULL, 1, 3);
+INSERT INTO `storage_rack` VALUES (165, 47, 1, NULL, NULL, NULL, 2, 3);
+INSERT INTO `storage_rack` VALUES (166, 48, 1, NULL, NULL, NULL, 1, 3);
+INSERT INTO `storage_rack` VALUES (167, 48, 1, NULL, NULL, NULL, 2, 3);
+INSERT INTO `storage_rack` VALUES (168, 49, 1, NULL, NULL, NULL, 1, 3);
+INSERT INTO `storage_rack` VALUES (169, 49, 1, NULL, NULL, NULL, 2, 3);
+INSERT INTO `storage_rack` VALUES (170, 50, 1, NULL, NULL, NULL, 1, 3);
+INSERT INTO `storage_rack` VALUES (171, 50, 1, NULL, NULL, NULL, 2, 3);
+INSERT INTO `storage_rack` VALUES (172, 51, 1, NULL, NULL, NULL, 1, 3);
+INSERT INTO `storage_rack` VALUES (173, 51, 1, NULL, NULL, NULL, 2, 3);
+INSERT INTO `storage_rack` VALUES (174, 52, 1, NULL, NULL, NULL, 1, 3);
+INSERT INTO `storage_rack` VALUES (175, 52, 1, NULL, NULL, NULL, 2, 3);
+INSERT INTO `storage_rack` VALUES (176, 53, 1, NULL, NULL, NULL, 1, 3);
+INSERT INTO `storage_rack` VALUES (177, 53, 1, NULL, NULL, NULL, 2, 3);
+INSERT INTO `storage_rack` VALUES (178, 54, 1, NULL, NULL, NULL, 1, 3);
+INSERT INTO `storage_rack` VALUES (179, 54, 1, NULL, NULL, NULL, 2, 3);
+INSERT INTO `storage_rack` VALUES (180, 55, 1, NULL, NULL, NULL, 1, 3);
+INSERT INTO `storage_rack` VALUES (181, 55, 1, NULL, NULL, NULL, 2, 3);
+INSERT INTO `storage_rack` VALUES (182, 56, 1, NULL, NULL, NULL, 1, 3);
+INSERT INTO `storage_rack` VALUES (183, 56, 1, NULL, NULL, NULL, 2, 3);
+INSERT INTO `storage_rack` VALUES (184, 57, 1, NULL, NULL, NULL, 1, 3);
+INSERT INTO `storage_rack` VALUES (185, 57, 1, NULL, NULL, NULL, 2, 3);
+INSERT INTO `storage_rack` VALUES (186, 58, 1, NULL, NULL, NULL, 1, 3);
+INSERT INTO `storage_rack` VALUES (187, 58, 1, NULL, NULL, NULL, 2, 3);
+INSERT INTO `storage_rack` VALUES (188, 59, 1, NULL, NULL, NULL, 1, 3);
+INSERT INTO `storage_rack` VALUES (189, 59, 1, NULL, NULL, NULL, 2, 3);
+INSERT INTO `storage_rack` VALUES (190, 60, 1, NULL, NULL, NULL, 1, 3);
+INSERT INTO `storage_rack` VALUES (191, 60, 1, NULL, NULL, NULL, 2, 3);
+INSERT INTO `storage_rack` VALUES (192, 61, 1, NULL, NULL, NULL, 1, 3);
+INSERT INTO `storage_rack` VALUES (193, 61, 1, NULL, NULL, NULL, 2, 3);
+INSERT INTO `storage_rack` VALUES (194, 62, 1, NULL, NULL, NULL, 1, 3);
+INSERT INTO `storage_rack` VALUES (195, 62, 1, NULL, NULL, NULL, 2, 3);
+INSERT INTO `storage_rack` VALUES (196, 63, 1, NULL, NULL, NULL, 1, 3);
+INSERT INTO `storage_rack` VALUES (197, 63, 1, NULL, NULL, NULL, 2, 3);
+INSERT INTO `storage_rack` VALUES (198, 64, 1, NULL, NULL, NULL, 1, 4);
+INSERT INTO `storage_rack` VALUES (199, 64, 1, NULL, NULL, NULL, 2, 4);
+INSERT INTO `storage_rack` VALUES (200, 65, 1, NULL, NULL, NULL, 1, 4);
+INSERT INTO `storage_rack` VALUES (201, 65, 1, NULL, NULL, NULL, 2, 4);
+INSERT INTO `storage_rack` VALUES (202, 66, 1, NULL, NULL, NULL, 1, 4);
+INSERT INTO `storage_rack` VALUES (203, 66, 1, NULL, NULL, NULL, 2, 4);
+INSERT INTO `storage_rack` VALUES (204, 67, 1, NULL, NULL, NULL, 1, 4);
+INSERT INTO `storage_rack` VALUES (205, 67, 1, NULL, NULL, NULL, 2, 4);
+INSERT INTO `storage_rack` VALUES (206, 68, 1, NULL, NULL, NULL, 1, 4);
+INSERT INTO `storage_rack` VALUES (207, 68, 1, NULL, NULL, NULL, 2, 4);
+INSERT INTO `storage_rack` VALUES (208, 69, 1, NULL, NULL, NULL, 1, 4);
+INSERT INTO `storage_rack` VALUES (209, 69, 1, NULL, NULL, NULL, 2, 4);
+INSERT INTO `storage_rack` VALUES (210, 70, 1, NULL, NULL, NULL, 1, 4);
+INSERT INTO `storage_rack` VALUES (211, 70, 1, NULL, NULL, NULL, 2, 4);
+INSERT INTO `storage_rack` VALUES (212, 71, 1, NULL, NULL, NULL, 1, 4);
+INSERT INTO `storage_rack` VALUES (213, 71, 1, NULL, NULL, NULL, 2, 4);
+INSERT INTO `storage_rack` VALUES (214, 72, 1, NULL, NULL, NULL, 1, 4);
+INSERT INTO `storage_rack` VALUES (215, 72, 1, NULL, NULL, NULL, 2, 4);
+INSERT INTO `storage_rack` VALUES (216, 73, 1, NULL, NULL, NULL, 1, 4);
+INSERT INTO `storage_rack` VALUES (217, 73, 1, NULL, NULL, NULL, 2, 4);
+INSERT INTO `storage_rack` VALUES (218, 74, 1, NULL, NULL, NULL, 1, 4);
+INSERT INTO `storage_rack` VALUES (219, 74, 1, NULL, NULL, NULL, 2, 4);
+INSERT INTO `storage_rack` VALUES (220, 75, 1, NULL, NULL, NULL, 1, 4);
+INSERT INTO `storage_rack` VALUES (221, 75, 1, NULL, NULL, NULL, 2, 4);
+INSERT INTO `storage_rack` VALUES (222, 76, 1, NULL, NULL, NULL, 1, 4);
+INSERT INTO `storage_rack` VALUES (223, 76, 1, NULL, NULL, NULL, 2, 4);
+INSERT INTO `storage_rack` VALUES (224, 77, 1, NULL, NULL, NULL, 1, 4);
+INSERT INTO `storage_rack` VALUES (225, 77, 1, NULL, NULL, NULL, 2, 4);
+INSERT INTO `storage_rack` VALUES (226, 78, 1, NULL, NULL, NULL, 1, 4);
+INSERT INTO `storage_rack` VALUES (227, 78, 1, NULL, NULL, NULL, 2, 4);
+INSERT INTO `storage_rack` VALUES (228, 79, 1, NULL, NULL, NULL, 1, 4);
+INSERT INTO `storage_rack` VALUES (229, 79, 1, NULL, NULL, NULL, 2, 4);
+INSERT INTO `storage_rack` VALUES (230, 80, 1, NULL, NULL, NULL, 1, 4);
+INSERT INTO `storage_rack` VALUES (231, 80, 1, NULL, NULL, NULL, 2, 4);
+INSERT INTO `storage_rack` VALUES (232, 81, 1, NULL, NULL, NULL, 1, 4);
+INSERT INTO `storage_rack` VALUES (233, 81, 1, NULL, NULL, NULL, 2, 4);
+INSERT INTO `storage_rack` VALUES (234, 82, 1, NULL, NULL, NULL, 1, 4);
+INSERT INTO `storage_rack` VALUES (235, 82, 1, NULL, NULL, NULL, 2, 4);
+INSERT INTO `storage_rack` VALUES (236, 83, 1, NULL, NULL, NULL, 1, 4);
+INSERT INTO `storage_rack` VALUES (237, 83, 1, NULL, NULL, NULL, 2, 4);
+INSERT INTO `storage_rack` VALUES (238, 84, 1, NULL, NULL, NULL, 1, 4);
+INSERT INTO `storage_rack` VALUES (239, 84, 1, NULL, NULL, NULL, 2, 4);
+INSERT INTO `storage_rack` VALUES (240, 85, 1, NULL, NULL, NULL, 1, 5);
+INSERT INTO `storage_rack` VALUES (241, 85, 1, NULL, NULL, NULL, 2, 5);
+INSERT INTO `storage_rack` VALUES (242, 86, 1, NULL, NULL, NULL, 1, 5);
+INSERT INTO `storage_rack` VALUES (243, 86, 1, NULL, NULL, NULL, 2, 5);
+INSERT INTO `storage_rack` VALUES (244, 87, 1, NULL, NULL, NULL, 1, 5);
+INSERT INTO `storage_rack` VALUES (245, 87, 1, NULL, NULL, NULL, 2, 5);
+INSERT INTO `storage_rack` VALUES (246, 88, 1, NULL, NULL, NULL, 1, 5);
+INSERT INTO `storage_rack` VALUES (247, 88, 1, NULL, NULL, NULL, 2, 5);
+INSERT INTO `storage_rack` VALUES (248, 89, 1, NULL, NULL, NULL, 1, 5);
+INSERT INTO `storage_rack` VALUES (249, 89, 1, NULL, NULL, NULL, 2, 5);
+INSERT INTO `storage_rack` VALUES (250, 90, 1, NULL, NULL, NULL, 1, 5);
+INSERT INTO `storage_rack` VALUES (251, 90, 1, NULL, NULL, NULL, 2, 5);
+INSERT INTO `storage_rack` VALUES (252, 91, 1, NULL, NULL, NULL, 1, 5);
+INSERT INTO `storage_rack` VALUES (253, 91, 1, NULL, NULL, NULL, 2, 5);
+INSERT INTO `storage_rack` VALUES (254, 92, 1, NULL, NULL, NULL, 1, 5);
+INSERT INTO `storage_rack` VALUES (255, 92, 1, NULL, NULL, NULL, 2, 5);
+INSERT INTO `storage_rack` VALUES (256, 93, 1, NULL, NULL, NULL, 1, 5);
+INSERT INTO `storage_rack` VALUES (257, 93, 1, NULL, NULL, NULL, 2, 5);
+INSERT INTO `storage_rack` VALUES (258, 94, 1, NULL, NULL, NULL, 1, 5);
+INSERT INTO `storage_rack` VALUES (259, 94, 1, NULL, NULL, NULL, 2, 5);
+INSERT INTO `storage_rack` VALUES (260, 95, 1, NULL, NULL, NULL, 1, 5);
+INSERT INTO `storage_rack` VALUES (261, 95, 1, NULL, NULL, NULL, 2, 5);
+INSERT INTO `storage_rack` VALUES (262, 96, 1, NULL, NULL, NULL, 1, 5);
+INSERT INTO `storage_rack` VALUES (263, 96, 1, NULL, NULL, NULL, 2, 5);
+INSERT INTO `storage_rack` VALUES (264, 97, 1, NULL, NULL, NULL, 1, 5);
+INSERT INTO `storage_rack` VALUES (265, 97, 1, NULL, NULL, NULL, 2, 5);
+INSERT INTO `storage_rack` VALUES (266, 98, 1, NULL, NULL, NULL, 1, 5);
+INSERT INTO `storage_rack` VALUES (267, 98, 1, NULL, NULL, NULL, 2, 5);
+INSERT INTO `storage_rack` VALUES (268, 99, 1, NULL, NULL, NULL, 1, 5);
+INSERT INTO `storage_rack` VALUES (269, 99, 1, NULL, NULL, NULL, 2, 5);
+INSERT INTO `storage_rack` VALUES (270, 100, 1, NULL, NULL, NULL, 1, 5);
+INSERT INTO `storage_rack` VALUES (271, 100, 1, NULL, NULL, NULL, 2, 5);
+INSERT INTO `storage_rack` VALUES (272, 101, 1, NULL, NULL, NULL, 1, 5);
+INSERT INTO `storage_rack` VALUES (273, 101, 1, NULL, NULL, NULL, 2, 5);
+INSERT INTO `storage_rack` VALUES (274, 102, 1, NULL, NULL, NULL, 1, 5);
+INSERT INTO `storage_rack` VALUES (275, 102, 1, NULL, NULL, NULL, 2, 5);
+INSERT INTO `storage_rack` VALUES (276, 103, 1, NULL, NULL, NULL, 1, 5);
+INSERT INTO `storage_rack` VALUES (277, 103, 1, NULL, NULL, NULL, 2, 5);
+INSERT INTO `storage_rack` VALUES (278, 104, 1, NULL, NULL, NULL, 1, 5);
+INSERT INTO `storage_rack` VALUES (279, 104, 1, NULL, NULL, NULL, 2, 5);
+INSERT INTO `storage_rack` VALUES (280, 105, 1, NULL, NULL, NULL, 1, 5);
+INSERT INTO `storage_rack` VALUES (281, 105, 1, NULL, NULL, NULL, 2, 5);
+INSERT INTO `storage_rack` VALUES (282, 106, 1, NULL, NULL, NULL, 1, 6);
+INSERT INTO `storage_rack` VALUES (283, 106, 1, NULL, NULL, NULL, 2, 6);
+INSERT INTO `storage_rack` VALUES (284, 107, 1, NULL, NULL, NULL, 1, 6);
+INSERT INTO `storage_rack` VALUES (285, 107, 1, NULL, NULL, NULL, 2, 6);
+INSERT INTO `storage_rack` VALUES (286, 108, 1, NULL, NULL, NULL, 1, 6);
+INSERT INTO `storage_rack` VALUES (287, 108, 1, NULL, NULL, NULL, 2, 6);
+INSERT INTO `storage_rack` VALUES (288, 109, 1, NULL, NULL, NULL, 1, 6);
+INSERT INTO `storage_rack` VALUES (289, 109, 1, NULL, NULL, NULL, 2, 6);
+INSERT INTO `storage_rack` VALUES (290, 110, 1, NULL, NULL, NULL, 1, 6);
+INSERT INTO `storage_rack` VALUES (291, 110, 1, NULL, NULL, NULL, 2, 6);
+INSERT INTO `storage_rack` VALUES (292, 111, 1, NULL, NULL, NULL, 1, 6);
+INSERT INTO `storage_rack` VALUES (293, 111, 1, NULL, NULL, NULL, 2, 6);
+INSERT INTO `storage_rack` VALUES (294, 112, 1, NULL, NULL, NULL, 1, 6);
+INSERT INTO `storage_rack` VALUES (295, 112, 1, NULL, NULL, NULL, 2, 6);
+INSERT INTO `storage_rack` VALUES (296, 113, 1, NULL, NULL, NULL, 1, 6);
+INSERT INTO `storage_rack` VALUES (297, 113, 1, NULL, NULL, NULL, 2, 6);
+INSERT INTO `storage_rack` VALUES (298, 114, 1, NULL, NULL, NULL, 1, 6);
+INSERT INTO `storage_rack` VALUES (299, 114, 1, NULL, NULL, NULL, 2, 6);
+INSERT INTO `storage_rack` VALUES (300, 115, 1, NULL, NULL, NULL, 1, 6);
+INSERT INTO `storage_rack` VALUES (301, 115, 1, NULL, NULL, NULL, 2, 6);
+INSERT INTO `storage_rack` VALUES (302, 116, 1, NULL, NULL, NULL, 1, 6);
+INSERT INTO `storage_rack` VALUES (303, 116, 1, NULL, NULL, NULL, 2, 6);
+INSERT INTO `storage_rack` VALUES (304, 117, 1, NULL, NULL, NULL, 1, 6);
+INSERT INTO `storage_rack` VALUES (305, 117, 1, NULL, NULL, NULL, 2, 6);
+INSERT INTO `storage_rack` VALUES (306, 118, 1, NULL, NULL, NULL, 1, 6);
+INSERT INTO `storage_rack` VALUES (307, 118, 1, NULL, NULL, NULL, 2, 6);
+INSERT INTO `storage_rack` VALUES (308, 119, 1, NULL, NULL, NULL, 1, 6);
+INSERT INTO `storage_rack` VALUES (309, 119, 1, NULL, NULL, NULL, 2, 6);
+INSERT INTO `storage_rack` VALUES (310, 120, 1, NULL, NULL, NULL, 1, 6);
+INSERT INTO `storage_rack` VALUES (311, 120, 1, NULL, NULL, NULL, 2, 6);
+INSERT INTO `storage_rack` VALUES (312, 121, 1, NULL, NULL, NULL, 1, 6);
+INSERT INTO `storage_rack` VALUES (313, 121, 1, NULL, NULL, NULL, 2, 6);
+INSERT INTO `storage_rack` VALUES (314, 122, 1, NULL, NULL, NULL, 1, 6);
+INSERT INTO `storage_rack` VALUES (315, 122, 1, NULL, NULL, NULL, 2, 6);
+INSERT INTO `storage_rack` VALUES (316, 123, 1, NULL, NULL, NULL, 1, 6);
+INSERT INTO `storage_rack` VALUES (317, 123, 1, NULL, NULL, NULL, 2, 6);
+INSERT INTO `storage_rack` VALUES (318, 124, 1, NULL, NULL, NULL, 1, 6);
+INSERT INTO `storage_rack` VALUES (319, 124, 1, NULL, NULL, NULL, 2, 6);
+INSERT INTO `storage_rack` VALUES (320, 125, 1, NULL, NULL, NULL, 1, 6);
+INSERT INTO `storage_rack` VALUES (321, 125, 1, NULL, NULL, NULL, 2, 6);
+INSERT INTO `storage_rack` VALUES (322, 126, 1, NULL, NULL, NULL, 1, 6);
+INSERT INTO `storage_rack` VALUES (323, 126, 1, NULL, NULL, NULL, 2, 6);
+INSERT INTO `storage_rack` VALUES (324, 127, 1, NULL, NULL, NULL, 1, 7);
+INSERT INTO `storage_rack` VALUES (325, 127, 1, NULL, NULL, NULL, 2, 7);
+INSERT INTO `storage_rack` VALUES (326, 128, 1, NULL, NULL, NULL, 1, 7);
+INSERT INTO `storage_rack` VALUES (327, 128, 1, NULL, NULL, NULL, 2, 7);
+INSERT INTO `storage_rack` VALUES (328, 129, 1, NULL, NULL, NULL, 1, 7);
+INSERT INTO `storage_rack` VALUES (329, 129, 1, NULL, NULL, NULL, 2, 7);
+INSERT INTO `storage_rack` VALUES (330, 130, 1, NULL, NULL, NULL, 1, 7);
+INSERT INTO `storage_rack` VALUES (331, 130, 1, NULL, NULL, NULL, 2, 7);
+INSERT INTO `storage_rack` VALUES (332, 131, 1, NULL, NULL, NULL, 1, 7);
+INSERT INTO `storage_rack` VALUES (333, 131, 1, NULL, NULL, NULL, 2, 7);
+INSERT INTO `storage_rack` VALUES (334, 132, 1, NULL, NULL, NULL, 1, 7);
+INSERT INTO `storage_rack` VALUES (335, 132, 1, NULL, NULL, NULL, 2, 7);
+INSERT INTO `storage_rack` VALUES (336, 133, 1, NULL, NULL, NULL, 1, 7);
+INSERT INTO `storage_rack` VALUES (337, 133, 1, NULL, NULL, NULL, 2, 7);
+INSERT INTO `storage_rack` VALUES (338, 134, 1, NULL, NULL, NULL, 1, 7);
+INSERT INTO `storage_rack` VALUES (339, 134, 1, NULL, NULL, NULL, 2, 7);
+INSERT INTO `storage_rack` VALUES (340, 135, 1, NULL, NULL, NULL, 1, 7);
+INSERT INTO `storage_rack` VALUES (341, 135, 1, NULL, NULL, NULL, 2, 7);
+INSERT INTO `storage_rack` VALUES (342, 136, 1, NULL, NULL, NULL, 1, 7);
+INSERT INTO `storage_rack` VALUES (343, 136, 1, NULL, NULL, NULL, 2, 7);
+INSERT INTO `storage_rack` VALUES (344, 137, 1, NULL, NULL, NULL, 1, 7);
+INSERT INTO `storage_rack` VALUES (345, 137, 1, NULL, NULL, NULL, 2, 7);
+INSERT INTO `storage_rack` VALUES (346, 138, 1, NULL, NULL, NULL, 1, 7);
+INSERT INTO `storage_rack` VALUES (347, 138, 1, NULL, NULL, NULL, 2, 7);
+INSERT INTO `storage_rack` VALUES (348, 139, 1, NULL, NULL, NULL, 1, 7);
+INSERT INTO `storage_rack` VALUES (349, 139, 1, NULL, NULL, NULL, 2, 7);
+INSERT INTO `storage_rack` VALUES (350, 140, 1, NULL, NULL, NULL, 1, 7);
+INSERT INTO `storage_rack` VALUES (351, 140, 1, NULL, NULL, NULL, 2, 7);
+INSERT INTO `storage_rack` VALUES (352, 141, 1, NULL, NULL, NULL, 1, 7);
+INSERT INTO `storage_rack` VALUES (353, 141, 1, NULL, NULL, NULL, 2, 7);
+INSERT INTO `storage_rack` VALUES (354, 142, 1, NULL, NULL, NULL, 1, 7);
+INSERT INTO `storage_rack` VALUES (355, 142, 1, NULL, NULL, NULL, 2, 7);
+INSERT INTO `storage_rack` VALUES (356, 143, 1, NULL, NULL, NULL, 1, 7);
+INSERT INTO `storage_rack` VALUES (357, 143, 1, NULL, NULL, NULL, 2, 7);
+INSERT INTO `storage_rack` VALUES (358, 144, 1, NULL, NULL, NULL, 1, 7);
+INSERT INTO `storage_rack` VALUES (359, 144, 1, NULL, NULL, NULL, 2, 7);
+INSERT INTO `storage_rack` VALUES (360, 145, 1, NULL, NULL, NULL, 1, 7);
+INSERT INTO `storage_rack` VALUES (361, 145, 1, NULL, NULL, NULL, 2, 7);
+INSERT INTO `storage_rack` VALUES (362, 146, 1, NULL, NULL, NULL, 1, 7);
+INSERT INTO `storage_rack` VALUES (363, 146, 1, NULL, NULL, NULL, 2, 7);
+INSERT INTO `storage_rack` VALUES (364, 147, 1, NULL, NULL, NULL, 1, 7);
+INSERT INTO `storage_rack` VALUES (365, 147, 1, NULL, NULL, NULL, 2, 7);
+INSERT INTO `storage_rack` VALUES (366, 148, 1, NULL, NULL, NULL, 1, 8);
+INSERT INTO `storage_rack` VALUES (367, 148, 1, NULL, NULL, NULL, 2, 8);
+INSERT INTO `storage_rack` VALUES (368, 149, 1, NULL, NULL, NULL, 1, 8);
+INSERT INTO `storage_rack` VALUES (369, 149, 1, NULL, NULL, NULL, 2, 8);
+INSERT INTO `storage_rack` VALUES (370, 150, 1, NULL, NULL, NULL, 1, 8);
+INSERT INTO `storage_rack` VALUES (371, 150, 1, NULL, NULL, NULL, 2, 8);
+INSERT INTO `storage_rack` VALUES (372, 151, 1, NULL, NULL, NULL, 1, 8);
+INSERT INTO `storage_rack` VALUES (373, 151, 1, NULL, NULL, NULL, 2, 8);
+INSERT INTO `storage_rack` VALUES (374, 152, 1, NULL, NULL, NULL, 1, 8);
+INSERT INTO `storage_rack` VALUES (375, 152, 1, NULL, NULL, NULL, 2, 8);
+INSERT INTO `storage_rack` VALUES (376, 153, 1, NULL, NULL, NULL, 1, 8);
+INSERT INTO `storage_rack` VALUES (377, 153, 1, NULL, NULL, NULL, 2, 8);
+INSERT INTO `storage_rack` VALUES (378, 154, 1, NULL, NULL, NULL, 1, 8);
+INSERT INTO `storage_rack` VALUES (379, 154, 1, NULL, NULL, NULL, 2, 8);
+INSERT INTO `storage_rack` VALUES (380, 155, 1, NULL, NULL, NULL, 1, 8);
+INSERT INTO `storage_rack` VALUES (381, 155, 1, NULL, NULL, NULL, 2, 8);
+INSERT INTO `storage_rack` VALUES (382, 156, 1, NULL, NULL, NULL, 1, 8);
+INSERT INTO `storage_rack` VALUES (383, 156, 1, NULL, NULL, NULL, 2, 8);
+INSERT INTO `storage_rack` VALUES (384, 157, 1, NULL, NULL, NULL, 1, 8);
+INSERT INTO `storage_rack` VALUES (385, 157, 1, NULL, NULL, NULL, 2, 8);
+INSERT INTO `storage_rack` VALUES (386, 158, 1, NULL, NULL, NULL, 1, 8);
+INSERT INTO `storage_rack` VALUES (387, 158, 1, NULL, NULL, NULL, 2, 8);
+INSERT INTO `storage_rack` VALUES (388, 159, 1, NULL, NULL, NULL, 1, 8);
+INSERT INTO `storage_rack` VALUES (389, 159, 1, NULL, NULL, NULL, 2, 8);
+INSERT INTO `storage_rack` VALUES (390, 160, 1, NULL, NULL, NULL, 1, 8);
+INSERT INTO `storage_rack` VALUES (391, 160, 1, NULL, NULL, NULL, 2, 8);
+INSERT INTO `storage_rack` VALUES (392, 161, 1, NULL, NULL, NULL, 1, 8);
+INSERT INTO `storage_rack` VALUES (393, 161, 1, NULL, NULL, NULL, 2, 8);
+INSERT INTO `storage_rack` VALUES (394, 162, 1, NULL, NULL, NULL, 1, 8);
+INSERT INTO `storage_rack` VALUES (395, 162, 1, NULL, NULL, NULL, 2, 8);
+INSERT INTO `storage_rack` VALUES (396, 163, 1, NULL, NULL, NULL, 1, 8);
+INSERT INTO `storage_rack` VALUES (397, 163, 1, NULL, NULL, NULL, 2, 8);
+INSERT INTO `storage_rack` VALUES (398, 164, 1, NULL, NULL, NULL, 1, 8);
+INSERT INTO `storage_rack` VALUES (399, 164, 1, NULL, NULL, NULL, 2, 8);
+INSERT INTO `storage_rack` VALUES (400, 165, 1, NULL, NULL, NULL, 1, 8);
+INSERT INTO `storage_rack` VALUES (401, 165, 1, NULL, NULL, NULL, 2, 8);
+INSERT INTO `storage_rack` VALUES (402, 166, 1, NULL, NULL, NULL, 1, 8);
+INSERT INTO `storage_rack` VALUES (403, 166, 1, NULL, NULL, NULL, 2, 8);
+INSERT INTO `storage_rack` VALUES (404, 167, 1, NULL, NULL, NULL, 1, 8);
+INSERT INTO `storage_rack` VALUES (405, 167, 1, NULL, NULL, NULL, 2, 8);
+INSERT INTO `storage_rack` VALUES (406, 168, 1, NULL, NULL, NULL, 1, 8);
+INSERT INTO `storage_rack` VALUES (407, 168, 1, NULL, NULL, NULL, 2, 8);
+INSERT INTO `storage_rack` VALUES (408, 169, 1, NULL, NULL, NULL, 1, 9);
+INSERT INTO `storage_rack` VALUES (409, 169, 1, NULL, NULL, NULL, 2, 9);
+INSERT INTO `storage_rack` VALUES (410, 170, 1, NULL, NULL, NULL, 1, 9);
+INSERT INTO `storage_rack` VALUES (411, 170, 1, NULL, NULL, NULL, 2, 9);
+INSERT INTO `storage_rack` VALUES (412, 171, 1, NULL, NULL, NULL, 1, 9);
+INSERT INTO `storage_rack` VALUES (413, 171, 1, NULL, NULL, NULL, 2, 9);
+INSERT INTO `storage_rack` VALUES (414, 172, 1, NULL, NULL, NULL, 1, 9);
+INSERT INTO `storage_rack` VALUES (415, 172, 1, NULL, NULL, NULL, 2, 9);
+INSERT INTO `storage_rack` VALUES (416, 173, 1, NULL, NULL, NULL, 1, 9);
+INSERT INTO `storage_rack` VALUES (417, 173, 1, NULL, NULL, NULL, 2, 9);
+INSERT INTO `storage_rack` VALUES (418, 174, 1, NULL, NULL, NULL, 1, 9);
+INSERT INTO `storage_rack` VALUES (419, 174, 1, NULL, NULL, NULL, 2, 9);
+INSERT INTO `storage_rack` VALUES (420, 175, 1, NULL, NULL, NULL, 1, 9);
+INSERT INTO `storage_rack` VALUES (421, 175, 1, NULL, NULL, NULL, 2, 9);
+INSERT INTO `storage_rack` VALUES (422, 176, 1, NULL, NULL, NULL, 1, 9);
+INSERT INTO `storage_rack` VALUES (423, 176, 1, NULL, NULL, NULL, 2, 9);
+INSERT INTO `storage_rack` VALUES (424, 177, 1, NULL, NULL, NULL, 1, 9);
+INSERT INTO `storage_rack` VALUES (425, 177, 1, NULL, NULL, NULL, 2, 9);
+INSERT INTO `storage_rack` VALUES (426, 178, 1, NULL, NULL, NULL, 1, 9);
+INSERT INTO `storage_rack` VALUES (427, 178, 1, NULL, NULL, NULL, 2, 9);
+INSERT INTO `storage_rack` VALUES (428, 179, 1, NULL, NULL, NULL, 1, 9);
+INSERT INTO `storage_rack` VALUES (429, 179, 1, NULL, NULL, NULL, 2, 9);
+INSERT INTO `storage_rack` VALUES (430, 180, 1, NULL, NULL, NULL, 1, 9);
+INSERT INTO `storage_rack` VALUES (431, 180, 1, NULL, NULL, NULL, 2, 9);
+INSERT INTO `storage_rack` VALUES (432, 181, 1, NULL, NULL, NULL, 1, 9);
+INSERT INTO `storage_rack` VALUES (433, 181, 1, NULL, NULL, NULL, 2, 9);
+INSERT INTO `storage_rack` VALUES (434, 182, 1, NULL, NULL, NULL, 1, 9);
+INSERT INTO `storage_rack` VALUES (435, 182, 1, NULL, NULL, NULL, 2, 9);
+INSERT INTO `storage_rack` VALUES (436, 183, 1, NULL, NULL, NULL, 1, 9);
+INSERT INTO `storage_rack` VALUES (437, 183, 1, NULL, NULL, NULL, 2, 9);
+INSERT INTO `storage_rack` VALUES (438, 184, 1, NULL, NULL, NULL, 1, 9);
+INSERT INTO `storage_rack` VALUES (439, 184, 1, NULL, NULL, NULL, 2, 9);
+INSERT INTO `storage_rack` VALUES (440, 185, 1, NULL, NULL, NULL, 1, 9);
+INSERT INTO `storage_rack` VALUES (441, 185, 1, NULL, NULL, NULL, 2, 9);
+INSERT INTO `storage_rack` VALUES (442, 186, 1, NULL, NULL, NULL, 1, 9);
+INSERT INTO `storage_rack` VALUES (443, 186, 1, NULL, NULL, NULL, 2, 9);
+INSERT INTO `storage_rack` VALUES (444, 187, 1, NULL, NULL, NULL, 1, 9);
+INSERT INTO `storage_rack` VALUES (445, 187, 1, NULL, NULL, NULL, 2, 9);
+INSERT INTO `storage_rack` VALUES (446, 188, 1, NULL, NULL, NULL, 1, 9);
+INSERT INTO `storage_rack` VALUES (447, 188, 1, NULL, NULL, NULL, 2, 9);
+INSERT INTO `storage_rack` VALUES (448, 189, 1, NULL, NULL, NULL, 1, 9);
+INSERT INTO `storage_rack` VALUES (449, 189, 1, NULL, NULL, NULL, 2, 9);
+INSERT INTO `storage_rack` VALUES (450, 190, 1, NULL, NULL, NULL, 1, 10);
+INSERT INTO `storage_rack` VALUES (451, 190, 1, NULL, NULL, NULL, 2, 10);
+INSERT INTO `storage_rack` VALUES (452, 191, 1, NULL, NULL, NULL, 1, 10);
+INSERT INTO `storage_rack` VALUES (453, 191, 1, NULL, NULL, NULL, 2, 10);
+INSERT INTO `storage_rack` VALUES (454, 192, 1, NULL, NULL, NULL, 1, 10);
+INSERT INTO `storage_rack` VALUES (455, 192, 1, NULL, NULL, NULL, 2, 10);
+INSERT INTO `storage_rack` VALUES (456, 193, 1, NULL, NULL, NULL, 1, 10);
+INSERT INTO `storage_rack` VALUES (457, 193, 1, NULL, NULL, NULL, 2, 10);
+INSERT INTO `storage_rack` VALUES (458, 194, 1, NULL, NULL, NULL, 1, 10);
+INSERT INTO `storage_rack` VALUES (459, 194, 1, NULL, NULL, NULL, 2, 10);
+INSERT INTO `storage_rack` VALUES (460, 195, 1, NULL, NULL, NULL, 1, 10);
+INSERT INTO `storage_rack` VALUES (461, 195, 1, NULL, NULL, NULL, 2, 10);
+INSERT INTO `storage_rack` VALUES (462, 196, 1, NULL, NULL, NULL, 1, 10);
+INSERT INTO `storage_rack` VALUES (463, 196, 1, NULL, NULL, NULL, 2, 10);
+INSERT INTO `storage_rack` VALUES (464, 197, 1, NULL, NULL, NULL, 1, 10);
+INSERT INTO `storage_rack` VALUES (465, 197, 1, NULL, NULL, NULL, 2, 10);
+INSERT INTO `storage_rack` VALUES (466, 198, 1, NULL, NULL, NULL, 1, 10);
+INSERT INTO `storage_rack` VALUES (467, 198, 1, NULL, NULL, NULL, 2, 10);
+INSERT INTO `storage_rack` VALUES (468, 199, 1, NULL, NULL, NULL, 1, 10);
+INSERT INTO `storage_rack` VALUES (469, 199, 1, NULL, NULL, NULL, 2, 10);
+INSERT INTO `storage_rack` VALUES (470, 200, 1, NULL, NULL, NULL, 1, 10);
+INSERT INTO `storage_rack` VALUES (471, 200, 1, NULL, NULL, NULL, 2, 10);
+INSERT INTO `storage_rack` VALUES (472, 201, 1, NULL, NULL, NULL, 1, 10);
+INSERT INTO `storage_rack` VALUES (473, 201, 1, NULL, NULL, NULL, 2, 10);
+INSERT INTO `storage_rack` VALUES (474, 202, 1, NULL, NULL, NULL, 1, 10);
+INSERT INTO `storage_rack` VALUES (475, 202, 1, NULL, NULL, NULL, 2, 10);
+INSERT INTO `storage_rack` VALUES (476, 203, 1, NULL, NULL, NULL, 1, 10);
+INSERT INTO `storage_rack` VALUES (477, 203, 1, NULL, NULL, NULL, 2, 10);
+INSERT INTO `storage_rack` VALUES (478, 204, 1, NULL, NULL, NULL, 1, 10);
+INSERT INTO `storage_rack` VALUES (479, 204, 1, NULL, NULL, NULL, 2, 10);
+INSERT INTO `storage_rack` VALUES (480, 205, 1, NULL, NULL, NULL, 1, 10);
+INSERT INTO `storage_rack` VALUES (481, 205, 1, NULL, NULL, NULL, 2, 10);
+INSERT INTO `storage_rack` VALUES (482, 206, 1, NULL, NULL, NULL, 1, 10);
+INSERT INTO `storage_rack` VALUES (483, 206, 1, NULL, NULL, NULL, 2, 10);
+INSERT INTO `storage_rack` VALUES (484, 207, 1, NULL, NULL, NULL, 1, 10);
+INSERT INTO `storage_rack` VALUES (485, 207, 1, NULL, NULL, NULL, 2, 10);
+INSERT INTO `storage_rack` VALUES (486, 208, 1, NULL, NULL, NULL, 1, 10);
+INSERT INTO `storage_rack` VALUES (487, 208, 1, NULL, NULL, NULL, 2, 10);
+INSERT INTO `storage_rack` VALUES (488, 209, 1, NULL, NULL, NULL, 1, 10);
+INSERT INTO `storage_rack` VALUES (489, 209, 1, NULL, NULL, NULL, 2, 10);
+INSERT INTO `storage_rack` VALUES (490, 210, 1, NULL, NULL, NULL, 1, 10);
+INSERT INTO `storage_rack` VALUES (491, 210, 1, NULL, NULL, NULL, 2, 10);
+
+-- ----------------------------
+-- Table structure for storage_task
+-- ----------------------------
+DROP TABLE IF EXISTS `storage_task`;
+CREATE TABLE `storage_task` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT '搴忓彿',
+ `task_type` int NULL DEFAULT NULL COMMENT '浠诲姟绫诲瀷锛�0锛氳繘鐗囷紝1锛氬嚭鐗囷紝2锛氳皟搴︼級',
+ `task_state` int NULL DEFAULT NULL COMMENT '浠诲姟鐘舵�侊紙0锛氭湭瀹屾垚锛�1锛氬畬鎴愶級',
+ `shelf_rack` int NULL DEFAULT NULL COMMENT '寮�濮嬩綅缃�',
+ `load_rack` int NULL DEFAULT NULL COMMENT '缁撴潫浣嶇疆',
+ `start_time` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '浠诲姟寮�濮嬫椂闂�',
+ `finsh_time` datetime(0) NULL DEFAULT NULL COMMENT '浠诲姟缁撴潫鏃堕棿',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of storage_task
+-- ----------------------------
+INSERT INTO `storage_task` VALUES (1, 0, 1, 6, 105, '2023-09-07 10:11:47', '2023-08-29 00:00:00');
+INSERT INTO `storage_task` VALUES (2, 1, 1, 7, 99, '2023-09-07 16:53:35', '2023-08-29 00:00:00');
+INSERT INTO `storage_task` VALUES (3, 2, 0, 26, 105, '2023-09-05 16:24:30', '2023-08-29 00:00:00');
+
+-- ----------------------------
+-- Table structure for user
+-- ----------------------------
+DROP TABLE IF EXISTS `user`;
+CREATE TABLE `user` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭',
+ `parent_id` bigint NOT NULL DEFAULT 1 COMMENT '涓婄骇id',
+ `path` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '1-' COMMENT '璺緞',
+ `level` int NOT NULL DEFAULT 1 COMMENT '绛夌骇',
+ `role_id` bigint NOT NULL DEFAULT 2 COMMENT '瑙掕壊id',
+ `username` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '鐢ㄦ埛鍚�',
+ `password` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '瀵嗙爜',
+ `email` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '閭',
+ `qq` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'qq鍙�',
+ `phone` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鑱旂郴鏂瑰紡',
+ `state` tinyint(1) NOT NULL DEFAULT 1 COMMENT '鐘舵�侊細0/绂佹 1/姝ｅ父',
+ `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '鍒涘缓鏃堕棿',
+ `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '鏇存柊鏃堕棿',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 23 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of user
+-- ----------------------------
+INSERT INTO `user` VALUES (1, 0, '', 0, 1, 'admin', 'b2f0c414a5ffb6944c424bc18ae3a8a0', NULL, NULL, NULL, 1, '2023-08-25 08:58:58', '2023-09-05 16:12:28');
+INSERT INTO `user` VALUES (2, 1, '1-', 1, 2, 'user1', '601b99523f82de29f87771d5f95accdc', 'user1@qq.com', NULL, NULL, 1, '2021-11-28 14:31:39', '2021-11-28 15:09:36');
+INSERT INTO `user` VALUES (3, 1, '1-', 1, 2, 'user2', 'f403c87893db29eb71b21905b57bbd0d', 'user2@qq.com', NULL, NULL, 1, '2021-11-28 14:31:39', '2021-11-28 15:09:36');
+INSERT INTO `user` VALUES (10, 1, '1-', 1, 2, '767655555', '500637c0d48b442a3be6d4fce12e0910', NULL, NULL, NULL, 1, '2023-08-23 20:42:58', '2023-08-23 20:42:58');
+INSERT INTO `user` VALUES (11, 1, '1-', 1, 5, 'uiuyiuy', 'e046c4175152aa3001d2c71c5bc1aee5', '767676767tt@qq.com', NULL, NULL, 1, '2023-08-23 20:43:42', '2023-08-23 20:43:42');
+INSERT INTO `user` VALUES (13, 1, '1-', 1, 2, 'user3', 'b2f0c414a5ffb6944c424bc18ae3a8a0', '2265557345@qq.com', NULL, NULL, 1, '2023-08-24 09:58:40', '2023-08-24 09:58:40');
+INSERT INTO `user` VALUES (15, 1, '1-', 1, 2, '99999', 'b2f0c414a5ffb6944c424bc18ae3a8a0', '2267666@qq.com', NULL, NULL, 1, '2023-08-25 09:37:05', '2023-08-28 14:37:27');
+INSERT INTO `user` VALUES (16, 1, '1-', 1, 2, '5656tttt', 'b2f0c414a5ffb6944c424bc18ae3a8a0', '5454@qq.com', NULL, NULL, 1, '2023-08-28 14:17:44', '2023-08-28 14:37:24');
+INSERT INTO `user` VALUES (18, 1, '1-', 1, 2, '8989ttt', 'b2f0c414a5ffb6944c424bc18ae3a8a0', '224@qq.com', NULL, NULL, 1, '2023-08-28 14:26:17', '2023-08-28 14:37:22');
+INSERT INTO `user` VALUES (19, 1, '1-', 1, 5, '8080ttt', 'b2f0c414a5ffb6944c424bc18ae3a8a0', '87@qq.com', NULL, NULL, 1, '2023-08-28 14:34:39', '2023-08-29 16:03:38');
+
+-- ----------------------------
+-- Procedure structure for Your_Stored_Procedure
+-- ----------------------------
+DROP PROCEDURE IF EXISTS `Your_Stored_Procedure`;
+delimiter ;;
+CREATE PROCEDURE `Your_Stored_Procedure`(in id VARCHAR(20) ,in name VARCHAR(20))
+BEGIN
+select * from device;
+END
+;;
+delimiter ;
+
+SET FOREIGN_KEY_CHECKS = 1;
--
Gitblit v1.8.0