diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..c426cd15 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 00000000..2e9b25c0 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 00000000..6560a989 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,36 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 00000000..536821c8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 00000000..9c1deaaa --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml new file mode 100644 index 00000000..dd874c7d --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml new file mode 100644 index 00000000..974b2b2f --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__cn_hutool_hutool_all_4_1_21.xml b/.idea/libraries/Maven__cn_hutool_hutool_all_4_1_21.xml new file mode 100644 index 00000000..2c1ebb25 --- /dev/null +++ b/.idea/libraries/Maven__cn_hutool_hutool_all_4_1_21.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml b/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml new file mode 100644 index 00000000..61b011ff --- /dev/null +++ b/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_62.xml b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_62.xml new file mode 100644 index 00000000..07ced7ee --- /dev/null +++ b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_62.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml new file mode 100644 index 00000000..d9050a48 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml new file mode 100644 index 00000000..00770912 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_9.xml new file mode 100644 index 00000000..66985d92 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_9_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_9_3.xml new file mode 100644 index 00000000..2c87400e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_9_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_xml_2_9_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_xml_2_9_0.xml new file mode 100644 index 00000000..539dac2d --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_xml_2_9_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_9.xml new file mode 100644 index 00000000..8502ae46 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_9.xml new file mode 100644 index 00000000..b4de13cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_9_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_9_9.xml new file mode 100644 index 00000000..86058979 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_9_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_9_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_9_9.xml new file mode 100644 index 00000000..a25c6f20 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_9_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_9.xml new file mode 100644 index 00000000..0c8bdeee --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_woodstox_woodstox_core_5_0_3.xml b/.idea/libraries/Maven__com_fasterxml_woodstox_woodstox_core_5_0_3.xml new file mode 100644 index 00000000..0605294c --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_woodstox_woodstox_core_5_0_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_andrewoma_dexx_dexx_collections_0_2.xml b/.idea/libraries/Maven__com_github_andrewoma_dexx_dexx_collections_0_2.xml new file mode 100644 index 00000000..9835b4ab --- /dev/null +++ b/.idea/libraries/Maven__com_github_andrewoma_dexx_dexx_collections_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_0_9_5.xml b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_0_9_5.xml new file mode 100644 index 00000000..0984787a --- /dev/null +++ b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_0_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_4_1_4.xml b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_4_1_4.xml new file mode 100644 index 00000000..a93de30d --- /dev/null +++ b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_4_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_qcloudsms_qcloudsms_1_0_5.xml b/.idea/libraries/Maven__com_github_qcloudsms_qcloudsms_1_0_5.xml new file mode 100644 index 00000000..4108752e --- /dev/null +++ b/.idea/libraries/Maven__com_github_qcloudsms_qcloudsms_1_0_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml b/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml new file mode 100644 index 00000000..b7991dc7 --- /dev/null +++ b/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_vlsi_compactmap_compactmap_1_2_1.xml b/.idea/libraries/Maven__com_github_vlsi_compactmap_compactmap_1_2_1.xml new file mode 100644 index 00000000..6b2af78f --- /dev/null +++ b/.idea/libraries/Maven__com_github_vlsi_compactmap_compactmap_1_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_findbugs_annotations_3_0_1.xml b/.idea/libraries/Maven__com_google_code_findbugs_annotations_3_0_1.xml new file mode 100644 index 00000000..e86f2fb9 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_findbugs_annotations_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_1.xml b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_1.xml new file mode 100644 index 00000000..f2e06ff4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_5.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_8_5.xml new file mode 100644 index 00000000..0ab965c6 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_8_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_guava_20_0.xml b/.idea/libraries/Maven__com_google_guava_guava_20_0.xml new file mode 100644 index 00000000..e38a4e07 --- /dev/null +++ b/.idea/libraries/Maven__com_google_guava_guava_20_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_inject_guice_4_1_0.xml b/.idea/libraries/Maven__com_google_inject_guice_4_1_0.xml new file mode 100644 index 00000000..043c8db0 --- /dev/null +++ b/.idea/libraries/Maven__com_google_inject_guice_4_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml new file mode 100644 index 00000000..a9e262be --- /dev/null +++ b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_6.xml b/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_6.xml new file mode 100644 index 00000000..2a63c828 --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_9_3.xml b/.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_9_3.xml new file mode 100644 index 00000000..6bee69bd --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_9_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_9_3.xml b/.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_9_3.xml new file mode 100644 index 00000000..c126864c --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_9_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_12.xml b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_12.xml new file mode 100644 index 00000000..a8797694 --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_javanica_1_5_12.xml b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_javanica_1_5_12.xml new file mode 100644 index 00000000..19d41d74 --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_javanica_1_5_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_12.xml b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_12.xml new file mode 100644 index 00000000..3cd4eed3 --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_serialization_1_5_12.xml b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_serialization_1_5_12.xml new file mode 100644 index 00000000..0bff53c5 --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_serialization_1_5_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_3_0.xml b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_3_0.xml new file mode 100644 index 00000000..69016503 --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_eventbus_0_3_0.xml b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_eventbus_0_3_0.xml new file mode 100644 index 00000000..59a2aef0 --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_eventbus_0_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_infix_0_3_0.xml b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_infix_0_3_0.xml new file mode 100644 index 00000000..26bf19b1 --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_infix_0_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml new file mode 100644 index 00000000..8c3b29f7 --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_2_5.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_2_5.xml new file mode 100644 index 00000000..42ece554 --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_2_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_2_5.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_2_5.xml new file mode 100644 index 00000000..d60cc389 --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_2_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_eureka_2_2_5.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_eureka_2_2_5.xml new file mode 100644 index 00000000..4e66fb73 --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_eureka_2_2_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_2_5.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_2_5.xml new file mode 100644 index 00000000..1bfea867 --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_2_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_2_5.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_2_5.xml new file mode 100644 index 00000000..2a11e1aa --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_2_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_2_5.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_2_5.xml new file mode 100644 index 00000000..497f7398 --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_2_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_servo_servo_core_0_12_21.xml b/.idea/libraries/Maven__com_netflix_servo_servo_core_0_12_21.xml new file mode 100644 index 00000000..8620327d --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_servo_servo_core_0_12_21.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_rabbitmq_amqp_client_5_4_3.xml b/.idea/libraries/Maven__com_rabbitmq_amqp_client_5_4_3.xml new file mode 100644 index 00000000..90fa2ba2 --- /dev/null +++ b/.idea/libraries/Maven__com_rabbitmq_amqp_client_5_4_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml new file mode 100644 index 00000000..a83d0f77 --- /dev/null +++ b/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml new file mode 100644 index 00000000..eb021712 --- /dev/null +++ b/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml new file mode 100644 index 00000000..8a261e2e --- /dev/null +++ b/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_10.xml b/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_10.xml new file mode 100644 index 00000000..fe1bb116 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_zaxxer_HikariCP_3_2_0.xml b/.idea/libraries/Maven__com_zaxxer_HikariCP_3_2_0.xml new file mode 100644 index 00000000..5ccc3aaf --- /dev/null +++ b/.idea/libraries/Maven__com_zaxxer_HikariCP_3_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml new file mode 100644 index 00000000..923a9408 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml new file mode 100644 index 00000000..a6d25f29 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml new file mode 100644 index 00000000..a5603ea5 --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml b/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml new file mode 100644 index 00000000..1a96694d --- /dev/null +++ b/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml new file mode 100644 index 00000000..f29ce862 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_2.xml b/.idea/libraries/Maven__commons_io_commons_io_2_2.xml new file mode 100644 index 00000000..b0ed4164 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_jxpath_commons_jxpath_1_3.xml b/.idea/libraries/Maven__commons_jxpath_commons_jxpath_1_3.xml new file mode 100644 index 00000000..604e494e --- /dev/null +++ b/.idea/libraries/Maven__commons_jxpath_commons_jxpath_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml new file mode 100644 index 00000000..a3b5d101 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_core_9_7_0.xml b/.idea/libraries/Maven__io_github_openfeign_feign_core_9_7_0.xml new file mode 100644 index 00000000..1f015dfc --- /dev/null +++ b/.idea/libraries/Maven__io_github_openfeign_feign_core_9_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_9_7_0.xml b/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_9_7_0.xml new file mode 100644 index 00000000..ce6ac69f --- /dev/null +++ b/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_9_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_java8_9_7_0.xml b/.idea/libraries/Maven__io_github_openfeign_feign_java8_9_7_0.xml new file mode 100644 index 00000000..77a431d0 --- /dev/null +++ b/.idea/libraries/Maven__io_github_openfeign_feign_java8_9_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_9_7_0.xml b/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_9_7_0.xml new file mode 100644 index 00000000..15db94e1 --- /dev/null +++ b/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_9_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_openfeign_form_feign_form_3_3_0.xml b/.idea/libraries/Maven__io_github_openfeign_form_feign_form_3_3_0.xml new file mode 100644 index 00000000..7e3c7a65 --- /dev/null +++ b/.idea/libraries/Maven__io_github_openfeign_form_feign_form_3_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_openfeign_form_feign_form_spring_3_3_0.xml b/.idea/libraries/Maven__io_github_openfeign_form_feign_form_spring_3_3_0.xml new file mode 100644 index 00000000..859d1b63 --- /dev/null +++ b/.idea/libraries/Maven__io_github_openfeign_form_feign_form_spring_3_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_7_0.xml b/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_7_0.xml new file mode 100644 index 00000000..78e8df7c --- /dev/null +++ b/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_lettuce_lettuce_core_5_1_8_RELEASE.xml b/.idea/libraries/Maven__io_lettuce_lettuce_core_5_1_8_RELEASE.xml new file mode 100644 index 00000000..5048a765 --- /dev/null +++ b/.idea/libraries/Maven__io_lettuce_lettuce_core_5_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_micrometer_micrometer_core_1_1_6.xml b/.idea/libraries/Maven__io_micrometer_micrometer_core_1_1_6.xml new file mode 100644 index 00000000..c49ac62b --- /dev/null +++ b/.idea/libraries/Maven__io_micrometer_micrometer_core_1_1_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_39_Final.xml b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_39_Final.xml new file mode 100644 index 00000000..426d0e07 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_39_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_codec_4_1_39_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_4_1_39_Final.xml new file mode 100644 index 00000000..6afb8374 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_codec_4_1_39_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_common_4_1_39_Final.xml b/.idea/libraries/Maven__io_netty_netty_common_4_1_39_Final.xml new file mode 100644 index 00000000..57397bf7 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_common_4_1_39_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_handler_4_1_39_Final.xml b/.idea/libraries/Maven__io_netty_netty_handler_4_1_39_Final.xml new file mode 100644 index 00000000..e9869509 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_handler_4_1_39_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_39_Final.xml b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_39_Final.xml new file mode 100644 index 00000000..56d9b45c --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_39_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_transport_4_1_39_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_4_1_39_Final.xml new file mode 100644 index 00000000..d7715b52 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_transport_4_1_39_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_projectreactor_reactor_core_3_2_12_RELEASE.xml b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_2_12_RELEASE.xml new file mode 100644 index 00000000..1e36e7f6 --- /dev/null +++ b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_2_12_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml b/.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml new file mode 100644 index 00000000..d9e1c455 --- /dev/null +++ b/.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_reactivex_rxjava_reactive_streams_1_2_1.xml b/.idea/libraries/Maven__io_reactivex_rxjava_reactive_streams_1_2_1.xml new file mode 100644 index 00000000..f7ca3b79 --- /dev/null +++ b/.idea/libraries/Maven__io_reactivex_rxjava_reactive_streams_1_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml b/.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml new file mode 100644 index 00000000..014cd263 --- /dev/null +++ b/.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml b/.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml new file mode 100644 index 00000000..67fc64ad --- /dev/null +++ b/.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml b/.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml new file mode 100644 index 00000000..3f419626 --- /dev/null +++ b/.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml new file mode 100644 index 00000000..74f266d1 --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml new file mode 100644 index 00000000..61d5d27d --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml new file mode 100644 index 00000000..7589b4ca --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml new file mode 100644 index 00000000..e6cb233c --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml new file mode 100644 index 00000000..32389a4f --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml new file mode 100644 index 00000000..79400a0d --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml new file mode 100644 index 00000000..3c049ecd --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml b/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml new file mode 100644 index 00000000..eefd1e86 --- /dev/null +++ b/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml b/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml new file mode 100644 index 00000000..1cfdaf87 --- /dev/null +++ b/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_zipkin_brave_brave_5_4_3.xml b/.idea/libraries/Maven__io_zipkin_brave_brave_5_4_3.xml new file mode 100644 index 00000000..3bc3be41 --- /dev/null +++ b/.idea/libraries/Maven__io_zipkin_brave_brave_5_4_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_zipkin_brave_brave_context_log4j2_5_4_3.xml b/.idea/libraries/Maven__io_zipkin_brave_brave_context_log4j2_5_4_3.xml new file mode 100644 index 00000000..ee8123d1 --- /dev/null +++ b/.idea/libraries/Maven__io_zipkin_brave_brave_context_log4j2_5_4_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_http_5_4_3.xml b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_http_5_4_3.xml new file mode 100644 index 00000000..46f0a871 --- /dev/null +++ b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_http_5_4_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_httpasyncclient_5_4_3.xml b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_httpasyncclient_5_4_3.xml new file mode 100644 index 00000000..80d7a57d --- /dev/null +++ b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_httpasyncclient_5_4_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_httpclient_5_4_3.xml b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_httpclient_5_4_3.xml new file mode 100644 index 00000000..c5af2430 --- /dev/null +++ b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_httpclient_5_4_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_kafka_clients_5_4_3.xml b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_kafka_clients_5_4_3.xml new file mode 100644 index 00000000..c21d331d --- /dev/null +++ b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_kafka_clients_5_4_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_servlet_5_4_3.xml b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_servlet_5_4_3.xml new file mode 100644 index 00000000..b7cf08ca --- /dev/null +++ b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_servlet_5_4_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_spring_rabbit_5_4_3.xml b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_spring_rabbit_5_4_3.xml new file mode 100644 index 00000000..08784fb1 --- /dev/null +++ b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_spring_rabbit_5_4_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_spring_web_5_4_3.xml b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_spring_web_5_4_3.xml new file mode 100644 index 00000000..b90e35bd --- /dev/null +++ b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_spring_web_5_4_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_spring_webmvc_5_4_3.xml b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_spring_webmvc_5_4_3.xml new file mode 100644 index 00000000..44fc4fb1 --- /dev/null +++ b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_spring_webmvc_5_4_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_zipkin_reporter2_zipkin_reporter_2_7_10.xml b/.idea/libraries/Maven__io_zipkin_reporter2_zipkin_reporter_2_7_10.xml new file mode 100644 index 00000000..78f47c20 --- /dev/null +++ b/.idea/libraries/Maven__io_zipkin_reporter2_zipkin_reporter_2_7_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_zipkin_reporter2_zipkin_sender_amqp_client_2_7_10.xml b/.idea/libraries/Maven__io_zipkin_reporter2_zipkin_sender_amqp_client_2_7_10.xml new file mode 100644 index 00000000..125927b6 --- /dev/null +++ b/.idea/libraries/Maven__io_zipkin_reporter2_zipkin_sender_amqp_client_2_7_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_zipkin_reporter2_zipkin_sender_kafka11_2_7_10.xml b/.idea/libraries/Maven__io_zipkin_reporter2_zipkin_sender_kafka11_2_7_10.xml new file mode 100644 index 00000000..d6f6782e --- /dev/null +++ b/.idea/libraries/Maven__io_zipkin_reporter2_zipkin_sender_kafka11_2_7_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_zipkin_zipkin2_zipkin_2_11_7.xml b/.idea/libraries/Maven__io_zipkin_zipkin2_zipkin_2_11_7.xml new file mode 100644 index 00000000..e0304a97 --- /dev/null +++ b/.idea/libraries/Maven__io_zipkin_zipkin2_zipkin_2_11_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml b/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml new file mode 100644 index 00000000..095c2866 --- /dev/null +++ b/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_inject_javax_inject_1.xml b/.idea/libraries/Maven__javax_inject_javax_inject_1.xml new file mode 100644 index 00000000..b024d920 --- /dev/null +++ b/.idea/libraries/Maven__javax_inject_javax_inject_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml new file mode 100644 index 00000000..8c822085 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml new file mode 100644 index 00000000..877ae022 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_websocket_javax_websocket_api_1_1.xml b/.idea/libraries/Maven__javax_websocket_javax_websocket_api_1_1.xml new file mode 100644 index 00000000..e03ce582 --- /dev/null +++ b/.idea/libraries/Maven__javax_websocket_javax_websocket_api_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml b/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml new file mode 100644 index 00000000..cb7e729b --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml b/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml new file mode 100644 index 00000000..313dd9c8 --- /dev/null +++ b/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__joda_time_joda_time_2_10_3.xml b/.idea/libraries/Maven__joda_time_joda_time_2_10_3.xml new file mode 100644 index 00000000..1435996e --- /dev/null +++ b/.idea/libraries/Maven__joda_time_joda_time_2_10_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml new file mode 100644 index 00000000..d3b71924 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_17.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_17.xml new file mode 100644 index 00000000..05b4771b --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_17.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_16.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_16.xml new file mode 100644 index 00000000..1d6377b8 --- /dev/null +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_16.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_16.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_16.xml new file mode 100644 index 00000000..7640d10a --- /dev/null +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_16.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_jcip_jcip_annotations_1_0.xml b/.idea/libraries/Maven__net_jcip_jcip_annotations_1_0.xml new file mode 100644 index 00000000..a4877eff --- /dev/null +++ b/.idea/libraries/Maven__net_jcip_jcip_annotations_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml b/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml new file mode 100644 index 00000000..c85dd2a9 --- /dev/null +++ b/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml b/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml new file mode 100644 index 00000000..fdd4d462 --- /dev/null +++ b/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sourceforge_htmlcleaner_htmlcleaner_2_22.xml b/.idea/libraries/Maven__net_sourceforge_htmlcleaner_htmlcleaner_2_22.xml new file mode 100644 index 00000000..8af1619d --- /dev/null +++ b/.idea/libraries/Maven__net_sourceforge_htmlcleaner_htmlcleaner_2_22.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml b/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml new file mode 100644 index 00000000..16f7b549 --- /dev/null +++ b/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml b/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml new file mode 100644 index 00000000..f45d08ad --- /dev/null +++ b/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml new file mode 100644 index 00000000..36cc6acd --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_8_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_8_1.xml new file mode 100644 index 00000000..8017f0f5 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_8_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_math_2_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_math_2_2.xml new file mode 100644 index 00000000..669f1259 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_math_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_1.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_1.xml new file mode 100644 index 00000000..240c31c3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_1.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_1.xml new file mode 100644 index 00000000..0ee1b622 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_9.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_9.xml new file mode 100644 index 00000000..a6cd8bae --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml new file mode 100644 index 00000000..a8ccd8c8 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml new file mode 100644 index 00000000..c07afd03 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_17.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_17.xml new file mode 100644 index 00000000..c7594208 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_17.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_17.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_17.xml new file mode 100644 index 00000000..87665193 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_17.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_17.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_17.xml new file mode 100644 index 00000000..ed2ae3b0 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_17.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_4_0.xml new file mode 100644 index 00000000..c880d724 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_4_0.xml new file mode 100644 index 00000000..0fa594fe --- /dev/null +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_4_0.xml new file mode 100644 index 00000000..d57b86bd --- /dev/null +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_4_0.xml new file mode 100644 index 00000000..1afe73bb --- /dev/null +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_4_0.xml new file mode 100644 index 00000000..4da72a3d --- /dev/null +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_4_0.xml new file mode 100644 index 00000000..53029e24 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_4_0.xml new file mode 100644 index 00000000..58c5eaf1 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_4_0.xml new file mode 100644 index 00000000..02e5f05d --- /dev/null +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_4_0.xml new file mode 100644 index 00000000..4d86375a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_4_0.xml new file mode 100644 index 00000000..69e34161 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_4_0.xml new file mode 100644 index 00000000..0f144e83 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml new file mode 100644 index 00000000..bcef78e7 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjrt_1_9_4.xml b/.idea/libraries/Maven__org_aspectj_aspectjrt_1_9_4.xml new file mode 100644 index 00000000..dad7e0d1 --- /dev/null +++ b/.idea/libraries/Maven__org_aspectj_aspectjrt_1_9_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_4.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_4.xml new file mode 100644 index 00000000..f26a3cf0 --- /dev/null +++ b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml new file mode 100644 index 00000000..6c945692 --- /dev/null +++ b/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_beanshell_bsh_2_0b5.xml b/.idea/libraries/Maven__org_beanshell_bsh_2_0b5.xml new file mode 100644 index 00000000..87e43be9 --- /dev/null +++ b/.idea/libraries/Maven__org_beanshell_bsh_2_0b5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_60.xml b/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_60.xml new file mode 100644 index 00000000..471f80c5 --- /dev/null +++ b/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_60.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_60.xml b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_60.xml new file mode 100644 index 00000000..170a65be --- /dev/null +++ b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_60.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_3_7.xml b/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_3_7.xml new file mode 100644 index 00000000..5030d27a --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_3_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_4.xml b/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_4.xml new file mode 100644 index 00000000..5f948ed9 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_1.xml b/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_1.xml new file mode 100644 index 00000000..4acc8dd5 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_annotations_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_annotations_9_4_19_v20190610.xml new file mode 100644 index 00000000..3586aa31 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_annotations_9_4_19_v20190610.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_client_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_client_9_4_19_v20190610.xml new file mode 100644 index 00000000..8fcbfac0 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_client_9_4_19_v20190610.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_continuation_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_continuation_9_4_19_v20190610.xml new file mode 100644 index 00000000..7a9ae055 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_continuation_9_4_19_v20190610.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_4_19_v20190610.xml new file mode 100644 index 00000000..c4d34d8a --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_4_19_v20190610.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_4_19_v20190610.xml new file mode 100644 index 00000000..fe926ad4 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_4_19_v20190610.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_plus_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_plus_9_4_19_v20190610.xml new file mode 100644 index 00000000..c4a5afbc --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_plus_9_4_19_v20190610.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_4_19_v20190610.xml new file mode 100644 index 00000000..37dfe27a --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_4_19_v20190610.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_4_19_v20190610.xml new file mode 100644 index 00000000..7d1ee607 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_4_19_v20190610.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_9_4_19_v20190610.xml new file mode 100644 index 00000000..b2255b0f --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_9_4_19_v20190610.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlets_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlets_9_4_19_v20190610.xml new file mode 100644 index 00000000..a43f9c15 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlets_9_4_19_v20190610.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_4_19_v20190610.xml new file mode 100644 index 00000000..9b1231b9 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_4_19_v20190610.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_9_4_19_v20190610.xml new file mode 100644 index 00000000..31eca6cb --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_9_4_19_v20190610.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_9_4_19_v20190610.xml new file mode 100644 index 00000000..44b48dc5 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_9_4_19_v20190610.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_javax_websocket_client_impl_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_javax_websocket_client_impl_9_4_19_v20190610.xml new file mode 100644 index 00000000..b5dec2c4 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_websocket_javax_websocket_client_impl_9_4_19_v20190610.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_javax_websocket_server_impl_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_javax_websocket_server_impl_9_4_19_v20190610.xml new file mode 100644 index 00000000..987f522f --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_websocket_javax_websocket_server_impl_9_4_19_v20190610.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_4_19_v20190610.xml new file mode 100644 index 00000000..65e6203b --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_4_19_v20190610.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_4_19_v20190610.xml new file mode 100644 index 00000000..19cb190a --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_4_19_v20190610.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_4_19_v20190610.xml new file mode 100644 index 00000000..12aaa1a5 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_4_19_v20190610.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_server_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_server_9_4_19_v20190610.xml new file mode 100644 index 00000000..c4c347f1 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_server_9_4_19_v20190610.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_servlet_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_servlet_9_4_19_v20190610.xml new file mode 100644 index 00000000..d301a7aa --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_servlet_9_4_19_v20190610.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 00000000..e5d35d87 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml new file mode 100644 index 00000000..2a1ddc27 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml b/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml new file mode 100644 index 00000000..c6263b8c --- /dev/null +++ b/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_17_Final.xml b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_17_Final.xml new file mode 100644 index 00000000..489a30be --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_17_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_3_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_3_Final.xml new file mode 100644 index 00000000..1323c971 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_3_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jdom_jdom2_2_0_6.xml b/.idea/libraries/Maven__org_jdom_jdom2_2_0_6.xml new file mode 100644 index 00000000..fef0d501 --- /dev/null +++ b/.idea/libraries/Maven__org_jdom_jdom2_2_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20170516.xml b/.idea/libraries/Maven__org_json_json_20170516.xml new file mode 100644 index 00000000..284ad69e --- /dev/null +++ b/.idea/libraries/Maven__org_json_json_20170516.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml b/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml new file mode 100644 index 00000000..266ea422 --- /dev/null +++ b/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml new file mode 100644 index 00000000..5fa1abfd --- /dev/null +++ b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml b/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml new file mode 100644 index 00000000..88a8a0f5 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mortbay_jasper_apache_el_8_5_40.xml b/.idea/libraries/Maven__org_mortbay_jasper_apache_el_8_5_40.xml new file mode 100644 index 00000000..2fb4a9d2 --- /dev/null +++ b/.idea/libraries/Maven__org_mortbay_jasper_apache_el_8_5_40.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_generator_mybatis_generator_core_1_3_7.xml b/.idea/libraries/Maven__org_mybatis_generator_mybatis_generator_core_1_3_7.xml new file mode 100644 index 00000000..3ee34af0 --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_generator_mybatis_generator_core_1_3_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_3_4_0.xml b/.idea/libraries/Maven__org_mybatis_mybatis_3_4_0.xml new file mode 100644 index 00000000..44e088ae --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_mybatis_3_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml new file mode 100644 index 00000000..1b0619ab --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_1_1.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_1_1.xml new file mode 100644 index 00000000..419114c7 --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_1_1.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_1_1.xml new file mode 100644 index 00000000..f51338c2 --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml new file mode 100644 index 00000000..4679a935 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml new file mode 100644 index 00000000..acdc0195 --- /dev/null +++ b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_7_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_7_1.xml new file mode 100644 index 00000000..f567a85c --- /dev/null +++ b/.idea/libraries/Maven__org_ow2_asm_asm_7_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_analysis_7_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_analysis_7_1.xml new file mode 100644 index 00000000..1e1ed0b4 --- /dev/null +++ b/.idea/libraries/Maven__org_ow2_asm_asm_analysis_7_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_commons_7_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_commons_7_1.xml new file mode 100644 index 00000000..9bea6223 --- /dev/null +++ b/.idea/libraries/Maven__org_ow2_asm_asm_commons_7_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_tree_7_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_tree_7_1.xml new file mode 100644 index 00000000..5cfee4cc --- /dev/null +++ b/.idea/libraries/Maven__org_ow2_asm_asm_tree_7_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml new file mode 100644 index 00000000..e3be1945 --- /dev/null +++ b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml b/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml new file mode 100644 index 00000000..8b0988b8 --- /dev/null +++ b/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml new file mode 100644 index 00000000..69c5c8ac --- /dev/null +++ b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_28.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_28.xml new file mode 100644 index 00000000..855d1e62 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_28.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_28.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_28.xml new file mode 100644 index 00000000..69a53e4c --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_28.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_2_1_8_RELEASE.xml new file mode 100644 index 00000000..b15074ed --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_2_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_2_1_8_RELEASE.xml new file mode 100644 index 00000000..ca4326de --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_2_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_8_RELEASE.xml new file mode 100644 index 00000000..056d8e74 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_1_8_RELEASE.xml new file mode 100644 index 00000000..5d8a4876 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_1_8_RELEASE.xml new file mode 100644 index 00000000..c503119f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_8_RELEASE.xml new file mode 100644 index 00000000..5f992b7f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_processor_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_processor_2_1_8_RELEASE.xml new file mode 100644 index 00000000..12934655 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_processor_2_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_8_RELEASE.xml new file mode 100644 index 00000000..9be55e76 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_8_RELEASE.xml new file mode 100644 index 00000000..b04a64a0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_1_8_RELEASE.xml new file mode 100644 index 00000000..9405f299 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_2_1_8_RELEASE.xml new file mode 100644 index 00000000..59161e64 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_2_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_1_8_RELEASE.xml new file mode 100644 index 00000000..f1661719 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_1_8_RELEASE.xml new file mode 100644 index 00000000..6703a629 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_1_8_RELEASE.xml new file mode 100644 index 00000000..8a666443 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jetty_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jetty_2_1_8_RELEASE.xml new file mode 100644 index 00000000..5a4711e7 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jetty_2_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_8_RELEASE.xml new file mode 100644 index 00000000..7c63acba --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_8_RELEASE.xml new file mode 100644 index 00000000..7404a08b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_8_RELEASE.xml new file mode 100644 index 00000000..7c702576 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_8_RELEASE.xml new file mode 100644 index 00000000..4e3eac68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_1_8_RELEASE.xml new file mode 100644 index 00000000..6eca6ed2 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_8_RELEASE.xml new file mode 100644 index 00000000..c56e7435 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_8_RELEASE.xml new file mode 100644 index 00000000..86efc9aa --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_0_2_RELEASE.xml new file mode 100644 index 00000000..2ac736ba --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_0_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_0_2_RELEASE.xml new file mode 100644 index 00000000..de727253 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_0_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_0_2_RELEASE.xml new file mode 100644 index 00000000..2e662aa4 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_0_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_core_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_core_2_0_2_RELEASE.xml new file mode 100644 index 00000000..6e886217 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_core_2_0_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_2_0_2_RELEASE.xml new file mode 100644 index 00000000..c10672f3 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_2_0_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_0_2_RELEASE.xml new file mode 100644 index 00000000..6389a7ce --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_0_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_0_2_RELEASE.xml new file mode 100644 index 00000000..6c44eea8 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_0_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_sleuth_core_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_sleuth_core_2_0_2_RELEASE.xml new file mode 100644 index 00000000..e8ff949c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_sleuth_core_2_0_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_sleuth_zipkin_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_sleuth_zipkin_2_0_2_RELEASE.xml new file mode 100644 index 00000000..03114048 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_sleuth_zipkin_2_0_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_0_2_RELEASE.xml new file mode 100644 index 00000000..a0fc2d4a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_0_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_0_2_RELEASE.xml new file mode 100644 index 00000000..8bb1bcb2 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_0_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_client_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_client_2_0_2_RELEASE.xml new file mode 100644 index 00000000..745c3297 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_client_2_0_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_2_0_2_RELEASE.xml new file mode 100644 index 00000000..1db1791c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_2_0_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_0_2_RELEASE.xml new file mode 100644 index 00000000..842c633c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_0_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_2_0_2_RELEASE.xml new file mode 100644 index 00000000..297c8056 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_2_0_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_sleuth_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_sleuth_2_0_2_RELEASE.xml new file mode 100644 index 00000000..d97abd04 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_sleuth_2_0_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_10_RELEASE.xml new file mode 100644 index 00000000..a01ad536 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_1_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_1_10_RELEASE.xml new file mode 100644 index 00000000..375cb7d2 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_1_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_1_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_1_10_RELEASE.xml new file mode 100644 index 00000000..3964806e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_1_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml new file mode 100644 index 00000000..415679a6 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml new file mode 100644 index 00000000..a2d86278 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_4_RELEASE.xml new file mode 100644 index 00000000..06f4d583 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_1_6_RELEASE.xml new file mode 100644 index 00000000..10f93441 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_1_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_7_RELEASE.xml new file mode 100644 index 00000000..21fa4d8f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_7_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_1_9_RELEASE.xml new file mode 100644 index 00000000..e1214d6f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_5_1_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_1_9_RELEASE.xml new file mode 100644 index 00000000..c85d3912 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_5_1_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_1_9_RELEASE.xml new file mode 100644 index 00000000..77a2dff2 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_5_1_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_9_RELEASE.xml new file mode 100644 index 00000000..9d73c6ea --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_1_9_RELEASE.xml new file mode 100644 index 00000000..e2c6e4f2 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_5_1_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_1_9_RELEASE.xml new file mode 100644 index 00000000..dbece0dc --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_5_1_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_9_RELEASE.xml new file mode 100644 index 00000000..83a13dbc --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_9_RELEASE.xml new file mode 100644 index 00000000..a3bb4166 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_messaging_5_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_messaging_5_1_9_RELEASE.xml new file mode 100644 index 00000000..695cd536 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_messaging_5_1_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_oxm_5_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_oxm_5_1_9_RELEASE.xml new file mode 100644 index 00000000..64a139c9 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_oxm_5_1_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_5_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_1_9_RELEASE.xml new file mode 100644 index 00000000..c21dbd86 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_5_1_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_1_9_RELEASE.xml new file mode 100644 index 00000000..1b287412 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_5_1_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_1_9_RELEASE.xml new file mode 100644 index 00000000..c751ec2b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_5_1_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_9_RELEASE.xml new file mode 100644 index 00000000..abb746aa --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_websocket_5_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_websocket_5_1_9_RELEASE.xml new file mode 100644 index 00000000..2e455955 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_websocket_5_1_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_3.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_3.xml new file mode 100644 index 00000000..172c3cbb --- /dev/null +++ b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml new file mode 100644 index 00000000..5e240702 --- /dev/null +++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml new file mode 100644 index 00000000..4de7af33 --- /dev/null +++ b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml b/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml new file mode 100644 index 00000000..da17a2dc --- /dev/null +++ b/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml b/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml new file mode 100644 index 00000000..4d9db360 --- /dev/null +++ b/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..d30d09e2 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..b9dfe982 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 00000000..89d3c35a --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,1122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1575429210394 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.8 + + + + + + + + 1.8 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ccsenscloud.iml b/ccsenscloud.iml index 27ae93b4..bd585a82 100644 --- a/ccsenscloud.iml +++ b/ccsenscloud.iml @@ -102,8 +102,6 @@ - - diff --git a/cloudutil/cloudutil.iml b/cloudutil/cloudutil.iml index 8ae41877..2c4ca191 100644 --- a/cloudutil/cloudutil.iml +++ b/cloudutil/cloudutil.iml @@ -4,15 +4,6 @@ - - - - - - - - - @@ -20,7 +11,6 @@ - @@ -219,8 +209,6 @@ - - diff --git a/cloudutil/target/classes/application-util-dev.yml b/cloudutil/target/classes/application-util-dev.yml new file mode 100644 index 00000000..272013c3 --- /dev/null +++ b/cloudutil/target/classes/application-util-dev.yml @@ -0,0 +1,57 @@ +#服务端点暴露 +management: + endpoints: + web: + exposure: + # 暴露xxx端点，如需暴露多个，用,分隔；如需暴露所有端点，用'*' + include: auditevents,caches,conditions,flyway,health,heapdump,httptrace,info,integrationgraph,jolokia,logfile,loggers,liquibase,metrics,mappings,prometheus,scheduledtasks,sessions,shutdown,threaddump,hystrix.stream +# # 不暴露哪些端点 +# exclude: env,beans,configprops + endpoint: + health: + # 是否展示健康检查详情 + show-details: always + health: + redis: + enabled: false +#eureka注册 +eureka: + client: + service-url: + # 指定eureka server通信地址，注意/eureka/小尾巴不能少 + #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/ + defaultZone: http://admin:admin@127.0.0.1:8761/eureka/ + instance: + # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server + prefer-ip-address: true + metadata-map: + management: + context-path: ${server.servlet.context-path}/actuator + home-page-url-path: ${server.servlet.context-path} + status-page-url-path: ${server.servlet.context-path}/actuator/info + health-check-url-path: ${server.servlet.context-path}/actuator/health +feign: + client: + config: + default: + connectTime: 5000 + readTimeout: 5000 + # NONE【性能最佳，适用于生产】：不记录任何日志（默认值）。 + # BASIC【适用于生产环境追踪问题】：仅记录请求方法、URL、响应状态代码以及执行时间。 + # HEADERS：记录BASIC级别的基础上，记录请求和响应的header。 + # FULL【比较适用于开发及测试环境定位问题】：记录请求和响应的header、body和元数据 + loggerLevel: basic + hystrix: + enabled: true +# sleuth +logging: + level: + root: info + org.springframework.cloud.sleuth: DEBUG +spring: + zipkin: + base-url: http://anyring.cc:9411 + sleuth: + sampler: + # 采样率，模式0.1，也就是10%，为了便于观察效果，改为1.0，也就是100%。生产环境建议保持默认。 + probability: 1.0 diff --git a/cloudutil/target/classes/com/ccsens/cloudutil/bean/QueryParam.class b/cloudutil/target/classes/com/ccsens/cloudutil/bean/QueryParam.class new file mode 100644 index 00000000..f4ee1e25 Binary files /dev/null and b/cloudutil/target/classes/com/ccsens/cloudutil/bean/QueryParam.class differ diff --git a/cloudutil/target/classes/com/ccsens/cloudutil/feign/TallFeignClient.class b/cloudutil/target/classes/com/ccsens/cloudutil/feign/TallFeignClient.class new file mode 100644 index 00000000..ecf5cccf Binary files /dev/null and b/cloudutil/target/classes/com/ccsens/cloudutil/feign/TallFeignClient.class differ diff --git a/cloudutil/target/classes/com/ccsens/cloudutil/feign/TallFeignClientFallBack$1.class b/cloudutil/target/classes/com/ccsens/cloudutil/feign/TallFeignClientFallBack$1.class new file mode 100644 index 00000000..b1b0de9a Binary files /dev/null and b/cloudutil/target/classes/com/ccsens/cloudutil/feign/TallFeignClientFallBack$1.class differ diff --git a/cloudutil/target/classes/com/ccsens/cloudutil/feign/TallFeignClientFallBack.class b/cloudutil/target/classes/com/ccsens/cloudutil/feign/TallFeignClientFallBack.class new file mode 100644 index 00000000..4d23a1ae Binary files /dev/null and b/cloudutil/target/classes/com/ccsens/cloudutil/feign/TallFeignClientFallBack.class differ diff --git a/cloudutil/target/classes/com/ccsens/cloudutil/ribbon/RibbonClientConfig.class b/cloudutil/target/classes/com/ccsens/cloudutil/ribbon/RibbonClientConfig.class new file mode 100644 index 00000000..c2dadac7 Binary files /dev/null and b/cloudutil/target/classes/com/ccsens/cloudutil/ribbon/RibbonClientConfig.class differ diff --git a/cloudutil/target/classes/com/ccsens/cloudutil/ribbon/RibbonConfiguration.class b/cloudutil/target/classes/com/ccsens/cloudutil/ribbon/RibbonConfiguration.class new file mode 100644 index 00000000..9afd0083 Binary files /dev/null and b/cloudutil/target/classes/com/ccsens/cloudutil/ribbon/RibbonConfiguration.class differ diff --git a/ht/ht.iml b/ht/ht.iml index f500ffff..dbe731fb 100644 --- a/ht/ht.iml +++ b/ht/ht.iml @@ -4,15 +4,6 @@ - - - - - - - - - @@ -20,7 +11,6 @@ - @@ -220,8 +210,6 @@ - - diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProSubTimeMember.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProSubTimeMember.java new file mode 100644 index 00000000..0c03e95e --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProSubTimeMember.java @@ -0,0 +1,106 @@ +package com.ccsens.tall.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class ProSubTimeMember implements Serializable { + private Long id; + + private Long taskSubTimeId; + + private Long memberId; + + private Integer complatedStatus; + + private Long realFinishTime; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getTaskSubTimeId() { + return taskSubTimeId; + } + + public void setTaskSubTimeId(Long taskSubTimeId) { + this.taskSubTimeId = taskSubTimeId; + } + + public Long getMemberId() { + return memberId; + } + + public void setMemberId(Long memberId) { + this.memberId = memberId; + } + + public Integer getComplatedStatus() { + return complatedStatus; + } + + public void setComplatedStatus(Integer complatedStatus) { + this.complatedStatus = complatedStatus; + } + + public Long getRealFinishTime() { + return realFinishTime; + } + + public void setRealFinishTime(Long realFinishTime) { + this.realFinishTime = realFinishTime; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", taskSubTimeId=").append(taskSubTimeId); + sb.append(", memberId=").append(memberId); + sb.append(", complatedStatus=").append(complatedStatus); + sb.append(", realFinishTime=").append(realFinishTime); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProSubTimeMemberExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProSubTimeMemberExample.java new file mode 100644 index 00000000..3b7232b7 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProSubTimeMemberExample.java @@ -0,0 +1,681 @@ +package com.ccsens.tall.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ProSubTimeMemberExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ProSubTimeMemberExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdIsNull() { + addCriterion("task_sub_time_id is null"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdIsNotNull() { + addCriterion("task_sub_time_id is not null"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdEqualTo(Long value) { + addCriterion("task_sub_time_id =", value, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdNotEqualTo(Long value) { + addCriterion("task_sub_time_id <>", value, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdGreaterThan(Long value) { + addCriterion("task_sub_time_id >", value, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdGreaterThanOrEqualTo(Long value) { + addCriterion("task_sub_time_id >=", value, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdLessThan(Long value) { + addCriterion("task_sub_time_id <", value, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdLessThanOrEqualTo(Long value) { + addCriterion("task_sub_time_id <=", value, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdIn(List values) { + addCriterion("task_sub_time_id in", values, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdNotIn(List values) { + addCriterion("task_sub_time_id not in", values, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdBetween(Long value1, Long value2) { + addCriterion("task_sub_time_id between", value1, value2, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdNotBetween(Long value1, Long value2) { + addCriterion("task_sub_time_id not between", value1, value2, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andMemberIdIsNull() { + addCriterion("member_id is null"); + return (Criteria) this; + } + + public Criteria andMemberIdIsNotNull() { + addCriterion("member_id is not null"); + return (Criteria) this; + } + + public Criteria andMemberIdEqualTo(Long value) { + addCriterion("member_id =", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotEqualTo(Long value) { + addCriterion("member_id <>", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdGreaterThan(Long value) { + addCriterion("member_id >", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdGreaterThanOrEqualTo(Long value) { + addCriterion("member_id >=", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdLessThan(Long value) { + addCriterion("member_id <", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdLessThanOrEqualTo(Long value) { + addCriterion("member_id <=", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdIn(List values) { + addCriterion("member_id in", values, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotIn(List values) { + addCriterion("member_id not in", values, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdBetween(Long value1, Long value2) { + addCriterion("member_id between", value1, value2, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotBetween(Long value1, Long value2) { + addCriterion("member_id not between", value1, value2, "memberId"); + return (Criteria) this; + } + + public Criteria andComplatedStatusIsNull() { + addCriterion("complated_status is null"); + return (Criteria) this; + } + + public Criteria andComplatedStatusIsNotNull() { + addCriterion("complated_status is not null"); + return (Criteria) this; + } + + public Criteria andComplatedStatusEqualTo(Integer value) { + addCriterion("complated_status =", value, "complatedStatus"); + return (Criteria) this; + } + + public Criteria andComplatedStatusNotEqualTo(Integer value) { + addCriterion("complated_status <>", value, "complatedStatus"); + return (Criteria) this; + } + + public Criteria andComplatedStatusGreaterThan(Integer value) { + addCriterion("complated_status >", value, "complatedStatus"); + return (Criteria) this; + } + + public Criteria andComplatedStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("complated_status >=", value, "complatedStatus"); + return (Criteria) this; + } + + public Criteria andComplatedStatusLessThan(Integer value) { + addCriterion("complated_status <", value, "complatedStatus"); + return (Criteria) this; + } + + public Criteria andComplatedStatusLessThanOrEqualTo(Integer value) { + addCriterion("complated_status <=", value, "complatedStatus"); + return (Criteria) this; + } + + public Criteria andComplatedStatusIn(List values) { + addCriterion("complated_status in", values, "complatedStatus"); + return (Criteria) this; + } + + public Criteria andComplatedStatusNotIn(List values) { + addCriterion("complated_status not in", values, "complatedStatus"); + return (Criteria) this; + } + + public Criteria andComplatedStatusBetween(Integer value1, Integer value2) { + addCriterion("complated_status between", value1, value2, "complatedStatus"); + return (Criteria) this; + } + + public Criteria andComplatedStatusNotBetween(Integer value1, Integer value2) { + addCriterion("complated_status not between", value1, value2, "complatedStatus"); + return (Criteria) this; + } + + public Criteria andRealFinishTimeIsNull() { + addCriterion("real_finish_time is null"); + return (Criteria) this; + } + + public Criteria andRealFinishTimeIsNotNull() { + addCriterion("real_finish_time is not null"); + return (Criteria) this; + } + + public Criteria andRealFinishTimeEqualTo(Long value) { + addCriterion("real_finish_time =", value, "realFinishTime"); + return (Criteria) this; + } + + public Criteria andRealFinishTimeNotEqualTo(Long value) { + addCriterion("real_finish_time <>", value, "realFinishTime"); + return (Criteria) this; + } + + public Criteria andRealFinishTimeGreaterThan(Long value) { + addCriterion("real_finish_time >", value, "realFinishTime"); + return (Criteria) this; + } + + public Criteria andRealFinishTimeGreaterThanOrEqualTo(Long value) { + addCriterion("real_finish_time >=", value, "realFinishTime"); + return (Criteria) this; + } + + public Criteria andRealFinishTimeLessThan(Long value) { + addCriterion("real_finish_time <", value, "realFinishTime"); + return (Criteria) this; + } + + public Criteria andRealFinishTimeLessThanOrEqualTo(Long value) { + addCriterion("real_finish_time <=", value, "realFinishTime"); + return (Criteria) this; + } + + public Criteria andRealFinishTimeIn(List values) { + addCriterion("real_finish_time in", values, "realFinishTime"); + return (Criteria) this; + } + + public Criteria andRealFinishTimeNotIn(List values) { + addCriterion("real_finish_time not in", values, "realFinishTime"); + return (Criteria) this; + } + + public Criteria andRealFinishTimeBetween(Long value1, Long value2) { + addCriterion("real_finish_time between", value1, value2, "realFinishTime"); + return (Criteria) this; + } + + public Criteria andRealFinishTimeNotBetween(Long value1, Long value2) { + addCriterion("real_finish_time not between", value1, value2, "realFinishTime"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDetail.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDetail.java index 108a30be..91736b43 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDetail.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDetail.java @@ -1,293 +1,304 @@ -package com.ccsens.tall.bean.po; - -import java.io.Serializable; -import java.util.Date; - -public class ProTaskDetail implements Serializable { - private Long id; - - private Long projectId; - - private String name; - - private String description; - - private Long beginTime; - - private Long endTime; - - private String cycle; - - private Long parentId; - - private String subTask; - - private Long subProjectId; - - private String subProject; - - private Long executorRole; - - private Long checkerRole; - - private Long money; - - private Byte delay; - - private Long delayTime; - - private Long loopTo; - - private Integer loopTimes; - - private Byte virtual; - - private Byte level; - - private Byte hasGroup; - - private Byte allMember; - - private Date createdAt; - - private Date updatedAt; - - private Byte recStatus; - - private static final long serialVersionUID = 1L; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getProjectId() { - return projectId; - } - - public void setProjectId(Long projectId) { - this.projectId = projectId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name == null ? null : name.trim(); - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description == null ? null : description.trim(); - } - - public Long getBeginTime() { - return beginTime; - } - - public void setBeginTime(Long beginTime) { - this.beginTime = beginTime; - } - - public Long getEndTime() { - return endTime; - } - - public void setEndTime(Long endTime) { - this.endTime = endTime; - } - - public String getCycle() { - return cycle; - } - - public void setCycle(String cycle) { - this.cycle = cycle == null ? null : cycle.trim(); - } - - public Long getParentId() { - return parentId; - } - - public void setParentId(Long parentId) { - this.parentId = parentId; - } - - public String getSubTask() { - return subTask; - } - - public void setSubTask(String subTask) { - this.subTask = subTask == null ? null : subTask.trim(); - } - - public Long getSubProjectId() { - return subProjectId; - } - - public void setSubProjectId(Long subProjectId) { - this.subProjectId = subProjectId; - } - - public String getSubProject() { - return subProject; - } - - public void setSubProject(String subProject) { - this.subProject = subProject == null ? null : subProject.trim(); - } - - public Long getExecutorRole() { - return executorRole; - } - - public void setExecutorRole(Long executorRole) { - this.executorRole = executorRole; - } - - public Long getCheckerRole() { - return checkerRole; - } - - public void setCheckerRole(Long checkerRole) { - this.checkerRole = checkerRole; - } - - public Long getMoney() { - return money; - } - - public void setMoney(Long money) { - this.money = money; - } - - public Byte getDelay() { - return delay; - } - - public void setDelay(Byte delay) { - this.delay = delay; - } - - public Long getDelayTime() { - return delayTime; - } - - public void setDelayTime(Long delayTime) { - this.delayTime = delayTime; - } - - public Long getLoopTo() { - return loopTo; - } - - public void setLoopTo(Long loopTo) { - this.loopTo = loopTo; - } - - public Integer getLoopTimes() { - return loopTimes; - } - - public void setLoopTimes(Integer loopTimes) { - this.loopTimes = loopTimes; - } - - public Byte getVirtual() { - return virtual; - } - - public void setVirtual(Byte virtual) { - this.virtual = virtual; - } - - public Byte getLevel() { - return level; - } - - public void setLevel(Byte level) { - this.level = level; - } - - public Byte getHasGroup() { - return hasGroup; - } - - public void setHasGroup(Byte hasGroup) { - this.hasGroup = hasGroup; - } - - public Byte getAllMember() { - return allMember; - } - - public void setAllMember(Byte allMember) { - this.allMember = allMember; - } - - public Date getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Date createdAt) { - this.createdAt = createdAt; - } - - public Date getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(Date updatedAt) { - this.updatedAt = updatedAt; - } - - public Byte getRecStatus() { - return recStatus; - } - - public void setRecStatus(Byte recStatus) { - this.recStatus = recStatus; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", projectId=").append(projectId); - sb.append(", name=").append(name); - sb.append(", description=").append(description); - sb.append(", beginTime=").append(beginTime); - sb.append(", endTime=").append(endTime); - sb.append(", cycle=").append(cycle); - sb.append(", parentId=").append(parentId); - sb.append(", subTask=").append(subTask); - sb.append(", subProjectId=").append(subProjectId); - sb.append(", subProject=").append(subProject); - sb.append(", executorRole=").append(executorRole); - sb.append(", checkerRole=").append(checkerRole); - sb.append(", money=").append(money); - sb.append(", delay=").append(delay); - sb.append(", delayTime=").append(delayTime); - sb.append(", loopTo=").append(loopTo); - sb.append(", loopTimes=").append(loopTimes); - sb.append(", virtual=").append(virtual); - sb.append(", level=").append(level); - sb.append(", hasGroup=").append(hasGroup); - sb.append(", allMember=").append(allMember); - sb.append(", createdAt=").append(createdAt); - sb.append(", updatedAt=").append(updatedAt); - sb.append(", recStatus=").append(recStatus); - sb.append("]"); - return sb.toString(); - } +package com.ccsens.tall.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class ProTaskDetail implements Serializable { + private Long id; + + private Long projectId; + + private String name; + + private String description; + + private Long beginTime; + + private Long endTime; + + private String cycle; + + private Long parentId; + + private String subTask; + + private Long subProjectId; + + private String subProject; + + private Long executorRole; + + private Long checkerRole; + + private Long money; + + private Byte delay; + + private Long delayTime; + + private Long loopTo; + + private Integer loopTimes; + + private Byte virtual; + + private Byte level; + + private Byte hasGroup; + + private Byte finishNeedAll; + + private Byte allMember; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getProjectId() { + return projectId; + } + + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name == null ? null : name.trim(); + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description == null ? null : description.trim(); + } + + public Long getBeginTime() { + return beginTime; + } + + public void setBeginTime(Long beginTime) { + this.beginTime = beginTime; + } + + public Long getEndTime() { + return endTime; + } + + public void setEndTime(Long endTime) { + this.endTime = endTime; + } + + public String getCycle() { + return cycle; + } + + public void setCycle(String cycle) { + this.cycle = cycle == null ? null : cycle.trim(); + } + + public Long getParentId() { + return parentId; + } + + public void setParentId(Long parentId) { + this.parentId = parentId; + } + + public String getSubTask() { + return subTask; + } + + public void setSubTask(String subTask) { + this.subTask = subTask == null ? null : subTask.trim(); + } + + public Long getSubProjectId() { + return subProjectId; + } + + public void setSubProjectId(Long subProjectId) { + this.subProjectId = subProjectId; + } + + public String getSubProject() { + return subProject; + } + + public void setSubProject(String subProject) { + this.subProject = subProject == null ? null : subProject.trim(); + } + + public Long getExecutorRole() { + return executorRole; + } + + public void setExecutorRole(Long executorRole) { + this.executorRole = executorRole; + } + + public Long getCheckerRole() { + return checkerRole; + } + + public void setCheckerRole(Long checkerRole) { + this.checkerRole = checkerRole; + } + + public Long getMoney() { + return money; + } + + public void setMoney(Long money) { + this.money = money; + } + + public Byte getDelay() { + return delay; + } + + public void setDelay(Byte delay) { + this.delay = delay; + } + + public Long getDelayTime() { + return delayTime; + } + + public void setDelayTime(Long delayTime) { + this.delayTime = delayTime; + } + + public Long getLoopTo() { + return loopTo; + } + + public void setLoopTo(Long loopTo) { + this.loopTo = loopTo; + } + + public Integer getLoopTimes() { + return loopTimes; + } + + public void setLoopTimes(Integer loopTimes) { + this.loopTimes = loopTimes; + } + + public Byte getVirtual() { + return virtual; + } + + public void setVirtual(Byte virtual) { + this.virtual = virtual; + } + + public Byte getLevel() { + return level; + } + + public void setLevel(Byte level) { + this.level = level; + } + + public Byte getHasGroup() { + return hasGroup; + } + + public void setHasGroup(Byte hasGroup) { + this.hasGroup = hasGroup; + } + + public Byte getFinishNeedAll() { + return finishNeedAll; + } + + public void setFinishNeedAll(Byte finishNeedAll) { + this.finishNeedAll = finishNeedAll; + } + + public Byte getAllMember() { + return allMember; + } + + public void setAllMember(Byte allMember) { + this.allMember = allMember; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", projectId=").append(projectId); + sb.append(", name=").append(name); + sb.append(", description=").append(description); + sb.append(", beginTime=").append(beginTime); + sb.append(", endTime=").append(endTime); + sb.append(", cycle=").append(cycle); + sb.append(", parentId=").append(parentId); + sb.append(", subTask=").append(subTask); + sb.append(", subProjectId=").append(subProjectId); + sb.append(", subProject=").append(subProject); + sb.append(", executorRole=").append(executorRole); + sb.append(", checkerRole=").append(checkerRole); + sb.append(", money=").append(money); + sb.append(", delay=").append(delay); + sb.append(", delayTime=").append(delayTime); + sb.append(", loopTo=").append(loopTo); + sb.append(", loopTimes=").append(loopTimes); + sb.append(", virtual=").append(virtual); + sb.append(", level=").append(level); + sb.append(", hasGroup=").append(hasGroup); + sb.append(", finishNeedAll=").append(finishNeedAll); + sb.append(", allMember=").append(allMember); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } } \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDetailExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDetailExample.java index 1389c900..b2a280ea 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDetailExample.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDetailExample.java @@ -1,1751 +1,1811 @@ -package com.ccsens.tall.bean.po; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class ProTaskDetailExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public ProTaskDetailExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andProjectIdIsNull() { - addCriterion("project_id is null"); - return (Criteria) this; - } - - public Criteria andProjectIdIsNotNull() { - addCriterion("project_id is not null"); - return (Criteria) this; - } - - public Criteria andProjectIdEqualTo(Long value) { - addCriterion("project_id =", value, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdNotEqualTo(Long value) { - addCriterion("project_id <>", value, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdGreaterThan(Long value) { - addCriterion("project_id >", value, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdGreaterThanOrEqualTo(Long value) { - addCriterion("project_id >=", value, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdLessThan(Long value) { - addCriterion("project_id <", value, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdLessThanOrEqualTo(Long value) { - addCriterion("project_id <=", value, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdIn(List values) { - addCriterion("project_id in", values, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdNotIn(List values) { - addCriterion("project_id not in", values, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdBetween(Long value1, Long value2) { - addCriterion("project_id between", value1, value2, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdNotBetween(Long value1, Long value2) { - addCriterion("project_id not between", value1, value2, "projectId"); - return (Criteria) this; - } - - public Criteria andNameIsNull() { - addCriterion("name is null"); - return (Criteria) this; - } - - public Criteria andNameIsNotNull() { - addCriterion("name is not null"); - return (Criteria) this; - } - - public Criteria andNameEqualTo(String value) { - addCriterion("name =", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotEqualTo(String value) { - addCriterion("name <>", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThan(String value) { - addCriterion("name >", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThanOrEqualTo(String value) { - addCriterion("name >=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThan(String value) { - addCriterion("name <", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThanOrEqualTo(String value) { - addCriterion("name <=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLike(String value) { - addCriterion("name like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotLike(String value) { - addCriterion("name not like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameIn(List values) { - addCriterion("name in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameNotIn(List values) { - addCriterion("name not in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameBetween(String value1, String value2) { - addCriterion("name between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andNameNotBetween(String value1, String value2) { - addCriterion("name not between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andDescriptionIsNull() { - addCriterion("description is null"); - return (Criteria) this; - } - - public Criteria andDescriptionIsNotNull() { - addCriterion("description is not null"); - return (Criteria) this; - } - - public Criteria andDescriptionEqualTo(String value) { - addCriterion("description =", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotEqualTo(String value) { - addCriterion("description <>", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionGreaterThan(String value) { - addCriterion("description >", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionGreaterThanOrEqualTo(String value) { - addCriterion("description >=", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLessThan(String value) { - addCriterion("description <", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLessThanOrEqualTo(String value) { - addCriterion("description <=", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLike(String value) { - addCriterion("description like", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotLike(String value) { - addCriterion("description not like", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionIn(List values) { - addCriterion("description in", values, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotIn(List values) { - addCriterion("description not in", values, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionBetween(String value1, String value2) { - addCriterion("description between", value1, value2, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotBetween(String value1, String value2) { - addCriterion("description not between", value1, value2, "description"); - return (Criteria) this; - } - - public Criteria andBeginTimeIsNull() { - addCriterion("begin_time is null"); - return (Criteria) this; - } - - public Criteria andBeginTimeIsNotNull() { - addCriterion("begin_time is not null"); - return (Criteria) this; - } - - public Criteria andBeginTimeEqualTo(Long value) { - addCriterion("begin_time =", value, "beginTime"); - return (Criteria) this; - } - - public Criteria andBeginTimeNotEqualTo(Long value) { - addCriterion("begin_time <>", value, "beginTime"); - return (Criteria) this; - } - - public Criteria andBeginTimeGreaterThan(Long value) { - addCriterion("begin_time >", value, "beginTime"); - return (Criteria) this; - } - - public Criteria andBeginTimeGreaterThanOrEqualTo(Long value) { - addCriterion("begin_time >=", value, "beginTime"); - return (Criteria) this; - } - - public Criteria andBeginTimeLessThan(Long value) { - addCriterion("begin_time <", value, "beginTime"); - return (Criteria) this; - } - - public Criteria andBeginTimeLessThanOrEqualTo(Long value) { - addCriterion("begin_time <=", value, "beginTime"); - return (Criteria) this; - } - - public Criteria andBeginTimeIn(List values) { - addCriterion("begin_time in", values, "beginTime"); - return (Criteria) this; - } - - public Criteria andBeginTimeNotIn(List values) { - addCriterion("begin_time not in", values, "beginTime"); - return (Criteria) this; - } - - public Criteria andBeginTimeBetween(Long value1, Long value2) { - addCriterion("begin_time between", value1, value2, "beginTime"); - return (Criteria) this; - } - - public Criteria andBeginTimeNotBetween(Long value1, Long value2) { - addCriterion("begin_time not between", value1, value2, "beginTime"); - return (Criteria) this; - } - - public Criteria andEndTimeIsNull() { - addCriterion("end_time is null"); - return (Criteria) this; - } - - public Criteria andEndTimeIsNotNull() { - addCriterion("end_time is not null"); - return (Criteria) this; - } - - public Criteria andEndTimeEqualTo(Long value) { - addCriterion("end_time =", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeNotEqualTo(Long value) { - addCriterion("end_time <>", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeGreaterThan(Long value) { - addCriterion("end_time >", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeGreaterThanOrEqualTo(Long value) { - addCriterion("end_time >=", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeLessThan(Long value) { - addCriterion("end_time <", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeLessThanOrEqualTo(Long value) { - addCriterion("end_time <=", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeIn(List values) { - addCriterion("end_time in", values, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeNotIn(List values) { - addCriterion("end_time not in", values, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeBetween(Long value1, Long value2) { - addCriterion("end_time between", value1, value2, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeNotBetween(Long value1, Long value2) { - addCriterion("end_time not between", value1, value2, "endTime"); - return (Criteria) this; - } - - public Criteria andCycleIsNull() { - addCriterion("cycle is null"); - return (Criteria) this; - } - - public Criteria andCycleIsNotNull() { - addCriterion("cycle is not null"); - return (Criteria) this; - } - - public Criteria andCycleEqualTo(String value) { - addCriterion("cycle =", value, "cycle"); - return (Criteria) this; - } - - public Criteria andCycleNotEqualTo(String value) { - addCriterion("cycle <>", value, "cycle"); - return (Criteria) this; - } - - public Criteria andCycleGreaterThan(String value) { - addCriterion("cycle >", value, "cycle"); - return (Criteria) this; - } - - public Criteria andCycleGreaterThanOrEqualTo(String value) { - addCriterion("cycle >=", value, "cycle"); - return (Criteria) this; - } - - public Criteria andCycleLessThan(String value) { - addCriterion("cycle <", value, "cycle"); - return (Criteria) this; - } - - public Criteria andCycleLessThanOrEqualTo(String value) { - addCriterion("cycle <=", value, "cycle"); - return (Criteria) this; - } - - public Criteria andCycleLike(String value) { - addCriterion("cycle like", value, "cycle"); - return (Criteria) this; - } - - public Criteria andCycleNotLike(String value) { - addCriterion("cycle not like", value, "cycle"); - return (Criteria) this; - } - - public Criteria andCycleIn(List values) { - addCriterion("cycle in", values, "cycle"); - return (Criteria) this; - } - - public Criteria andCycleNotIn(List values) { - addCriterion("cycle not in", values, "cycle"); - return (Criteria) this; - } - - public Criteria andCycleBetween(String value1, String value2) { - addCriterion("cycle between", value1, value2, "cycle"); - return (Criteria) this; - } - - public Criteria andCycleNotBetween(String value1, String value2) { - addCriterion("cycle not between", value1, value2, "cycle"); - return (Criteria) this; - } - - public Criteria andParentIdIsNull() { - addCriterion("parent_id is null"); - return (Criteria) this; - } - - public Criteria andParentIdIsNotNull() { - addCriterion("parent_id is not null"); - return (Criteria) this; - } - - public Criteria andParentIdEqualTo(Long value) { - addCriterion("parent_id =", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdNotEqualTo(Long value) { - addCriterion("parent_id <>", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdGreaterThan(Long value) { - addCriterion("parent_id >", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdGreaterThanOrEqualTo(Long value) { - addCriterion("parent_id >=", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdLessThan(Long value) { - addCriterion("parent_id <", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdLessThanOrEqualTo(Long value) { - addCriterion("parent_id <=", value, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdIn(List values) { - addCriterion("parent_id in", values, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdNotIn(List values) { - addCriterion("parent_id not in", values, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdBetween(Long value1, Long value2) { - addCriterion("parent_id between", value1, value2, "parentId"); - return (Criteria) this; - } - - public Criteria andParentIdNotBetween(Long value1, Long value2) { - addCriterion("parent_id not between", value1, value2, "parentId"); - return (Criteria) this; - } - - public Criteria andSubTaskIsNull() { - addCriterion("sub_task is null"); - return (Criteria) this; - } - - public Criteria andSubTaskIsNotNull() { - addCriterion("sub_task is not null"); - return (Criteria) this; - } - - public Criteria andSubTaskEqualTo(String value) { - addCriterion("sub_task =", value, "subTask"); - return (Criteria) this; - } - - public Criteria andSubTaskNotEqualTo(String value) { - addCriterion("sub_task <>", value, "subTask"); - return (Criteria) this; - } - - public Criteria andSubTaskGreaterThan(String value) { - addCriterion("sub_task >", value, "subTask"); - return (Criteria) this; - } - - public Criteria andSubTaskGreaterThanOrEqualTo(String value) { - addCriterion("sub_task >=", value, "subTask"); - return (Criteria) this; - } - - public Criteria andSubTaskLessThan(String value) { - addCriterion("sub_task <", value, "subTask"); - return (Criteria) this; - } - - public Criteria andSubTaskLessThanOrEqualTo(String value) { - addCriterion("sub_task <=", value, "subTask"); - return (Criteria) this; - } - - public Criteria andSubTaskLike(String value) { - addCriterion("sub_task like", value, "subTask"); - return (Criteria) this; - } - - public Criteria andSubTaskNotLike(String value) { - addCriterion("sub_task not like", value, "subTask"); - return (Criteria) this; - } - - public Criteria andSubTaskIn(List values) { - addCriterion("sub_task in", values, "subTask"); - return (Criteria) this; - } - - public Criteria andSubTaskNotIn(List values) { - addCriterion("sub_task not in", values, "subTask"); - return (Criteria) this; - } - - public Criteria andSubTaskBetween(String value1, String value2) { - addCriterion("sub_task between", value1, value2, "subTask"); - return (Criteria) this; - } - - public Criteria andSubTaskNotBetween(String value1, String value2) { - addCriterion("sub_task not between", value1, value2, "subTask"); - return (Criteria) this; - } - - public Criteria andSubProjectIdIsNull() { - addCriterion("sub_project_id is null"); - return (Criteria) this; - } - - public Criteria andSubProjectIdIsNotNull() { - addCriterion("sub_project_id is not null"); - return (Criteria) this; - } - - public Criteria andSubProjectIdEqualTo(Long value) { - addCriterion("sub_project_id =", value, "subProjectId"); - return (Criteria) this; - } - - public Criteria andSubProjectIdNotEqualTo(Long value) { - addCriterion("sub_project_id <>", value, "subProjectId"); - return (Criteria) this; - } - - public Criteria andSubProjectIdGreaterThan(Long value) { - addCriterion("sub_project_id >", value, "subProjectId"); - return (Criteria) this; - } - - public Criteria andSubProjectIdGreaterThanOrEqualTo(Long value) { - addCriterion("sub_project_id >=", value, "subProjectId"); - return (Criteria) this; - } - - public Criteria andSubProjectIdLessThan(Long value) { - addCriterion("sub_project_id <", value, "subProjectId"); - return (Criteria) this; - } - - public Criteria andSubProjectIdLessThanOrEqualTo(Long value) { - addCriterion("sub_project_id <=", value, "subProjectId"); - return (Criteria) this; - } - - public Criteria andSubProjectIdIn(List values) { - addCriterion("sub_project_id in", values, "subProjectId"); - return (Criteria) this; - } - - public Criteria andSubProjectIdNotIn(List values) { - addCriterion("sub_project_id not in", values, "subProjectId"); - return (Criteria) this; - } - - public Criteria andSubProjectIdBetween(Long value1, Long value2) { - addCriterion("sub_project_id between", value1, value2, "subProjectId"); - return (Criteria) this; - } - - public Criteria andSubProjectIdNotBetween(Long value1, Long value2) { - addCriterion("sub_project_id not between", value1, value2, "subProjectId"); - return (Criteria) this; - } - - public Criteria andSubProjectIsNull() { - addCriterion("sub_project is null"); - return (Criteria) this; - } - - public Criteria andSubProjectIsNotNull() { - addCriterion("sub_project is not null"); - return (Criteria) this; - } - - public Criteria andSubProjectEqualTo(String value) { - addCriterion("sub_project =", value, "subProject"); - return (Criteria) this; - } - - public Criteria andSubProjectNotEqualTo(String value) { - addCriterion("sub_project <>", value, "subProject"); - return (Criteria) this; - } - - public Criteria andSubProjectGreaterThan(String value) { - addCriterion("sub_project >", value, "subProject"); - return (Criteria) this; - } - - public Criteria andSubProjectGreaterThanOrEqualTo(String value) { - addCriterion("sub_project >=", value, "subProject"); - return (Criteria) this; - } - - public Criteria andSubProjectLessThan(String value) { - addCriterion("sub_project <", value, "subProject"); - return (Criteria) this; - } - - public Criteria andSubProjectLessThanOrEqualTo(String value) { - addCriterion("sub_project <=", value, "subProject"); - return (Criteria) this; - } - - public Criteria andSubProjectLike(String value) { - addCriterion("sub_project like", value, "subProject"); - return (Criteria) this; - } - - public Criteria andSubProjectNotLike(String value) { - addCriterion("sub_project not like", value, "subProject"); - return (Criteria) this; - } - - public Criteria andSubProjectIn(List values) { - addCriterion("sub_project in", values, "subProject"); - return (Criteria) this; - } - - public Criteria andSubProjectNotIn(List values) { - addCriterion("sub_project not in", values, "subProject"); - return (Criteria) this; - } - - public Criteria andSubProjectBetween(String value1, String value2) { - addCriterion("sub_project between", value1, value2, "subProject"); - return (Criteria) this; - } - - public Criteria andSubProjectNotBetween(String value1, String value2) { - addCriterion("sub_project not between", value1, value2, "subProject"); - return (Criteria) this; - } - - public Criteria andExecutorRoleIsNull() { - addCriterion("executor_role is null"); - return (Criteria) this; - } - - public Criteria andExecutorRoleIsNotNull() { - addCriterion("executor_role is not null"); - return (Criteria) this; - } - - public Criteria andExecutorRoleEqualTo(Long value) { - addCriterion("executor_role =", value, "executorRole"); - return (Criteria) this; - } - - public Criteria andExecutorRoleNotEqualTo(Long value) { - addCriterion("executor_role <>", value, "executorRole"); - return (Criteria) this; - } - - public Criteria andExecutorRoleGreaterThan(Long value) { - addCriterion("executor_role >", value, "executorRole"); - return (Criteria) this; - } - - public Criteria andExecutorRoleGreaterThanOrEqualTo(Long value) { - addCriterion("executor_role >=", value, "executorRole"); - return (Criteria) this; - } - - public Criteria andExecutorRoleLessThan(Long value) { - addCriterion("executor_role <", value, "executorRole"); - return (Criteria) this; - } - - public Criteria andExecutorRoleLessThanOrEqualTo(Long value) { - addCriterion("executor_role <=", value, "executorRole"); - return (Criteria) this; - } - - public Criteria andExecutorRoleIn(List values) { - addCriterion("executor_role in", values, "executorRole"); - return (Criteria) this; - } - - public Criteria andExecutorRoleNotIn(List values) { - addCriterion("executor_role not in", values, "executorRole"); - return (Criteria) this; - } - - public Criteria andExecutorRoleBetween(Long value1, Long value2) { - addCriterion("executor_role between", value1, value2, "executorRole"); - return (Criteria) this; - } - - public Criteria andExecutorRoleNotBetween(Long value1, Long value2) { - addCriterion("executor_role not between", value1, value2, "executorRole"); - return (Criteria) this; - } - - public Criteria andCheckerRoleIsNull() { - addCriterion("checker_role is null"); - return (Criteria) this; - } - - public Criteria andCheckerRoleIsNotNull() { - addCriterion("checker_role is not null"); - return (Criteria) this; - } - - public Criteria andCheckerRoleEqualTo(Long value) { - addCriterion("checker_role =", value, "checkerRole"); - return (Criteria) this; - } - - public Criteria andCheckerRoleNotEqualTo(Long value) { - addCriterion("checker_role <>", value, "checkerRole"); - return (Criteria) this; - } - - public Criteria andCheckerRoleGreaterThan(Long value) { - addCriterion("checker_role >", value, "checkerRole"); - return (Criteria) this; - } - - public Criteria andCheckerRoleGreaterThanOrEqualTo(Long value) { - addCriterion("checker_role >=", value, "checkerRole"); - return (Criteria) this; - } - - public Criteria andCheckerRoleLessThan(Long value) { - addCriterion("checker_role <", value, "checkerRole"); - return (Criteria) this; - } - - public Criteria andCheckerRoleLessThanOrEqualTo(Long value) { - addCriterion("checker_role <=", value, "checkerRole"); - return (Criteria) this; - } - - public Criteria andCheckerRoleIn(List values) { - addCriterion("checker_role in", values, "checkerRole"); - return (Criteria) this; - } - - public Criteria andCheckerRoleNotIn(List values) { - addCriterion("checker_role not in", values, "checkerRole"); - return (Criteria) this; - } - - public Criteria andCheckerRoleBetween(Long value1, Long value2) { - addCriterion("checker_role between", value1, value2, "checkerRole"); - return (Criteria) this; - } - - public Criteria andCheckerRoleNotBetween(Long value1, Long value2) { - addCriterion("checker_role not between", value1, value2, "checkerRole"); - return (Criteria) this; - } - - public Criteria andMoneyIsNull() { - addCriterion("money is null"); - return (Criteria) this; - } - - public Criteria andMoneyIsNotNull() { - addCriterion("money is not null"); - return (Criteria) this; - } - - public Criteria andMoneyEqualTo(Long value) { - addCriterion("money =", value, "money"); - return (Criteria) this; - } - - public Criteria andMoneyNotEqualTo(Long value) { - addCriterion("money <>", value, "money"); - return (Criteria) this; - } - - public Criteria andMoneyGreaterThan(Long value) { - addCriterion("money >", value, "money"); - return (Criteria) this; - } - - public Criteria andMoneyGreaterThanOrEqualTo(Long value) { - addCriterion("money >=", value, "money"); - return (Criteria) this; - } - - public Criteria andMoneyLessThan(Long value) { - addCriterion("money <", value, "money"); - return (Criteria) this; - } - - public Criteria andMoneyLessThanOrEqualTo(Long value) { - addCriterion("money <=", value, "money"); - return (Criteria) this; - } - - public Criteria andMoneyIn(List values) { - addCriterion("money in", values, "money"); - return (Criteria) this; - } - - public Criteria andMoneyNotIn(List values) { - addCriterion("money not in", values, "money"); - return (Criteria) this; - } - - public Criteria andMoneyBetween(Long value1, Long value2) { - addCriterion("money between", value1, value2, "money"); - return (Criteria) this; - } - - public Criteria andMoneyNotBetween(Long value1, Long value2) { - addCriterion("money not between", value1, value2, "money"); - return (Criteria) this; - } - - public Criteria andDelayIsNull() { - addCriterion("delay is null"); - return (Criteria) this; - } - - public Criteria andDelayIsNotNull() { - addCriterion("delay is not null"); - return (Criteria) this; - } - - public Criteria andDelayEqualTo(Byte value) { - addCriterion("delay =", value, "delay"); - return (Criteria) this; - } - - public Criteria andDelayNotEqualTo(Byte value) { - addCriterion("delay <>", value, "delay"); - return (Criteria) this; - } - - public Criteria andDelayGreaterThan(Byte value) { - addCriterion("delay >", value, "delay"); - return (Criteria) this; - } - - public Criteria andDelayGreaterThanOrEqualTo(Byte value) { - addCriterion("delay >=", value, "delay"); - return (Criteria) this; - } - - public Criteria andDelayLessThan(Byte value) { - addCriterion("delay <", value, "delay"); - return (Criteria) this; - } - - public Criteria andDelayLessThanOrEqualTo(Byte value) { - addCriterion("delay <=", value, "delay"); - return (Criteria) this; - } - - public Criteria andDelayIn(List values) { - addCriterion("delay in", values, "delay"); - return (Criteria) this; - } - - public Criteria andDelayNotIn(List values) { - addCriterion("delay not in", values, "delay"); - return (Criteria) this; - } - - public Criteria andDelayBetween(Byte value1, Byte value2) { - addCriterion("delay between", value1, value2, "delay"); - return (Criteria) this; - } - - public Criteria andDelayNotBetween(Byte value1, Byte value2) { - addCriterion("delay not between", value1, value2, "delay"); - return (Criteria) this; - } - - public Criteria andDelayTimeIsNull() { - addCriterion("delay_time is null"); - return (Criteria) this; - } - - public Criteria andDelayTimeIsNotNull() { - addCriterion("delay_time is not null"); - return (Criteria) this; - } - - public Criteria andDelayTimeEqualTo(Long value) { - addCriterion("delay_time =", value, "delayTime"); - return (Criteria) this; - } - - public Criteria andDelayTimeNotEqualTo(Long value) { - addCriterion("delay_time <>", value, "delayTime"); - return (Criteria) this; - } - - public Criteria andDelayTimeGreaterThan(Long value) { - addCriterion("delay_time >", value, "delayTime"); - return (Criteria) this; - } - - public Criteria andDelayTimeGreaterThanOrEqualTo(Long value) { - addCriterion("delay_time >=", value, "delayTime"); - return (Criteria) this; - } - - public Criteria andDelayTimeLessThan(Long value) { - addCriterion("delay_time <", value, "delayTime"); - return (Criteria) this; - } - - public Criteria andDelayTimeLessThanOrEqualTo(Long value) { - addCriterion("delay_time <=", value, "delayTime"); - return (Criteria) this; - } - - public Criteria andDelayTimeIn(List values) { - addCriterion("delay_time in", values, "delayTime"); - return (Criteria) this; - } - - public Criteria andDelayTimeNotIn(List values) { - addCriterion("delay_time not in", values, "delayTime"); - return (Criteria) this; - } - - public Criteria andDelayTimeBetween(Long value1, Long value2) { - addCriterion("delay_time between", value1, value2, "delayTime"); - return (Criteria) this; - } - - public Criteria andDelayTimeNotBetween(Long value1, Long value2) { - addCriterion("delay_time not between", value1, value2, "delayTime"); - return (Criteria) this; - } - - public Criteria andLoopToIsNull() { - addCriterion("loop_to is null"); - return (Criteria) this; - } - - public Criteria andLoopToIsNotNull() { - addCriterion("loop_to is not null"); - return (Criteria) this; - } - - public Criteria andLoopToEqualTo(Long value) { - addCriterion("loop_to =", value, "loopTo"); - return (Criteria) this; - } - - public Criteria andLoopToNotEqualTo(Long value) { - addCriterion("loop_to <>", value, "loopTo"); - return (Criteria) this; - } - - public Criteria andLoopToGreaterThan(Long value) { - addCriterion("loop_to >", value, "loopTo"); - return (Criteria) this; - } - - public Criteria andLoopToGreaterThanOrEqualTo(Long value) { - addCriterion("loop_to >=", value, "loopTo"); - return (Criteria) this; - } - - public Criteria andLoopToLessThan(Long value) { - addCriterion("loop_to <", value, "loopTo"); - return (Criteria) this; - } - - public Criteria andLoopToLessThanOrEqualTo(Long value) { - addCriterion("loop_to <=", value, "loopTo"); - return (Criteria) this; - } - - public Criteria andLoopToIn(List values) { - addCriterion("loop_to in", values, "loopTo"); - return (Criteria) this; - } - - public Criteria andLoopToNotIn(List values) { - addCriterion("loop_to not in", values, "loopTo"); - return (Criteria) this; - } - - public Criteria andLoopToBetween(Long value1, Long value2) { - addCriterion("loop_to between", value1, value2, "loopTo"); - return (Criteria) this; - } - - public Criteria andLoopToNotBetween(Long value1, Long value2) { - addCriterion("loop_to not between", value1, value2, "loopTo"); - return (Criteria) this; - } - - public Criteria andLoopTimesIsNull() { - addCriterion("loop_times is null"); - return (Criteria) this; - } - - public Criteria andLoopTimesIsNotNull() { - addCriterion("loop_times is not null"); - return (Criteria) this; - } - - public Criteria andLoopTimesEqualTo(Integer value) { - addCriterion("loop_times =", value, "loopTimes"); - return (Criteria) this; - } - - public Criteria andLoopTimesNotEqualTo(Integer value) { - addCriterion("loop_times <>", value, "loopTimes"); - return (Criteria) this; - } - - public Criteria andLoopTimesGreaterThan(Integer value) { - addCriterion("loop_times >", value, "loopTimes"); - return (Criteria) this; - } - - public Criteria andLoopTimesGreaterThanOrEqualTo(Integer value) { - addCriterion("loop_times >=", value, "loopTimes"); - return (Criteria) this; - } - - public Criteria andLoopTimesLessThan(Integer value) { - addCriterion("loop_times <", value, "loopTimes"); - return (Criteria) this; - } - - public Criteria andLoopTimesLessThanOrEqualTo(Integer value) { - addCriterion("loop_times <=", value, "loopTimes"); - return (Criteria) this; - } - - public Criteria andLoopTimesIn(List values) { - addCriterion("loop_times in", values, "loopTimes"); - return (Criteria) this; - } - - public Criteria andLoopTimesNotIn(List values) { - addCriterion("loop_times not in", values, "loopTimes"); - return (Criteria) this; - } - - public Criteria andLoopTimesBetween(Integer value1, Integer value2) { - addCriterion("loop_times between", value1, value2, "loopTimes"); - return (Criteria) this; - } - - public Criteria andLoopTimesNotBetween(Integer value1, Integer value2) { - addCriterion("loop_times not between", value1, value2, "loopTimes"); - return (Criteria) this; - } - - public Criteria andVirtualIsNull() { - addCriterion("virtual is null"); - return (Criteria) this; - } - - public Criteria andVirtualIsNotNull() { - addCriterion("virtual is not null"); - return (Criteria) this; - } - - public Criteria andVirtualEqualTo(Byte value) { - addCriterion("virtual =", value, "virtual"); - return (Criteria) this; - } - - public Criteria andVirtualNotEqualTo(Byte value) { - addCriterion("virtual <>", value, "virtual"); - return (Criteria) this; - } - - public Criteria andVirtualGreaterThan(Byte value) { - addCriterion("virtual >", value, "virtual"); - return (Criteria) this; - } - - public Criteria andVirtualGreaterThanOrEqualTo(Byte value) { - addCriterion("virtual >=", value, "virtual"); - return (Criteria) this; - } - - public Criteria andVirtualLessThan(Byte value) { - addCriterion("virtual <", value, "virtual"); - return (Criteria) this; - } - - public Criteria andVirtualLessThanOrEqualTo(Byte value) { - addCriterion("virtual <=", value, "virtual"); - return (Criteria) this; - } - - public Criteria andVirtualIn(List values) { - addCriterion("virtual in", values, "virtual"); - return (Criteria) this; - } - - public Criteria andVirtualNotIn(List values) { - addCriterion("virtual not in", values, "virtual"); - return (Criteria) this; - } - - public Criteria andVirtualBetween(Byte value1, Byte value2) { - addCriterion("virtual between", value1, value2, "virtual"); - return (Criteria) this; - } - - public Criteria andVirtualNotBetween(Byte value1, Byte value2) { - addCriterion("virtual not between", value1, value2, "virtual"); - return (Criteria) this; - } - - public Criteria andLevelIsNull() { - addCriterion("level is null"); - return (Criteria) this; - } - - public Criteria andLevelIsNotNull() { - addCriterion("level is not null"); - return (Criteria) this; - } - - public Criteria andLevelEqualTo(Byte value) { - addCriterion("level =", value, "level"); - return (Criteria) this; - } - - public Criteria andLevelNotEqualTo(Byte value) { - addCriterion("level <>", value, "level"); - return (Criteria) this; - } - - public Criteria andLevelGreaterThan(Byte value) { - addCriterion("level >", value, "level"); - return (Criteria) this; - } - - public Criteria andLevelGreaterThanOrEqualTo(Byte value) { - addCriterion("level >=", value, "level"); - return (Criteria) this; - } - - public Criteria andLevelLessThan(Byte value) { - addCriterion("level <", value, "level"); - return (Criteria) this; - } - - public Criteria andLevelLessThanOrEqualTo(Byte value) { - addCriterion("level <=", value, "level"); - return (Criteria) this; - } - - public Criteria andLevelIn(List values) { - addCriterion("level in", values, "level"); - return (Criteria) this; - } - - public Criteria andLevelNotIn(List values) { - addCriterion("level not in", values, "level"); - return (Criteria) this; - } - - public Criteria andLevelBetween(Byte value1, Byte value2) { - addCriterion("level between", value1, value2, "level"); - return (Criteria) this; - } - - public Criteria andLevelNotBetween(Byte value1, Byte value2) { - addCriterion("level not between", value1, value2, "level"); - return (Criteria) this; - } - - public Criteria andHasGroupIsNull() { - addCriterion("has_group is null"); - return (Criteria) this; - } - - public Criteria andHasGroupIsNotNull() { - addCriterion("has_group is not null"); - return (Criteria) this; - } - - public Criteria andHasGroupEqualTo(Byte value) { - addCriterion("has_group =", value, "hasGroup"); - return (Criteria) this; - } - - public Criteria andHasGroupNotEqualTo(Byte value) { - addCriterion("has_group <>", value, "hasGroup"); - return (Criteria) this; - } - - public Criteria andHasGroupGreaterThan(Byte value) { - addCriterion("has_group >", value, "hasGroup"); - return (Criteria) this; - } - - public Criteria andHasGroupGreaterThanOrEqualTo(Byte value) { - addCriterion("has_group >=", value, "hasGroup"); - return (Criteria) this; - } - - public Criteria andHasGroupLessThan(Byte value) { - addCriterion("has_group <", value, "hasGroup"); - return (Criteria) this; - } - - public Criteria andHasGroupLessThanOrEqualTo(Byte value) { - addCriterion("has_group <=", value, "hasGroup"); - return (Criteria) this; - } - - public Criteria andHasGroupIn(List values) { - addCriterion("has_group in", values, "hasGroup"); - return (Criteria) this; - } - - public Criteria andHasGroupNotIn(List values) { - addCriterion("has_group not in", values, "hasGroup"); - return (Criteria) this; - } - - public Criteria andHasGroupBetween(Byte value1, Byte value2) { - addCriterion("has_group between", value1, value2, "hasGroup"); - return (Criteria) this; - } - - public Criteria andHasGroupNotBetween(Byte value1, Byte value2) { - addCriterion("has_group not between", value1, value2, "hasGroup"); - return (Criteria) this; - } - - public Criteria andAllMemberIsNull() { - addCriterion("all_member is null"); - return (Criteria) this; - } - - public Criteria andAllMemberIsNotNull() { - addCriterion("all_member is not null"); - return (Criteria) this; - } - - public Criteria andAllMemberEqualTo(Byte value) { - addCriterion("all_member =", value, "allMember"); - return (Criteria) this; - } - - public Criteria andAllMemberNotEqualTo(Byte value) { - addCriterion("all_member <>", value, "allMember"); - return (Criteria) this; - } - - public Criteria andAllMemberGreaterThan(Byte value) { - addCriterion("all_member >", value, "allMember"); - return (Criteria) this; - } - - public Criteria andAllMemberGreaterThanOrEqualTo(Byte value) { - addCriterion("all_member >=", value, "allMember"); - return (Criteria) this; - } - - public Criteria andAllMemberLessThan(Byte value) { - addCriterion("all_member <", value, "allMember"); - return (Criteria) this; - } - - public Criteria andAllMemberLessThanOrEqualTo(Byte value) { - addCriterion("all_member <=", value, "allMember"); - return (Criteria) this; - } - - public Criteria andAllMemberIn(List values) { - addCriterion("all_member in", values, "allMember"); - return (Criteria) this; - } - - public Criteria andAllMemberNotIn(List values) { - addCriterion("all_member not in", values, "allMember"); - return (Criteria) this; - } - - public Criteria andAllMemberBetween(Byte value1, Byte value2) { - addCriterion("all_member between", value1, value2, "allMember"); - return (Criteria) this; - } - - public Criteria andAllMemberNotBetween(Byte value1, Byte value2) { - addCriterion("all_member not between", value1, value2, "allMember"); - return (Criteria) this; - } - - public Criteria andCreatedAtIsNull() { - addCriterion("created_at is null"); - return (Criteria) this; - } - - public Criteria andCreatedAtIsNotNull() { - addCriterion("created_at is not null"); - return (Criteria) this; - } - - public Criteria andCreatedAtEqualTo(Date value) { - addCriterion("created_at =", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtNotEqualTo(Date value) { - addCriterion("created_at <>", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtGreaterThan(Date value) { - addCriterion("created_at >", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { - addCriterion("created_at >=", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtLessThan(Date value) { - addCriterion("created_at <", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtLessThanOrEqualTo(Date value) { - addCriterion("created_at <=", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtIn(List values) { - addCriterion("created_at in", values, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtNotIn(List values) { - addCriterion("created_at not in", values, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtBetween(Date value1, Date value2) { - addCriterion("created_at between", value1, value2, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtNotBetween(Date value1, Date value2) { - addCriterion("created_at not between", value1, value2, "createdAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtIsNull() { - addCriterion("updated_at is null"); - return (Criteria) this; - } - - public Criteria andUpdatedAtIsNotNull() { - addCriterion("updated_at is not null"); - return (Criteria) this; - } - - public Criteria andUpdatedAtEqualTo(Date value) { - addCriterion("updated_at =", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtNotEqualTo(Date value) { - addCriterion("updated_at <>", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtGreaterThan(Date value) { - addCriterion("updated_at >", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { - addCriterion("updated_at >=", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtLessThan(Date value) { - addCriterion("updated_at <", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { - addCriterion("updated_at <=", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtIn(List values) { - addCriterion("updated_at in", values, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtNotIn(List values) { - addCriterion("updated_at not in", values, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtBetween(Date value1, Date value2) { - addCriterion("updated_at between", value1, value2, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { - addCriterion("updated_at not between", value1, value2, "updatedAt"); - return (Criteria) this; - } - - public Criteria andRecStatusIsNull() { - addCriterion("rec_status is null"); - return (Criteria) this; - } - - public Criteria andRecStatusIsNotNull() { - addCriterion("rec_status is not null"); - return (Criteria) this; - } - - public Criteria andRecStatusEqualTo(Byte value) { - addCriterion("rec_status =", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusNotEqualTo(Byte value) { - addCriterion("rec_status <>", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusGreaterThan(Byte value) { - addCriterion("rec_status >", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { - addCriterion("rec_status >=", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusLessThan(Byte value) { - addCriterion("rec_status <", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusLessThanOrEqualTo(Byte value) { - addCriterion("rec_status <=", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusIn(List values) { - addCriterion("rec_status in", values, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusNotIn(List values) { - addCriterion("rec_status not in", values, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusBetween(Byte value1, Byte value2) { - addCriterion("rec_status between", value1, value2, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { - addCriterion("rec_status not between", value1, value2, "recStatus"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } +package com.ccsens.tall.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ProTaskDetailExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ProTaskDetailExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNull() { + addCriterion("project_id is null"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNotNull() { + addCriterion("project_id is not null"); + return (Criteria) this; + } + + public Criteria andProjectIdEqualTo(Long value) { + addCriterion("project_id =", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotEqualTo(Long value) { + addCriterion("project_id <>", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThan(Long value) { + addCriterion("project_id >", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThanOrEqualTo(Long value) { + addCriterion("project_id >=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThan(Long value) { + addCriterion("project_id <", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThanOrEqualTo(Long value) { + addCriterion("project_id <=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdIn(List values) { + addCriterion("project_id in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotIn(List values) { + addCriterion("project_id not in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdBetween(Long value1, Long value2) { + addCriterion("project_id between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotBetween(Long value1, Long value2) { + addCriterion("project_id not between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andNameIsNull() { + addCriterion("name is null"); + return (Criteria) this; + } + + public Criteria andNameIsNotNull() { + addCriterion("name is not null"); + return (Criteria) this; + } + + public Criteria andNameEqualTo(String value) { + addCriterion("name =", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotEqualTo(String value) { + addCriterion("name <>", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThan(String value) { + addCriterion("name >", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("name >=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThan(String value) { + addCriterion("name <", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("name <=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLike(String value) { + addCriterion("name like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotLike(String value) { + addCriterion("name not like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameIn(List values) { + addCriterion("name in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List values) { + addCriterion("name not in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameBetween(String value1, String value2) { + addCriterion("name between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("name not between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andDescriptionIsNull() { + addCriterion("description is null"); + return (Criteria) this; + } + + public Criteria andDescriptionIsNotNull() { + addCriterion("description is not null"); + return (Criteria) this; + } + + public Criteria andDescriptionEqualTo(String value) { + addCriterion("description =", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotEqualTo(String value) { + addCriterion("description <>", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionGreaterThan(String value) { + addCriterion("description >", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionGreaterThanOrEqualTo(String value) { + addCriterion("description >=", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLessThan(String value) { + addCriterion("description <", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLessThanOrEqualTo(String value) { + addCriterion("description <=", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLike(String value) { + addCriterion("description like", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotLike(String value) { + addCriterion("description not like", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionIn(List values) { + addCriterion("description in", values, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotIn(List values) { + addCriterion("description not in", values, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionBetween(String value1, String value2) { + addCriterion("description between", value1, value2, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotBetween(String value1, String value2) { + addCriterion("description not between", value1, value2, "description"); + return (Criteria) this; + } + + public Criteria andBeginTimeIsNull() { + addCriterion("begin_time is null"); + return (Criteria) this; + } + + public Criteria andBeginTimeIsNotNull() { + addCriterion("begin_time is not null"); + return (Criteria) this; + } + + public Criteria andBeginTimeEqualTo(Long value) { + addCriterion("begin_time =", value, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeNotEqualTo(Long value) { + addCriterion("begin_time <>", value, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeGreaterThan(Long value) { + addCriterion("begin_time >", value, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeGreaterThanOrEqualTo(Long value) { + addCriterion("begin_time >=", value, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeLessThan(Long value) { + addCriterion("begin_time <", value, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeLessThanOrEqualTo(Long value) { + addCriterion("begin_time <=", value, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeIn(List values) { + addCriterion("begin_time in", values, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeNotIn(List values) { + addCriterion("begin_time not in", values, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeBetween(Long value1, Long value2) { + addCriterion("begin_time between", value1, value2, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeNotBetween(Long value1, Long value2) { + addCriterion("begin_time not between", value1, value2, "beginTime"); + return (Criteria) this; + } + + public Criteria andEndTimeIsNull() { + addCriterion("end_time is null"); + return (Criteria) this; + } + + public Criteria andEndTimeIsNotNull() { + addCriterion("end_time is not null"); + return (Criteria) this; + } + + public Criteria andEndTimeEqualTo(Long value) { + addCriterion("end_time =", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotEqualTo(Long value) { + addCriterion("end_time <>", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeGreaterThan(Long value) { + addCriterion("end_time >", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeGreaterThanOrEqualTo(Long value) { + addCriterion("end_time >=", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeLessThan(Long value) { + addCriterion("end_time <", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeLessThanOrEqualTo(Long value) { + addCriterion("end_time <=", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeIn(List values) { + addCriterion("end_time in", values, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotIn(List values) { + addCriterion("end_time not in", values, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeBetween(Long value1, Long value2) { + addCriterion("end_time between", value1, value2, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotBetween(Long value1, Long value2) { + addCriterion("end_time not between", value1, value2, "endTime"); + return (Criteria) this; + } + + public Criteria andCycleIsNull() { + addCriterion("cycle is null"); + return (Criteria) this; + } + + public Criteria andCycleIsNotNull() { + addCriterion("cycle is not null"); + return (Criteria) this; + } + + public Criteria andCycleEqualTo(String value) { + addCriterion("cycle =", value, "cycle"); + return (Criteria) this; + } + + public Criteria andCycleNotEqualTo(String value) { + addCriterion("cycle <>", value, "cycle"); + return (Criteria) this; + } + + public Criteria andCycleGreaterThan(String value) { + addCriterion("cycle >", value, "cycle"); + return (Criteria) this; + } + + public Criteria andCycleGreaterThanOrEqualTo(String value) { + addCriterion("cycle >=", value, "cycle"); + return (Criteria) this; + } + + public Criteria andCycleLessThan(String value) { + addCriterion("cycle <", value, "cycle"); + return (Criteria) this; + } + + public Criteria andCycleLessThanOrEqualTo(String value) { + addCriterion("cycle <=", value, "cycle"); + return (Criteria) this; + } + + public Criteria andCycleLike(String value) { + addCriterion("cycle like", value, "cycle"); + return (Criteria) this; + } + + public Criteria andCycleNotLike(String value) { + addCriterion("cycle not like", value, "cycle"); + return (Criteria) this; + } + + public Criteria andCycleIn(List values) { + addCriterion("cycle in", values, "cycle"); + return (Criteria) this; + } + + public Criteria andCycleNotIn(List values) { + addCriterion("cycle not in", values, "cycle"); + return (Criteria) this; + } + + public Criteria andCycleBetween(String value1, String value2) { + addCriterion("cycle between", value1, value2, "cycle"); + return (Criteria) this; + } + + public Criteria andCycleNotBetween(String value1, String value2) { + addCriterion("cycle not between", value1, value2, "cycle"); + return (Criteria) this; + } + + public Criteria andParentIdIsNull() { + addCriterion("parent_id is null"); + return (Criteria) this; + } + + public Criteria andParentIdIsNotNull() { + addCriterion("parent_id is not null"); + return (Criteria) this; + } + + public Criteria andParentIdEqualTo(Long value) { + addCriterion("parent_id =", value, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdNotEqualTo(Long value) { + addCriterion("parent_id <>", value, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdGreaterThan(Long value) { + addCriterion("parent_id >", value, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdGreaterThanOrEqualTo(Long value) { + addCriterion("parent_id >=", value, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdLessThan(Long value) { + addCriterion("parent_id <", value, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdLessThanOrEqualTo(Long value) { + addCriterion("parent_id <=", value, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdIn(List values) { + addCriterion("parent_id in", values, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdNotIn(List values) { + addCriterion("parent_id not in", values, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdBetween(Long value1, Long value2) { + addCriterion("parent_id between", value1, value2, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdNotBetween(Long value1, Long value2) { + addCriterion("parent_id not between", value1, value2, "parentId"); + return (Criteria) this; + } + + public Criteria andSubTaskIsNull() { + addCriterion("sub_task is null"); + return (Criteria) this; + } + + public Criteria andSubTaskIsNotNull() { + addCriterion("sub_task is not null"); + return (Criteria) this; + } + + public Criteria andSubTaskEqualTo(String value) { + addCriterion("sub_task =", value, "subTask"); + return (Criteria) this; + } + + public Criteria andSubTaskNotEqualTo(String value) { + addCriterion("sub_task <>", value, "subTask"); + return (Criteria) this; + } + + public Criteria andSubTaskGreaterThan(String value) { + addCriterion("sub_task >", value, "subTask"); + return (Criteria) this; + } + + public Criteria andSubTaskGreaterThanOrEqualTo(String value) { + addCriterion("sub_task >=", value, "subTask"); + return (Criteria) this; + } + + public Criteria andSubTaskLessThan(String value) { + addCriterion("sub_task <", value, "subTask"); + return (Criteria) this; + } + + public Criteria andSubTaskLessThanOrEqualTo(String value) { + addCriterion("sub_task <=", value, "subTask"); + return (Criteria) this; + } + + public Criteria andSubTaskLike(String value) { + addCriterion("sub_task like", value, "subTask"); + return (Criteria) this; + } + + public Criteria andSubTaskNotLike(String value) { + addCriterion("sub_task not like", value, "subTask"); + return (Criteria) this; + } + + public Criteria andSubTaskIn(List values) { + addCriterion("sub_task in", values, "subTask"); + return (Criteria) this; + } + + public Criteria andSubTaskNotIn(List values) { + addCriterion("sub_task not in", values, "subTask"); + return (Criteria) this; + } + + public Criteria andSubTaskBetween(String value1, String value2) { + addCriterion("sub_task between", value1, value2, "subTask"); + return (Criteria) this; + } + + public Criteria andSubTaskNotBetween(String value1, String value2) { + addCriterion("sub_task not between", value1, value2, "subTask"); + return (Criteria) this; + } + + public Criteria andSubProjectIdIsNull() { + addCriterion("sub_project_id is null"); + return (Criteria) this; + } + + public Criteria andSubProjectIdIsNotNull() { + addCriterion("sub_project_id is not null"); + return (Criteria) this; + } + + public Criteria andSubProjectIdEqualTo(Long value) { + addCriterion("sub_project_id =", value, "subProjectId"); + return (Criteria) this; + } + + public Criteria andSubProjectIdNotEqualTo(Long value) { + addCriterion("sub_project_id <>", value, "subProjectId"); + return (Criteria) this; + } + + public Criteria andSubProjectIdGreaterThan(Long value) { + addCriterion("sub_project_id >", value, "subProjectId"); + return (Criteria) this; + } + + public Criteria andSubProjectIdGreaterThanOrEqualTo(Long value) { + addCriterion("sub_project_id >=", value, "subProjectId"); + return (Criteria) this; + } + + public Criteria andSubProjectIdLessThan(Long value) { + addCriterion("sub_project_id <", value, "subProjectId"); + return (Criteria) this; + } + + public Criteria andSubProjectIdLessThanOrEqualTo(Long value) { + addCriterion("sub_project_id <=", value, "subProjectId"); + return (Criteria) this; + } + + public Criteria andSubProjectIdIn(List values) { + addCriterion("sub_project_id in", values, "subProjectId"); + return (Criteria) this; + } + + public Criteria andSubProjectIdNotIn(List values) { + addCriterion("sub_project_id not in", values, "subProjectId"); + return (Criteria) this; + } + + public Criteria andSubProjectIdBetween(Long value1, Long value2) { + addCriterion("sub_project_id between", value1, value2, "subProjectId"); + return (Criteria) this; + } + + public Criteria andSubProjectIdNotBetween(Long value1, Long value2) { + addCriterion("sub_project_id not between", value1, value2, "subProjectId"); + return (Criteria) this; + } + + public Criteria andSubProjectIsNull() { + addCriterion("sub_project is null"); + return (Criteria) this; + } + + public Criteria andSubProjectIsNotNull() { + addCriterion("sub_project is not null"); + return (Criteria) this; + } + + public Criteria andSubProjectEqualTo(String value) { + addCriterion("sub_project =", value, "subProject"); + return (Criteria) this; + } + + public Criteria andSubProjectNotEqualTo(String value) { + addCriterion("sub_project <>", value, "subProject"); + return (Criteria) this; + } + + public Criteria andSubProjectGreaterThan(String value) { + addCriterion("sub_project >", value, "subProject"); + return (Criteria) this; + } + + public Criteria andSubProjectGreaterThanOrEqualTo(String value) { + addCriterion("sub_project >=", value, "subProject"); + return (Criteria) this; + } + + public Criteria andSubProjectLessThan(String value) { + addCriterion("sub_project <", value, "subProject"); + return (Criteria) this; + } + + public Criteria andSubProjectLessThanOrEqualTo(String value) { + addCriterion("sub_project <=", value, "subProject"); + return (Criteria) this; + } + + public Criteria andSubProjectLike(String value) { + addCriterion("sub_project like", value, "subProject"); + return (Criteria) this; + } + + public Criteria andSubProjectNotLike(String value) { + addCriterion("sub_project not like", value, "subProject"); + return (Criteria) this; + } + + public Criteria andSubProjectIn(List values) { + addCriterion("sub_project in", values, "subProject"); + return (Criteria) this; + } + + public Criteria andSubProjectNotIn(List values) { + addCriterion("sub_project not in", values, "subProject"); + return (Criteria) this; + } + + public Criteria andSubProjectBetween(String value1, String value2) { + addCriterion("sub_project between", value1, value2, "subProject"); + return (Criteria) this; + } + + public Criteria andSubProjectNotBetween(String value1, String value2) { + addCriterion("sub_project not between", value1, value2, "subProject"); + return (Criteria) this; + } + + public Criteria andExecutorRoleIsNull() { + addCriterion("executor_role is null"); + return (Criteria) this; + } + + public Criteria andExecutorRoleIsNotNull() { + addCriterion("executor_role is not null"); + return (Criteria) this; + } + + public Criteria andExecutorRoleEqualTo(Long value) { + addCriterion("executor_role =", value, "executorRole"); + return (Criteria) this; + } + + public Criteria andExecutorRoleNotEqualTo(Long value) { + addCriterion("executor_role <>", value, "executorRole"); + return (Criteria) this; + } + + public Criteria andExecutorRoleGreaterThan(Long value) { + addCriterion("executor_role >", value, "executorRole"); + return (Criteria) this; + } + + public Criteria andExecutorRoleGreaterThanOrEqualTo(Long value) { + addCriterion("executor_role >=", value, "executorRole"); + return (Criteria) this; + } + + public Criteria andExecutorRoleLessThan(Long value) { + addCriterion("executor_role <", value, "executorRole"); + return (Criteria) this; + } + + public Criteria andExecutorRoleLessThanOrEqualTo(Long value) { + addCriterion("executor_role <=", value, "executorRole"); + return (Criteria) this; + } + + public Criteria andExecutorRoleIn(List values) { + addCriterion("executor_role in", values, "executorRole"); + return (Criteria) this; + } + + public Criteria andExecutorRoleNotIn(List values) { + addCriterion("executor_role not in", values, "executorRole"); + return (Criteria) this; + } + + public Criteria andExecutorRoleBetween(Long value1, Long value2) { + addCriterion("executor_role between", value1, value2, "executorRole"); + return (Criteria) this; + } + + public Criteria andExecutorRoleNotBetween(Long value1, Long value2) { + addCriterion("executor_role not between", value1, value2, "executorRole"); + return (Criteria) this; + } + + public Criteria andCheckerRoleIsNull() { + addCriterion("checker_role is null"); + return (Criteria) this; + } + + public Criteria andCheckerRoleIsNotNull() { + addCriterion("checker_role is not null"); + return (Criteria) this; + } + + public Criteria andCheckerRoleEqualTo(Long value) { + addCriterion("checker_role =", value, "checkerRole"); + return (Criteria) this; + } + + public Criteria andCheckerRoleNotEqualTo(Long value) { + addCriterion("checker_role <>", value, "checkerRole"); + return (Criteria) this; + } + + public Criteria andCheckerRoleGreaterThan(Long value) { + addCriterion("checker_role >", value, "checkerRole"); + return (Criteria) this; + } + + public Criteria andCheckerRoleGreaterThanOrEqualTo(Long value) { + addCriterion("checker_role >=", value, "checkerRole"); + return (Criteria) this; + } + + public Criteria andCheckerRoleLessThan(Long value) { + addCriterion("checker_role <", value, "checkerRole"); + return (Criteria) this; + } + + public Criteria andCheckerRoleLessThanOrEqualTo(Long value) { + addCriterion("checker_role <=", value, "checkerRole"); + return (Criteria) this; + } + + public Criteria andCheckerRoleIn(List values) { + addCriterion("checker_role in", values, "checkerRole"); + return (Criteria) this; + } + + public Criteria andCheckerRoleNotIn(List values) { + addCriterion("checker_role not in", values, "checkerRole"); + return (Criteria) this; + } + + public Criteria andCheckerRoleBetween(Long value1, Long value2) { + addCriterion("checker_role between", value1, value2, "checkerRole"); + return (Criteria) this; + } + + public Criteria andCheckerRoleNotBetween(Long value1, Long value2) { + addCriterion("checker_role not between", value1, value2, "checkerRole"); + return (Criteria) this; + } + + public Criteria andMoneyIsNull() { + addCriterion("money is null"); + return (Criteria) this; + } + + public Criteria andMoneyIsNotNull() { + addCriterion("money is not null"); + return (Criteria) this; + } + + public Criteria andMoneyEqualTo(Long value) { + addCriterion("money =", value, "money"); + return (Criteria) this; + } + + public Criteria andMoneyNotEqualTo(Long value) { + addCriterion("money <>", value, "money"); + return (Criteria) this; + } + + public Criteria andMoneyGreaterThan(Long value) { + addCriterion("money >", value, "money"); + return (Criteria) this; + } + + public Criteria andMoneyGreaterThanOrEqualTo(Long value) { + addCriterion("money >=", value, "money"); + return (Criteria) this; + } + + public Criteria andMoneyLessThan(Long value) { + addCriterion("money <", value, "money"); + return (Criteria) this; + } + + public Criteria andMoneyLessThanOrEqualTo(Long value) { + addCriterion("money <=", value, "money"); + return (Criteria) this; + } + + public Criteria andMoneyIn(List values) { + addCriterion("money in", values, "money"); + return (Criteria) this; + } + + public Criteria andMoneyNotIn(List values) { + addCriterion("money not in", values, "money"); + return (Criteria) this; + } + + public Criteria andMoneyBetween(Long value1, Long value2) { + addCriterion("money between", value1, value2, "money"); + return (Criteria) this; + } + + public Criteria andMoneyNotBetween(Long value1, Long value2) { + addCriterion("money not between", value1, value2, "money"); + return (Criteria) this; + } + + public Criteria andDelayIsNull() { + addCriterion("delay is null"); + return (Criteria) this; + } + + public Criteria andDelayIsNotNull() { + addCriterion("delay is not null"); + return (Criteria) this; + } + + public Criteria andDelayEqualTo(Byte value) { + addCriterion("delay =", value, "delay"); + return (Criteria) this; + } + + public Criteria andDelayNotEqualTo(Byte value) { + addCriterion("delay <>", value, "delay"); + return (Criteria) this; + } + + public Criteria andDelayGreaterThan(Byte value) { + addCriterion("delay >", value, "delay"); + return (Criteria) this; + } + + public Criteria andDelayGreaterThanOrEqualTo(Byte value) { + addCriterion("delay >=", value, "delay"); + return (Criteria) this; + } + + public Criteria andDelayLessThan(Byte value) { + addCriterion("delay <", value, "delay"); + return (Criteria) this; + } + + public Criteria andDelayLessThanOrEqualTo(Byte value) { + addCriterion("delay <=", value, "delay"); + return (Criteria) this; + } + + public Criteria andDelayIn(List values) { + addCriterion("delay in", values, "delay"); + return (Criteria) this; + } + + public Criteria andDelayNotIn(List values) { + addCriterion("delay not in", values, "delay"); + return (Criteria) this; + } + + public Criteria andDelayBetween(Byte value1, Byte value2) { + addCriterion("delay between", value1, value2, "delay"); + return (Criteria) this; + } + + public Criteria andDelayNotBetween(Byte value1, Byte value2) { + addCriterion("delay not between", value1, value2, "delay"); + return (Criteria) this; + } + + public Criteria andDelayTimeIsNull() { + addCriterion("delay_time is null"); + return (Criteria) this; + } + + public Criteria andDelayTimeIsNotNull() { + addCriterion("delay_time is not null"); + return (Criteria) this; + } + + public Criteria andDelayTimeEqualTo(Long value) { + addCriterion("delay_time =", value, "delayTime"); + return (Criteria) this; + } + + public Criteria andDelayTimeNotEqualTo(Long value) { + addCriterion("delay_time <>", value, "delayTime"); + return (Criteria) this; + } + + public Criteria andDelayTimeGreaterThan(Long value) { + addCriterion("delay_time >", value, "delayTime"); + return (Criteria) this; + } + + public Criteria andDelayTimeGreaterThanOrEqualTo(Long value) { + addCriterion("delay_time >=", value, "delayTime"); + return (Criteria) this; + } + + public Criteria andDelayTimeLessThan(Long value) { + addCriterion("delay_time <", value, "delayTime"); + return (Criteria) this; + } + + public Criteria andDelayTimeLessThanOrEqualTo(Long value) { + addCriterion("delay_time <=", value, "delayTime"); + return (Criteria) this; + } + + public Criteria andDelayTimeIn(List values) { + addCriterion("delay_time in", values, "delayTime"); + return (Criteria) this; + } + + public Criteria andDelayTimeNotIn(List values) { + addCriterion("delay_time not in", values, "delayTime"); + return (Criteria) this; + } + + public Criteria andDelayTimeBetween(Long value1, Long value2) { + addCriterion("delay_time between", value1, value2, "delayTime"); + return (Criteria) this; + } + + public Criteria andDelayTimeNotBetween(Long value1, Long value2) { + addCriterion("delay_time not between", value1, value2, "delayTime"); + return (Criteria) this; + } + + public Criteria andLoopToIsNull() { + addCriterion("loop_to is null"); + return (Criteria) this; + } + + public Criteria andLoopToIsNotNull() { + addCriterion("loop_to is not null"); + return (Criteria) this; + } + + public Criteria andLoopToEqualTo(Long value) { + addCriterion("loop_to =", value, "loopTo"); + return (Criteria) this; + } + + public Criteria andLoopToNotEqualTo(Long value) { + addCriterion("loop_to <>", value, "loopTo"); + return (Criteria) this; + } + + public Criteria andLoopToGreaterThan(Long value) { + addCriterion("loop_to >", value, "loopTo"); + return (Criteria) this; + } + + public Criteria andLoopToGreaterThanOrEqualTo(Long value) { + addCriterion("loop_to >=", value, "loopTo"); + return (Criteria) this; + } + + public Criteria andLoopToLessThan(Long value) { + addCriterion("loop_to <", value, "loopTo"); + return (Criteria) this; + } + + public Criteria andLoopToLessThanOrEqualTo(Long value) { + addCriterion("loop_to <=", value, "loopTo"); + return (Criteria) this; + } + + public Criteria andLoopToIn(List values) { + addCriterion("loop_to in", values, "loopTo"); + return (Criteria) this; + } + + public Criteria andLoopToNotIn(List values) { + addCriterion("loop_to not in", values, "loopTo"); + return (Criteria) this; + } + + public Criteria andLoopToBetween(Long value1, Long value2) { + addCriterion("loop_to between", value1, value2, "loopTo"); + return (Criteria) this; + } + + public Criteria andLoopToNotBetween(Long value1, Long value2) { + addCriterion("loop_to not between", value1, value2, "loopTo"); + return (Criteria) this; + } + + public Criteria andLoopTimesIsNull() { + addCriterion("loop_times is null"); + return (Criteria) this; + } + + public Criteria andLoopTimesIsNotNull() { + addCriterion("loop_times is not null"); + return (Criteria) this; + } + + public Criteria andLoopTimesEqualTo(Integer value) { + addCriterion("loop_times =", value, "loopTimes"); + return (Criteria) this; + } + + public Criteria andLoopTimesNotEqualTo(Integer value) { + addCriterion("loop_times <>", value, "loopTimes"); + return (Criteria) this; + } + + public Criteria andLoopTimesGreaterThan(Integer value) { + addCriterion("loop_times >", value, "loopTimes"); + return (Criteria) this; + } + + public Criteria andLoopTimesGreaterThanOrEqualTo(Integer value) { + addCriterion("loop_times >=", value, "loopTimes"); + return (Criteria) this; + } + + public Criteria andLoopTimesLessThan(Integer value) { + addCriterion("loop_times <", value, "loopTimes"); + return (Criteria) this; + } + + public Criteria andLoopTimesLessThanOrEqualTo(Integer value) { + addCriterion("loop_times <=", value, "loopTimes"); + return (Criteria) this; + } + + public Criteria andLoopTimesIn(List values) { + addCriterion("loop_times in", values, "loopTimes"); + return (Criteria) this; + } + + public Criteria andLoopTimesNotIn(List values) { + addCriterion("loop_times not in", values, "loopTimes"); + return (Criteria) this; + } + + public Criteria andLoopTimesBetween(Integer value1, Integer value2) { + addCriterion("loop_times between", value1, value2, "loopTimes"); + return (Criteria) this; + } + + public Criteria andLoopTimesNotBetween(Integer value1, Integer value2) { + addCriterion("loop_times not between", value1, value2, "loopTimes"); + return (Criteria) this; + } + + public Criteria andVirtualIsNull() { + addCriterion("virtual is null"); + return (Criteria) this; + } + + public Criteria andVirtualIsNotNull() { + addCriterion("virtual is not null"); + return (Criteria) this; + } + + public Criteria andVirtualEqualTo(Byte value) { + addCriterion("virtual =", value, "virtual"); + return (Criteria) this; + } + + public Criteria andVirtualNotEqualTo(Byte value) { + addCriterion("virtual <>", value, "virtual"); + return (Criteria) this; + } + + public Criteria andVirtualGreaterThan(Byte value) { + addCriterion("virtual >", value, "virtual"); + return (Criteria) this; + } + + public Criteria andVirtualGreaterThanOrEqualTo(Byte value) { + addCriterion("virtual >=", value, "virtual"); + return (Criteria) this; + } + + public Criteria andVirtualLessThan(Byte value) { + addCriterion("virtual <", value, "virtual"); + return (Criteria) this; + } + + public Criteria andVirtualLessThanOrEqualTo(Byte value) { + addCriterion("virtual <=", value, "virtual"); + return (Criteria) this; + } + + public Criteria andVirtualIn(List values) { + addCriterion("virtual in", values, "virtual"); + return (Criteria) this; + } + + public Criteria andVirtualNotIn(List values) { + addCriterion("virtual not in", values, "virtual"); + return (Criteria) this; + } + + public Criteria andVirtualBetween(Byte value1, Byte value2) { + addCriterion("virtual between", value1, value2, "virtual"); + return (Criteria) this; + } + + public Criteria andVirtualNotBetween(Byte value1, Byte value2) { + addCriterion("virtual not between", value1, value2, "virtual"); + return (Criteria) this; + } + + public Criteria andLevelIsNull() { + addCriterion("level is null"); + return (Criteria) this; + } + + public Criteria andLevelIsNotNull() { + addCriterion("level is not null"); + return (Criteria) this; + } + + public Criteria andLevelEqualTo(Byte value) { + addCriterion("level =", value, "level"); + return (Criteria) this; + } + + public Criteria andLevelNotEqualTo(Byte value) { + addCriterion("level <>", value, "level"); + return (Criteria) this; + } + + public Criteria andLevelGreaterThan(Byte value) { + addCriterion("level >", value, "level"); + return (Criteria) this; + } + + public Criteria andLevelGreaterThanOrEqualTo(Byte value) { + addCriterion("level >=", value, "level"); + return (Criteria) this; + } + + public Criteria andLevelLessThan(Byte value) { + addCriterion("level <", value, "level"); + return (Criteria) this; + } + + public Criteria andLevelLessThanOrEqualTo(Byte value) { + addCriterion("level <=", value, "level"); + return (Criteria) this; + } + + public Criteria andLevelIn(List values) { + addCriterion("level in", values, "level"); + return (Criteria) this; + } + + public Criteria andLevelNotIn(List values) { + addCriterion("level not in", values, "level"); + return (Criteria) this; + } + + public Criteria andLevelBetween(Byte value1, Byte value2) { + addCriterion("level between", value1, value2, "level"); + return (Criteria) this; + } + + public Criteria andLevelNotBetween(Byte value1, Byte value2) { + addCriterion("level not between", value1, value2, "level"); + return (Criteria) this; + } + + public Criteria andHasGroupIsNull() { + addCriterion("has_group is null"); + return (Criteria) this; + } + + public Criteria andHasGroupIsNotNull() { + addCriterion("has_group is not null"); + return (Criteria) this; + } + + public Criteria andHasGroupEqualTo(Byte value) { + addCriterion("has_group =", value, "hasGroup"); + return (Criteria) this; + } + + public Criteria andHasGroupNotEqualTo(Byte value) { + addCriterion("has_group <>", value, "hasGroup"); + return (Criteria) this; + } + + public Criteria andHasGroupGreaterThan(Byte value) { + addCriterion("has_group >", value, "hasGroup"); + return (Criteria) this; + } + + public Criteria andHasGroupGreaterThanOrEqualTo(Byte value) { + addCriterion("has_group >=", value, "hasGroup"); + return (Criteria) this; + } + + public Criteria andHasGroupLessThan(Byte value) { + addCriterion("has_group <", value, "hasGroup"); + return (Criteria) this; + } + + public Criteria andHasGroupLessThanOrEqualTo(Byte value) { + addCriterion("has_group <=", value, "hasGroup"); + return (Criteria) this; + } + + public Criteria andHasGroupIn(List values) { + addCriterion("has_group in", values, "hasGroup"); + return (Criteria) this; + } + + public Criteria andHasGroupNotIn(List values) { + addCriterion("has_group not in", values, "hasGroup"); + return (Criteria) this; + } + + public Criteria andHasGroupBetween(Byte value1, Byte value2) { + addCriterion("has_group between", value1, value2, "hasGroup"); + return (Criteria) this; + } + + public Criteria andHasGroupNotBetween(Byte value1, Byte value2) { + addCriterion("has_group not between", value1, value2, "hasGroup"); + return (Criteria) this; + } + + public Criteria andFinishNeedAllIsNull() { + addCriterion("finish_need_all is null"); + return (Criteria) this; + } + + public Criteria andFinishNeedAllIsNotNull() { + addCriterion("finish_need_all is not null"); + return (Criteria) this; + } + + public Criteria andFinishNeedAllEqualTo(Byte value) { + addCriterion("finish_need_all =", value, "finishNeedAll"); + return (Criteria) this; + } + + public Criteria andFinishNeedAllNotEqualTo(Byte value) { + addCriterion("finish_need_all <>", value, "finishNeedAll"); + return (Criteria) this; + } + + public Criteria andFinishNeedAllGreaterThan(Byte value) { + addCriterion("finish_need_all >", value, "finishNeedAll"); + return (Criteria) this; + } + + public Criteria andFinishNeedAllGreaterThanOrEqualTo(Byte value) { + addCriterion("finish_need_all >=", value, "finishNeedAll"); + return (Criteria) this; + } + + public Criteria andFinishNeedAllLessThan(Byte value) { + addCriterion("finish_need_all <", value, "finishNeedAll"); + return (Criteria) this; + } + + public Criteria andFinishNeedAllLessThanOrEqualTo(Byte value) { + addCriterion("finish_need_all <=", value, "finishNeedAll"); + return (Criteria) this; + } + + public Criteria andFinishNeedAllIn(List values) { + addCriterion("finish_need_all in", values, "finishNeedAll"); + return (Criteria) this; + } + + public Criteria andFinishNeedAllNotIn(List values) { + addCriterion("finish_need_all not in", values, "finishNeedAll"); + return (Criteria) this; + } + + public Criteria andFinishNeedAllBetween(Byte value1, Byte value2) { + addCriterion("finish_need_all between", value1, value2, "finishNeedAll"); + return (Criteria) this; + } + + public Criteria andFinishNeedAllNotBetween(Byte value1, Byte value2) { + addCriterion("finish_need_all not between", value1, value2, "finishNeedAll"); + return (Criteria) this; + } + + public Criteria andAllMemberIsNull() { + addCriterion("all_member is null"); + return (Criteria) this; + } + + public Criteria andAllMemberIsNotNull() { + addCriterion("all_member is not null"); + return (Criteria) this; + } + + public Criteria andAllMemberEqualTo(Byte value) { + addCriterion("all_member =", value, "allMember"); + return (Criteria) this; + } + + public Criteria andAllMemberNotEqualTo(Byte value) { + addCriterion("all_member <>", value, "allMember"); + return (Criteria) this; + } + + public Criteria andAllMemberGreaterThan(Byte value) { + addCriterion("all_member >", value, "allMember"); + return (Criteria) this; + } + + public Criteria andAllMemberGreaterThanOrEqualTo(Byte value) { + addCriterion("all_member >=", value, "allMember"); + return (Criteria) this; + } + + public Criteria andAllMemberLessThan(Byte value) { + addCriterion("all_member <", value, "allMember"); + return (Criteria) this; + } + + public Criteria andAllMemberLessThanOrEqualTo(Byte value) { + addCriterion("all_member <=", value, "allMember"); + return (Criteria) this; + } + + public Criteria andAllMemberIn(List values) { + addCriterion("all_member in", values, "allMember"); + return (Criteria) this; + } + + public Criteria andAllMemberNotIn(List values) { + addCriterion("all_member not in", values, "allMember"); + return (Criteria) this; + } + + public Criteria andAllMemberBetween(Byte value1, Byte value2) { + addCriterion("all_member between", value1, value2, "allMember"); + return (Criteria) this; + } + + public Criteria andAllMemberNotBetween(Byte value1, Byte value2) { + addCriterion("all_member not between", value1, value2, "allMember"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } } \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java index 74956451..e6c9e06d 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java @@ -203,6 +203,8 @@ public class ProjectVo { private Long id; @ApiModelProperty("项目名") private String name; + @ApiModelProperty("完成情况") + private Integer process; @ApiModelProperty("项目类型 0普通项目 1模板项目 2常驻项目") private Integer templateStatus; } diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java index b106251e..e35d85de 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java @@ -54,6 +54,8 @@ public class TaskVo { private Long duration; @ApiModelProperty("跳转模式 -1手动，0自动，1延迟") private int delay; + @ApiModelProperty("状态：0-未开始，1-进行中，2-已完成") + private int process; public Long getDuration(){ if(ObjectUtil.isNotNull(beginTime) && ObjectUtil.isNotNull(endTime)) { return endTime - beginTime; @@ -103,7 +105,7 @@ public class TaskVo { private Long execTimes; @ApiModelProperty("奖惩") private BigDecimal money; - @ApiModelProperty("状态：0-未开始，1-进行中，2-已过期") + @ApiModelProperty("状态：0-未开始，1-进行中，2-已完成") private int process; @ApiModelProperty("服务器时间") private Long serverTime; diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/ProSubTimeMemberDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/ProSubTimeMemberDao.java new file mode 100644 index 00000000..272eabb2 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/ProSubTimeMemberDao.java @@ -0,0 +1,8 @@ +package com.ccsens.tall.persist.dao; + +import com.ccsens.tall.persist.mapper.ProSubTimeMemberMapper; +import org.springframework.stereotype.Repository; + +@Repository +public interface ProSubTimeMemberDao extends ProSubTimeMemberMapper { +} diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDetailDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDetailDao.java index 01e3e16b..ab8d64d9 100644 --- a/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDetailDao.java +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDetailDao.java @@ -1,32 +1,32 @@ -package com.ccsens.tall.persist.dao; - - -import com.ccsens.tall.bean.po.ProTaskSubTime; -import com.ccsens.tall.bean.vo.TaskVo; -import com.ccsens.tall.persist.mapper.ProTaskDetailMapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface TaskDetailDao extends ProTaskDetailMapper{ - List selectNormalTaskListByPM(@Param("projectId") Long projectId, @Param("parentId") Long parentId, @Param("startTime") Long startTime, @Param("endTime") Long endTime); - - List selectTaskByRoleAndAllMembers(@Param("projectId") Long projectId, @Param("roleId") Long roleId, @Param("allMemberId") Long allMemberId, - @Param("startTime") Long startTime, @Param("endTime") Long endTime); - - TaskVo.NormalTask selectTaskByTaskId(@Param("projectId") Long projectId, @Param("taskId") Long taskId); - - List selectTaskByParentId(@Param("projectId") Long projectId, @Param("parentId") Long parentId); - - List selectSubTaskByGroupId(@Param("parentId") Long parentId, @Param("beginTime") Long beginTime, @Param("endTime") Long endTime); - - List selectTaskByKey(@Param("userId") Long userId, @Param("projectId") Long projectId, @Param("key") String key); - - TaskVo.NormalTask selectTaskByParentIdAndTime(@Param("parentId") Long parentId, @Param("startTime") Long startTime, @Param("endTime") Long endTime); - - Long selectSubTimeByTaskIdAndTime(@Param("detailId") Long detailId, @Param("now") Long now); - -// void deleteTaskByRoleId(@Param("parentId")Long roleId); -} +package com.ccsens.tall.persist.dao; + + +import com.ccsens.tall.bean.po.ProTaskSubTime; +import com.ccsens.tall.bean.vo.TaskVo; +import com.ccsens.tall.persist.mapper.ProTaskDetailMapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface TaskDetailDao extends ProTaskDetailMapper { + List selectNormalTaskListByPM(@Param("projectId") Long projectId, @Param("parentId") Long parentId, @Param("startTime") Long startTime, @Param("endTime") Long endTime); + + List selectTaskByRoleAndAllMembers(@Param("projectId") Long projectId, @Param("roleId") Long roleId, @Param("allMemberId") Long allMemberId, + @Param("startTime") Long startTime, @Param("endTime") Long endTime); + + TaskVo.NormalTask selectTaskByTaskId(@Param("subTimeId") Long subTimeId, @Param("taskId") Long taskId); + + List selectTaskByParentId(@Param("projectId") Long projectId, @Param("parentId") Long parentId); + + List selectSubTaskByGroupId(@Param("parentId") Long parentId, @Param("beginTime") Long beginTime, @Param("endTime") Long endTime); + + List selectTaskByKey(@Param("userId") Long userId, @Param("projectId") Long projectId, @Param("key") String key); + + TaskVo.NormalTask selectTaskByParentIdAndTime(@Param("parentId") Long parentId, @Param("startTime") Long startTime, @Param("endTime") Long endTime); + + Long selectSubTimeByTaskIdAndTime(@Param("detailId") Long detailId, @Param("now") Long now); + +// void deleteTaskByRoleId(@Param("parentId")Long roleId); +} diff --git a/tall/src/main/java/com/ccsens/tall/persist/mapper/ProSubTimeMemberMapper.java b/tall/src/main/java/com/ccsens/tall/persist/mapper/ProSubTimeMemberMapper.java new file mode 100644 index 00000000..628625e6 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/mapper/ProSubTimeMemberMapper.java @@ -0,0 +1,31 @@ +package com.ccsens.tall.persist.mapper; + +import com.ccsens.tall.bean.po.ProSubTimeMember; +import com.ccsens.tall.bean.po.ProSubTimeMemberExample; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface ProSubTimeMemberMapper { + long countByExample(ProSubTimeMemberExample example); + + int deleteByExample(ProSubTimeMemberExample example); + + int deleteByPrimaryKey(Long id); + + int insert(ProSubTimeMember record); + + int insertSelective(ProSubTimeMember record); + + List selectByExample(ProSubTimeMemberExample example); + + ProSubTimeMember selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") ProSubTimeMember record, @Param("example") ProSubTimeMemberExample example); + + int updateByExample(@Param("record") ProSubTimeMember record, @Param("example") ProSubTimeMemberExample example); + + int updateByPrimaryKeySelective(ProSubTimeMember record); + + int updateByPrimaryKey(ProSubTimeMember record); +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java index 7580ad81..737db465 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java @@ -1,989 +1,991 @@ -package com.ccsens.tall.service; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.lang.Snowflake; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.ccsens.tall.bean.po.*; -import com.ccsens.tall.bean.vo.ProjectVo; -import com.ccsens.tall.persist.dao.SysPluginDao; -import com.ccsens.util.*; -import com.ccsens.util.cron.CronConstant; -import com.ccsens.util.cron.NatureToDate; -import com.ccsens.util.exception.BaseException; -import lombok.extern.slf4j.Slf4j; -import org.apache.poi.xssf.usermodel.XSSFCell; -import org.apache.poi.xssf.usermodel.XSSFRow; -import org.apache.poi.xssf.usermodel.XSSFSheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -import java.io.FileInputStream; -import java.io.InputStream; -import java.util.*; - -@Slf4j -@Service -@Transactional(propagation = Propagation.REQUIRED) -public class ExcelService implements IExcelService { - @Autowired - private SysPluginDao sysPluginDao; - @Autowired - private IProjectService projectService; - @Autowired - private Snowflake snowflake; - @Autowired - private IProRoleService proRoleService; - @Autowired - private IProMemberRoleService proMemberRoleService; - @Autowired - private IExcludeRoleService excludeRoleService; - @Autowired - private IProMemberService proMemberService; - @Autowired - private IProTaskDetailService proTaskDetailService; - @Autowired - private ITaskSubTimeService taskSubTimeService; - @Autowired - private ITaskMemberService taskMemberService; - @Autowired - private ITaskDeliverService taskDeliverService; - @Autowired - private ITaskPluginService taskPluginService; - @Autowired - private IUserService userService; - @Autowired - private IUserAttentionService userAttentionService; - - - @Override - public ProjectVo.ProjectInfo readXls(String path, Long currentUserId) throws Exception { - InputStream is = new FileInputStream(path); - XSSFWorkbook xssfWorkbook = new XSSFWorkbook(is); - //读取WBS表 - SysProject sysProject = readWbs(xssfWorkbook, currentUserId); - ProjectVo.ProjectInfo projectInfo = selectByProjectId(currentUserId,sysProject); - return projectInfo; - } - - /** - * 读取Wbs - */ - public SysProject readWbs(XSSFWorkbook xssfWorkbook, Long currentUserId) throws Exception { - //项目 - SysProject sysProject = new SysProject(); - //角色 - List proRoles = new ArrayList<>(); - //成员 - List proMembers = new ArrayList<>(); - //任务 - List taskDetails = new ArrayList<>(); - - XSSFSheet memberSheet = xssfWorkbook.getSheet("项目成员表"); - XSSFSheet wbsSheet = xssfWorkbook.getSheetAt(0);//wbs - - int projectInfoStart = 0; - int projectInfoEnd = 0; - int memberStart = 0; - int memberEnd = 0; - int taskStart = 0; - int taskEnd = 0; - - taskEnd = wbsSheet.getLastRowNum(); - for (int i = 0; i <= wbsSheet.getLastRowNum(); i++) { - XSSFRow xssfRow = wbsSheet.getRow(i); - - if (xssfRow == null) { - continue; - } - XSSFCell xssfCell = xssfRow.getCell(0); - if (xssfCell == null) { - continue; - } - String s = ExcelUtil.getCellValue(xssfCell); - - if (s.indexOf("项目信息") == 0) { - projectInfoStart = i + 1; - } - if (s.indexOf("项目成员") == 0) { - projectInfoEnd = i - 1; - memberStart = i + 1; - } - if (s.indexOf("项目任务分解") == 0) { - memberEnd = i - 1; - taskStart = i + 1; - } - } - if(projectInfoStart==0){ - throw new BaseException(CodeEnum.WSB_NOT_PROJECT_HEADER); - } - if(projectInfoStart==0){ - throw new BaseException(CodeEnum.WSB_NOT_MEMBER_HEADER); - } - if(projectInfoStart==0){ - throw new BaseException(CodeEnum.WSB_NOT_TASK_HEADER); - } - readProject(wbsSheet, projectInfoStart, projectInfoEnd, currentUserId,sysProject); - readMember(wbsSheet, memberSheet,memberStart, memberEnd,sysProject, proRoles,proMembers); - readTask(xssfWorkbook, wbsSheet, taskStart, taskEnd, currentUserId,sysProject,taskDetails,proRoles,proMembers); - saveProTaskSubTime(taskDetails); - //读取插件表 - readPlugin(xssfWorkbook,taskDetails,proRoles); - return sysProject; - } - - private void readProject(XSSFSheet wbsSheet, int projectInfoStart, int projectInfoEnd, Long currentUserId,SysProject sysProject) { - XSSFRow row = wbsSheet.getRow(projectInfoStart + 1); - String projectName = ExcelUtil.getCellValue(row.getCell(0)); - if(StrUtil.isNotEmpty(projectName)){ - String begin = ExcelUtil.getCellValue(row.getCell(3)); - String end = ExcelUtil.getCellValue(row.getCell(4)); - if(StrUtil.isNotEmpty(begin)&&StrUtil.isNotEmpty(end)){ - Long beginTime = null; - Long endTime = null; - try { - beginTime = Long.parseLong(begin); - endTime = Long.parseLong(end); - }catch (Exception e){ - //日期格式错误 - throw new BaseException(CodeEnum.WBS_PROJECT_TIME_ERROR); - } - sysProject.setId(snowflake.nextId()); - sysProject.setName(projectName); - sysProject.setDescription(ExcelUtil.getCellValue(row.getCell(1))); - sysProject.setAddress(ExcelUtil.getCellValue(row.getCell(2))); - sysProject.setBeginTime(beginTime); - sysProject.setEndTime(endTime); - sysProject.setCreatorId(currentUserId); - //是否发布,默认是1发布的 - sysProject.setPublished((byte) 1); - //是否是模板，新加的不是模板 0 - sysProject.setTemplate((byte) 0); - projectService.saveProject(sysProject); - System.out.println(sysProject); - }else { - //没有开始结束时间 - throw new BaseException(CodeEnum.WBS_NOT_PROJECT_TIME); - } - }else { - //没有项目名 - throw new BaseException(CodeEnum.WBS_NOT_PROJECT_NAME); - } - } - - private void readMember(XSSFSheet wbsSheet, XSSFSheet memberSheet,int memberStart, int memberEnd, - SysProject sysProject,List proRoles,List proMembers) throws Exception { - - //添加奖惩干系人角色（一级角色） - ProRole stakeholderRole = new ProRole(); - stakeholderRole.setName(WebConstant.ROLE_NAME.MoneyStakeholder.value); - stakeholderRole.setDescription(WebConstant.ROLE_NAME.MoneyStakeholder.phase); - stakeholderRole.setProjectId(sysProject.getId()); - stakeholderRole.setId(snowflake.nextId()); - proRoleService.saveProRole(stakeholderRole); - proRoles.add(stakeholderRole); - //添加奖惩干系人角色（二级角色） - ProRole stakeholderProRole = new ProRole(); - stakeholderProRole.setName(WebConstant.ROLE_NAME.MoneyStakeholder.value); - stakeholderProRole.setDescription(WebConstant.ROLE_NAME.MoneyStakeholder.phase); - stakeholderProRole.setParentId(stakeholderRole.getId()); - stakeholderProRole.setProjectId(sysProject.getId()); - stakeholderProRole.setId(snowflake.nextId()); - proRoleService.saveProRole(stakeholderProRole); - proRoles.add(stakeholderProRole); - - //添加创建者一级角色 - ProRole creator = new ProRole(); - creator.setName(WebConstant.ROLE_NAME.Creator.value); - creator.setDescription(WebConstant.ROLE_NAME.Creator.phase); - creator.setProjectId(sysProject.getId()); - creator.setId(snowflake.nextId()); - proRoleService.saveProRole(creator); - proRoles.add(creator); - //添加创建者角色（二级角色） - ProRole creatorRole = new ProRole(); - creatorRole.setName(WebConstant.ROLE_NAME.Creator.value); - creatorRole.setDescription(WebConstant.ROLE_NAME.Creator.phase); - creatorRole.setParentId(creator.getId()); - creatorRole.setProjectId(sysProject.getId()); - creatorRole.setId(snowflake.nextId()); - proRoleService.saveProRole(creatorRole); - proRoles.add(creatorRole); - - //添加成员和奖惩干系人 - memberWhitStakeholder(memberSheet, stakeholderProRole.getId(),sysProject,proMembers); - - Long firstRoleId = null; - Long secondRoleId = null; - for (int i = memberStart + 1; i <= memberEnd; i++) { - XSSFRow row = wbsSheet.getRow(i); - String proRoleCell = ExcelUtil.getCellValue(row.getCell(1)); - String secondRoleCell = ExcelUtil.getCellValue(row.getCell(2)); - String memberCell = ExcelUtil.getCellValue(row.getCell(3)); - //添加一级角色 - if (StrUtil.isNotEmpty(proRoleCell)) { - ProRole role = new ProRole(); - role.setId(snowflake.nextId()); - role.setProjectId(sysProject.getId()); -// switch (proRoleCell){ -// case WebConstant.ROLE_NAME.God: -// break; -// default: -// } - if (proRoleCell.equalsIgnoreCase(WebConstant.ROLE_NAME.God.phase)) { - role.setName(WebConstant.ROLE_NAME.God.value); - role.setDescription(WebConstant.ROLE_NAME.God.phase); - }else - if (proRoleCell.equalsIgnoreCase(WebConstant.ROLE_NAME.ManageRepresent.phase)) { - role.setName(WebConstant.ROLE_NAME.ManageRepresent.value); - role.setDescription(WebConstant.ROLE_NAME.ManageRepresent.phase); - }else - if (proRoleCell.equalsIgnoreCase(WebConstant.ROLE_NAME.Stakeholder.phase)) { - role.setName(WebConstant.ROLE_NAME.Stakeholder.value); - role.setDescription(WebConstant.ROLE_NAME.Stakeholder.phase); - }else - if (proRoleCell.equalsIgnoreCase(WebConstant.ROLE_NAME.PM.phase)) { - role.setName(WebConstant.ROLE_NAME.PM.value); - role.setDescription(WebConstant.ROLE_NAME.PM.phase); - }else - if (proRoleCell.equalsIgnoreCase(WebConstant.ROLE_NAME.Member.phase)) { - role.setName(WebConstant.ROLE_NAME.Member.value); - role.setDescription(WebConstant.ROLE_NAME.Member.phase); - }else - if (proRoleCell.equalsIgnoreCase(WebConstant.ROLE_NAME.Attention.phase)) { - role.setName(WebConstant.ROLE_NAME.Attention.value); - role.setDescription(WebConstant.ROLE_NAME.Attention.phase); - }else{ - throw new BaseException(CodeEnum.WBS_NOT_FIRST_ROLE.addMsg(wbsSheet.getSheetName()+i)); - } - proRoleService.saveProRole(role); - proRoles.add(role); - firstRoleId = role.getId(); -// if(CollectionUtil.isNotEmpty(proRoles)) { -// for (ProRole proRole : proRoles) { -// if(ObjectUtil.isNull(proRole.getParentId())) { -// if (proRole.getDescription().equals(proRoleCell)) { -// firstRoleId = proRole.getId(); -// break; -// } -// } -// } -// } - } - if (ObjectUtil.isNull(firstRoleId)) { - throw new BaseException("找不到系统角色[" + i + "]"); - } - //二级角色 - if (StrUtil.isNotEmpty(secondRoleCell)) { - if (!proMemberRoleExist(secondRoleCell,proRoles)) { - ProRole proRole = new ProRole(); - proRole.setName(secondRoleCell); - proRole.setParentId(firstRoleId); - proRole.setProjectId(sysProject.getId()); - proRole.setId(snowflake.nextId()); - proRoleService.saveProRole(proRole); - proRoles.add(proRole); - secondRoleId = proRole.getId(); - }else { - throw new BaseException(CodeEnum.WBS_REPEAT_ROLE_NAME.addMsg(wbsSheet.getSheetName()+i)); - } - } - if (ObjectUtil.isNull(secondRoleId)) { - throw new BaseException("找不到二级角色[" + i + "]"); - } - - if (StrUtil.isNotEmpty(memberCell)) { - ProMemberRole memberRole = null; - for (ProMember member : proMembers) { - if (memberCell.equalsIgnoreCase(member.getNickname())) { - memberRole = new ProMemberRole(); - memberRole.setId(snowflake.nextId()); - memberRole.setMemberId(member.getId()); - memberRole.setRoleId(secondRoleId); - proMemberRoleService.saveMemberRole(memberRole); - } - } - if(ObjectUtil.isNull(memberRole)){ - throw new BaseException(CodeEnum.WSB_NOT_MEMBER.addMsg(wbsSheet.getSheetName()+i)); - } - } - } - //角色对谁不可见 - String[] excludeRoleCells; - for (int i = memberStart + 1; i <= memberEnd; i++) { - XSSFRow row = wbsSheet.getRow(i); - String secondRoleCell = ExcelUtil.getCellValue(row.getCell(2)); - String excludeRoleCell = StringUtil.replaceComma(ExcelUtil.getCellValue(row.getCell(4))); - //获取角色对谁不可见 - if (StrUtil.isNotEmpty(excludeRoleCell)) { - excludeRoleCells = excludeRoleCell.split(","); - - Long proRoleId = null; - if (StrUtil.isNotEmpty(secondRoleCell)) { - for (ProRole role : proRoles) { - if (secondRoleCell.equalsIgnoreCase(role.getName())) { - proRoleId = role.getId(); - break; - } - } - } - - if (ObjectUtil.isNotNull(excludeRoleCells)) { - for (int a = 0; a < excludeRoleCells.length; a++) { - ProRoleExeclude excludeRole = new ProRoleExeclude(); - excludeRole.setId(snowflake.nextId()); - excludeRole.setRoleId(proRoleId); - if (CollectionUtil.isNotEmpty(proRoles)) { - Long roleId = null; - for (ProRole memberRole : proRoles) { - if (excludeRoleCells[a].equals(memberRole.getName())) { - roleId = memberRole.getId(); - excludeRole.setOtherRoleId(roleId); - break; - } - } - if(ObjectUtil.isNull(roleId)){ - throw new BaseException(CodeEnum.WBS_NOT_FIND_ROLE.addMsg(wbsSheet.getSheetName()+i)); - } - } - excludeRoleService.saveExcludeRole(excludeRole); - } - } - } - } - - //TODO 添加mvp角色 - ProRole proMemberRole = new ProRole(); - proMemberRole.setName(WebConstant.ROLE_NAME.MVP.phase); - proMemberRole.setParentId(firstRoleId); - proMemberRole.setProjectId(sysProject.getId()); - proMemberRole.setId(snowflake.nextId()); - proRoleService.saveProRole(proMemberRole); - proRoles.add(proMemberRole); - } - - //判断集合是否为空，有没有相同内容 - private boolean proMemberRoleExist(String memberRoleName,List proRoles) { - if (CollectionUtil.isNotEmpty(proRoles)) { - for (ProRole proMemberRole : proRoles) { - if (proMemberRole.getName().equals(memberRoleName)) { - return true; - } - } - } - return false; - } - - //添加成员与奖惩干系人 - private void memberWhitStakeholder(XSSFSheet memberSheet, Long stakeholderId,SysProject sysProject,List proMembers) throws Exception { - List stakeholderList = new ArrayList<>(); - if (ObjectUtil.isNotNull(memberSheet)) { - Set userIdSet = new HashSet<>(); - - for (int i = 1; i <= memberSheet.getLastRowNum(); i++) { - String memberCell = ExcelUtil.getCellValue(memberSheet.getRow(i).getCell(1)); - String phoneCell = ExcelUtil.getCellValue(memberSheet.getRow(i).getCell(2)); - String stakeholderCell = ExcelUtil.getCellValue(memberSheet.getRow(i).getCell(3)); - String stakeholderPhoneCell = ExcelUtil.getCellValue(memberSheet.getRow(i).getCell(4)); - ProMember stakeholder = null; - ProMember member = null; - //手机号不能为空 - if((StrUtil.isNotEmpty(memberCell)&&StrUtil.isEmpty(phoneCell)) || - (StrUtil.isNotEmpty(stakeholderCell)&&StrUtil.isEmpty(stakeholderPhoneCell))){ - throw new BaseException(CodeEnum.WBS_NOT_PHONE.addMsg(memberSheet.getSheetName()+i)); - } - //TODO 判断手机号格式 - - //添加奖惩干系人 - if (StrUtil.isNotEmpty(stakeholderCell)) { - if(!stakeholderWithPhone(stakeholderList,stakeholderCell,stakeholderPhoneCell)) { - Long userId = userService.selectUserIdByPhone(stakeholderPhoneCell); - if(ObjectUtil.isNotNull(userId)){ - userIdSet.add(userId); - } - stakeholder = new ProMember(); - stakeholder.setId(snowflake.nextId()); - stakeholder.setProjectId(sysProject.getId()); - stakeholder.setUserId(userId); - stakeholder.setNickname(stakeholderCell); - stakeholder.setPhone(stakeholderPhoneCell); - proMemberService.saveMember(stakeholder); - stakeholderList.add(stakeholder); - - ProMemberRole proMemberRole = new ProMemberRole(); - proMemberRole.setId(snowflake.nextId()); - proMemberRole.setMemberId(stakeholder.getId()); - proMemberRole.setRoleId(stakeholderId); - proMemberRoleService.saveMemberRole(proMemberRole); - }else { - throw new BaseException(CodeEnum.WBS_STAKEHOLDER_PHONE.addMsg(memberSheet.getSheetName()+i)); - } - } - //成员 - if (StrUtil.isNotEmpty(memberCell)) { - if (!memberAndPhoneRepeat(proMembers, memberCell, phoneCell)) { - Long userId = userService.selectUserIdByPhone(phoneCell); - if(ObjectUtil.isNotNull(userId)){ - userIdSet.add(userId); - } - member = new ProMember(); - member.setId(snowflake.nextId()); - member.setProjectId(sysProject.getId()); - member.setUserId(userId); - member.setNickname(memberCell); - member.setPhone(phoneCell); - if (ObjectUtil.isNotNull(stakeholder)) { - member.setStakeholderId(stakeholder.getId()); - } - proMemberService.saveMember(member); - proMembers.add(member); -// //创建者依据project的creatorId判断，不需要添加成员 - }else { - throw new BaseException(CodeEnum.WBS_REPEAT_MEMBER_PHONE.addMsg(memberSheet.getSheetName()+i)); - } - } - } - //TODO 每个成员都关注此项目（暂时） - addUserAttention(userIdSet,sysProject); - } else { - throw new BaseException(CodeEnum.WBS_NOT_MEMBER_SHEET); - } - } - /** - * 项目成员表内的每个人都关注此项目（暂时，当前版本） - */ - private void addUserAttention(Set userIdList,SysProject sysProject){ - if(CollectionUtil.isNotEmpty(userIdList)){ - for(Long userId:userIdList){ - UserAttention userAttention = new UserAttention(); - userAttention.setId(snowflake.nextId()); - userAttention.setUserId(userId); - userAttention.setProjectId(sysProject.getId()); - userAttentionService.saveAttention(userAttention); - } - } - } - /** - * 判断奖惩干系人与手机号对应是否正确 - * 奖惩干系人可以重复，一个人只能对应一个手机号 - */ - private boolean stakeholderWithPhone(List stakeholderList,String stakeholderName,String phone){ - if(CollectionUtil.isNotEmpty(stakeholderList)){ - for(ProMember proMember:stakeholderList){ - if(stakeholderName.equalsIgnoreCase(proMember.getNickname())){ - if(!proMember.getPhone().equalsIgnoreCase(phone)){ - return true; - } - }else { - if(proMember.getPhone().equalsIgnoreCase(phone)){ - return true; - } - } - } - } - return false; - } - /** - *判断成员和手机号是否重复 - */ - private boolean memberAndPhoneRepeat(List proMembers,String memberName,String phone){ - if(CollectionUtil.isNotEmpty(proMembers)){ - for(ProMember proMember:proMembers){ - if(proMember.getNickname().equalsIgnoreCase(memberName)){ - return true; - } - if(proMember.getPhone().equalsIgnoreCase(phone)){ - return true; - } - } - } - return false; - } - - private void readTask(XSSFWorkbook xssfWorkbook, XSSFSheet wbsSheet, int taskStart, int taskEnd, - Long currentUserId,SysProject sysProject,List taskDetails, - List proRoles,List proMembers) throws Exception { - Long pmRoleId = null; - //获取项目经理的id（一级角色） - for (ProRole role : proRoles) { - if (role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.PM.value)) { - pmRoleId = role.getId(); - break; - } - } - //获取项目经理的id（二级角色） - if (ObjectUtil.isNotNull(pmRoleId)) { - for (ProRole secondRole : proRoles) { - if (ObjectUtil.isNotNull(secondRole.getParentId()) && - secondRole.getParentId().longValue() == pmRoleId.longValue()) { - pmRoleId = secondRole.getId(); - break; - } - } - } - //TODO 添加一个开始虚拟节点 - ProTaskDetail beginTask = new ProTaskDetail(); - beginTask.setId(snowflake.nextId()); - beginTask.setProjectId(sysProject.getId()); - beginTask.setName("开始"); - beginTask.setVirtual((byte) WebConstant.TASK_VIRTUAL.Virtual.value); - beginTask.setLevel((byte) WebConstant.TASK_LEVEL.Virtual.value); - beginTask.setExecutorRole(pmRoleId); - proTaskDetailService.saveTaskDetail(beginTask); - taskDetails.add(beginTask); - //一级任务id - Long firstTaskDetailId = null; - - for (int i = taskStart + 1; i <= taskEnd; i++) { - XSSFRow row = wbsSheet.getRow(i); - String task1 = ExcelUtil.getCellValue(row.getCell(1));//一级任务名称 - String task2 = ExcelUtil.getCellValue(row.getCell(2));//二级任务名称 - String description = ExcelUtil.getCellValue(row.getCell(3));//任务描述 - String beginTime = ExcelUtil.getCellValue(row.getCell(4));//开始时间 - String endTime = ExcelUtil.getCellValue(row.getCell(5));//结束时间 -// String duration = ExcelUtil.getCellValue(row.getCell(6));//任务时长 - String repeat = ExcelUtil.getCellValue(row.getCell(7));//重复 - String subTaskCell = ExcelUtil.getCellValue(row.getCell(8));//子任务 - String subProject = ExcelUtil.getCellValue(row.getCell(9));//子项目 - String deliver = ExcelUtil.getCellValue(row.getCell(10));//交付物 - String executorRole = ExcelUtil.getCellValue(row.getCell(11));//负责人 - String checkerRole = ExcelUtil.getCellValue(row.getCell(12));//检查人 - String money = ExcelUtil.getCellValue(row.getCell(13));//即使奖惩 - String delay = ExcelUtil.getCellValue(row.getCell(14));//任务切换模式 - String delayTime = ExcelUtil.getCellValue(row.getCell(15));//延迟时间 - String loopTo = ExcelUtil.getCellValue(row.getCell(16));//跳转任务 - String loopTimes = ExcelUtil.getCellValue(row.getCell(17));//跳转次数 - String input = ExcelUtil.getCellValue(row.getCell(18));//输入文档 - //二级任务名不能为空 -// if(StrUtil.isEmpty(task2)){ -// throw new BaseException(CodeEnum.WBS_NOT_TASK_NAME.addMsg(wbsSheet.getSheetName()+i)); -// } - //TODO 一级任务(时间暂时为空) - if (StrUtil.isNotEmpty(task1)) { - ProTaskDetail firstTaskDetail = new ProTaskDetail(); - firstTaskDetail.setId(snowflake.nextId()); - firstTaskDetail.setName(task1); - firstTaskDetail.setProjectId(sysProject.getId()); - firstTaskDetail.setDelay((byte) WebConstant.TASK_DELAY.SelfMotion.value); - firstTaskDetail.setVirtual((byte) WebConstant.TASK_VIRTUAL.Normal.value); - firstTaskDetail.setLevel((byte) WebConstant.TASK_LEVEL.FirstTask.value); - firstTaskDetail.setExecutorRole(pmRoleId); - proTaskDetailService.saveTaskDetail(firstTaskDetail); - taskDetails.add(firstTaskDetail); - - firstTaskDetailId = firstTaskDetail.getId(); -// if (CollectionUtil.isNotEmpty(taskDetails)) { -// for (ProTaskDetail proTask1 : taskDetails) { -// if (proTask1.getName().equals(task1)) { -// firstTaskDetailId = proTask1.getId(); -// break; -// } -// } -// } - } - if (ObjectUtil.isNull(firstTaskDetailId)) { - throw new BaseException("找不到任务[" + i + "]"); - } - - //二级任务 - if (StrUtil.isNotEmpty(task2)) { - ProTaskDetail taskDetail = new ProTaskDetail(); - taskDetail.setId(snowflake.nextId()); - taskDetail.setProjectId(sysProject.getId()); - taskDetail.setParentId(firstTaskDetailId); - taskDetail.setName(task2); - taskDetail.setDescription(description); - taskDetail.setVirtual((byte) WebConstant.TASK_VIRTUAL.Normal.value); - taskDetail.setLevel((byte) WebConstant.TASK_LEVEL.SecondTask.value); -// taskDetail.setGlobal((byte) 0); - taskDetail.setHasGroup((byte) 0); - taskDetail.setAllMember((byte) 1); - //子项目 - if (StrUtil.isNotEmpty(subProject)) { - SysProject project = projectService.selectByNameAndUserId(subProject, currentUserId); - if (ObjectUtil.isNotNull(project)) { - taskDetail.setSubProjectId(project.getId()); - taskDetail.setSubProject(subProject); - project.setParentTaskId(taskDetail.getId()); - projectService.updateProject(project); - } - } - //交付物 - if (StrUtil.isNotEmpty(deliver)) { - String str = ""; - if (deliver.length() > 4) { - str = deliver.substring(0, 3); - } - if (str.equals("关联表")) { - String subStr = deliver.substring(4); - XSSFSheet subSheet = xssfWorkbook.getSheet(subStr); - readSubSheet(subSheet, taskDetail.getId()); - } else { - ProTaskDeliver taskDeliver = new ProTaskDeliver(); - taskDeliver.setId(snowflake.nextId()); - taskDeliver.setTaskDetailId(taskDetail.getId()); - taskDeliver.setName(deliver); - taskDeliver.setIsInput(0); - taskDeliver.setIsFinal(1); - taskDeliverService.saveDeliver(taskDeliver); - } - } - //负责人 - if (CollectionUtil.isNotEmpty(proRoles)) { - Long executorRoleId = null; - for (ProRole proRole : proRoles) { - if (ObjectUtil.isNotNull(proRole.getParentId()) && proRole.getName().equals(executorRole)) { - executorRoleId = proRole.getId(); - taskDetail.setExecutorRole(executorRoleId); - break; - } - } - if(ObjectUtil.isNull(executorRoleId)){ - throw new BaseException(CodeEnum.WBS_NOT_FIND_EXECUTOR_ROLE.addMsg(wbsSheet.getSheetName()+i)); - } - } - //检查人 - if (CollectionUtil.isNotEmpty(proRoles)) { - Long checkerRoleId = null; - for (ProRole proRole : proRoles) { - if (ObjectUtil.isNotNull(proRole.getParentId()) && proRole.getName().equals(executorRole)) { - checkerRoleId = proRole.getId(); - taskDetail.setCheckerRole(checkerRoleId); - break; - } - } - if(ObjectUtil.isNull(checkerRoleId)){ - throw new BaseException(CodeEnum.WBS_NOT_FIND_CHECKER_ROLE.addMsg(wbsSheet.getSheetName()+i)); - } - } - //奖惩金额 - if (StrUtil.isNotEmpty(money)) { - taskDetail.setMoney(Long.parseLong(money) * 100); - } - //切换模式 - if (delay.equals(WebConstant.TASK_DELAY.SelfMotion.phase)) { - taskDetail.setDelay((byte) WebConstant.TASK_DELAY.SelfMotion.value); - } else if (delay.equals(WebConstant.TASK_DELAY.DelayManual.phase)) { - taskDetail.setDelay((byte) WebConstant.TASK_DELAY.DelayManual.value); - } else if (delay.equals(WebConstant.TASK_DELAY.Manual.phase)) { - taskDetail.setDelay((byte) WebConstant.TASK_DELAY.Manual.value); - }else { - throw new BaseException(CodeEnum.WBS_DELAY_ERROR.addMsg(wbsSheet.getSheetName()+i)); - } - //延迟时间 - if (StrUtil.isNotEmpty(delayTime)) { - taskDetail.setDelayTime(DateUtil.str2MillSeconds(delayTime)); - } - //TODO 跳转任务(应该在循环外处理) - - //跳转次数 - - //输入文档 - if (StrUtil.isNotEmpty(input)) { - ProTaskDeliver taskDeliver = new ProTaskDeliver(); - taskDeliver.setId(snowflake.nextId()); - taskDeliver.setTaskDetailId(taskDetail.getId()); - taskDeliver.setName(input); - taskDeliver.setIsInput(1); - taskDeliver.setIsFinal(0); - taskDeliverService.saveDeliver(taskDeliver); - } - //设备挂载暂不处理 - - //没有开始时间默认项目开始时间 - if (StrUtil.isNotEmpty(beginTime)) { - taskDetail.setBeginTime(Long.valueOf(beginTime)); - } else { - taskDetail.setBeginTime(sysProject.getBeginTime()); - } - //没有结束时间默认项目结束时间 - if (StrUtil.isNotEmpty(endTime)) { - taskDetail.setEndTime(Long.valueOf(endTime)); - } else { - taskDetail.setEndTime(sysProject.getEndTime()); - } - //重复 - if (StrUtil.isNotEmpty(repeat)) {//有重复就是全局任务 -// taskDetail.setGlobal((byte) 1); - taskDetail.setCycle(repeat); - } - //子任务 - if (StrUtil.isNotEmpty(subTaskCell)) {//有子日程表 - taskDetail.setHasGroup((byte) 1); - switch (subTaskCell){ - case "值日表": - getSubTask(xssfWorkbook, subTaskCell, taskDetail,taskDetails,proMembers); - break; - case "运动计划表": - getSubTask(xssfWorkbook, subTaskCell, taskDetail,taskDetails,proMembers); - break; - case "前端学习计划表": - getSubTask(xssfWorkbook, subTaskCell, taskDetail,taskDetails,proMembers); - break; - case "后台学习计划表": - getSubTask(xssfWorkbook, subTaskCell, taskDetail,taskDetails,proMembers); - break; - case "硬件学习计划表": - getSubTask(xssfWorkbook, subTaskCell, taskDetail,taskDetails,proMembers); - break; - case "方圆学习计划表": - getSubTask(xssfWorkbook, subTaskCell, taskDetail,taskDetails,proMembers); - break; - case "全体学习计划表": - getSubTask(xssfWorkbook, subTaskCell, taskDetail,taskDetails,proMembers); - break; - default: - throw new BaseException(CodeEnum.WBS_SUB_TASK_ANALYSIS.addMsg(wbsSheet.getSheetName()+i)); - } - } - //添加任务 - proTaskDetailService.saveTaskDetail(taskDetail); - taskDetails.add(taskDetail); - } - } - //添加一个结束虚拟节点 - ProTaskDetail endTask = new ProTaskDetail(); - endTask.setId(snowflake.nextId()); - endTask.setProjectId(sysProject.getId()); - endTask.setName("结束"); - endTask.setVirtual((byte) WebConstant.TASK_VIRTUAL.Virtual.value); - endTask.setLevel((byte) WebConstant.TASK_LEVEL.Virtual.value); - endTask.setExecutorRole(pmRoleId); - proTaskDetailService.saveTaskDetail(endTask); - taskDetails.add(endTask); - } - - public void saveProTaskSubTime(List taskDetails) throws Exception { - if (CollectionUtil.isNotEmpty(taskDetails)) { - for (ProTaskDetail taskDetail : taskDetails) { - //虚拟任务或一级任务不拆分 - if (taskDetail.getVirtual() == WebConstant.TASK_VIRTUAL.Virtual.value || taskDetail.getLevel() == 1) { - continue; - } - //cycle为空或者组任务，只加一条数据 - if (StrUtil.isEmpty(taskDetail.getCycle()) || taskDetail.getHasGroup() == 1) { - ProTaskSubTime proTaskSubTime = new ProTaskSubTime(); - proTaskSubTime.setId(snowflake.nextId()); - proTaskSubTime.setTaskDetailId(taskDetail.getId()); - proTaskSubTime.setBeginTime(taskDetail.getBeginTime()); - proTaskSubTime.setEndTime(taskDetail.getEndTime()); - taskSubTimeService.saveProTaskSubTask(proTaskSubTime); - } else { - Date startDate = new Date(taskDetail.getBeginTime()); - Date endDate = new Date(taskDetail.getEndTime()); - List taskDateList = - NatureToDate.generateDates(taskDetail.getCycle(), startDate, endDate); - if (CollectionUtil.isEmpty(taskDateList)) { - return; - } - for (CronConstant.TaskDate taskDate : taskDateList) { - ProTaskSubTime proTaskSubTime = new ProTaskSubTime(); - proTaskSubTime.setId(snowflake.nextId()); - proTaskSubTime.setTaskDetailId(taskDetail.getId()); - proTaskSubTime.setBeginTime(taskDate.getStartDate().getTime()); - proTaskSubTime.setEndTime(taskDate.getEndDate().getTime()); - taskSubTimeService.saveProTaskSubTask(proTaskSubTime); - } - } - } - } - } - - public void getSubTask(XSSFWorkbook xssfWorkbook, String sheetName, ProTaskDetail parentTaskDetail, - List taskDetails,List proMembers) { - XSSFSheet subTaskSheet = xssfWorkbook.getSheet(sheetName); - Long startTime = parentTaskDetail.getBeginTime(); - if (ObjectUtil.isNotNull(subTaskSheet)) { - String str = ExcelUtil.getCellValue(subTaskSheet.getRow(1).getCell(4)); - for (int a = 2; a < subTaskSheet.getLastRowNum(); a++) { - String nameCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(1));//任务名 - String beginCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(2));//开始时间 - String endCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(3));//结束时间 - String repeatCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(4));//重复时间、相对时间 - String memberCell = StringUtil.replaceComma(ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(6)));//成员 - String descriptionCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(8));//备注 - if (StrUtil.isNotEmpty(nameCell)) { - ProTaskDetail subTask = new ProTaskDetail(); - BeanUtil.copyProperties(parentTaskDetail, subTask); - subTask.setId(snowflake.nextId()); - subTask.setName(nameCell); - subTask.setDescription(descriptionCell); - subTask.setLevel((byte) 3); - subTask.setHasGroup((byte) 0); - subTask.setParentId(parentTaskDetail.getId()); - if (StrUtil.isNotEmpty(memberCell)) { - if (memberCell.equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase)) { - parentTaskDetail.setAllMember((byte) 1); - } else { - parentTaskDetail.setAllMember((byte) 0); - List memberList = StringUtil.extractMessage(memberCell); - if (CollectionUtil.isNotEmpty(memberList)) { - for (String memberName : memberList) { - if (CollectionUtil.isNotEmpty(proMembers)) { - Long proMemberId = null; - for (ProMember proMember : proMembers) { - if (memberName.equalsIgnoreCase(proMember.getNickname())) { - proMemberId = proMember.getId(); - ProTaskMember proTaskMember = new ProTaskMember(); - proTaskMember.setId(snowflake.nextId()); - proTaskMember.setTaskDetailId(subTask.getId()); - proTaskMember.setMemberId(proMemberId); - taskMemberService.saveTaskMember(proTaskMember); - break; - } - } - if(ObjectUtil.isNull(proMemberId)){ - throw new BaseException(CodeEnum.WSB_NOT_MEMBER.addMsg(subTaskSheet.getSheetName()+a)); - } - } - } - }else { - throw new BaseException(CodeEnum.WSB_NOT_MEMBER.addMsg(subTaskSheet.getSheetName()+a)); - } - } - } - - if (StrUtil.isNotEmpty(repeatCell)) { - if ("重复时间".equals(str)) { - subTask.setCycle(repeatCell); - } - if ("相对时间".equals(str)) { - subTask.setBeginTime(startTime); - Long relative = StringUtil.severalDay(repeatCell); - if (ObjectUtil.isNotNull(relative)) { - subTask.setEndTime(startTime + relative); - } - } - } else { - if (ObjectUtil.isNotNull(beginCell)) { - subTask.setBeginTime(Long.valueOf(beginCell)); - } - if (ObjectUtil.isNotNull(endCell)) { - subTask.setEndTime(Long.valueOf(endCell)); - } - parentTaskDetail.setBeginTime(subTask.getBeginTime()); - } - startTime = subTask.getEndTime(); - proTaskDetailService.saveTaskDetail(subTask); - taskDetails.add(subTask); - } - } - } else { - throw new BaseException(CodeEnum.WBS_NOT_SUB_TASK); - } - parentTaskDetail.setEndTime(startTime); - } - - /** - * //读取交付物表 - * - * @param subSheet - * @param taskId - */ - private void readSubSheet(XSSFSheet subSheet, Long taskId) { - for (int i = 2; i <= subSheet.getLastRowNum(); i++) { - String deliver = ExcelUtil.getCellValue(subSheet.getRow(i).getCell(1)); - if (StrUtil.isNotEmpty(deliver)) { - ProTaskDeliver taskDeliver = new ProTaskDeliver(); - taskDeliver.setId(snowflake.nextId()); - taskDeliver.setName(deliver); - taskDeliver.setTaskDetailId(taskId); - taskDeliver.setIsInput(0); - taskDeliver.setIsFinal(0); - if (i == subSheet.getLastRowNum()) { - taskDeliver.setIsFinal(1); - } - taskDeliverService.saveDeliver(taskDeliver); - } - } - } - - //插件 - private void readPlugin(XSSFWorkbook xssfWorkbook,List taskDetails,List proRoles) { - SysPluginExample pluginExample = new SysPluginExample(); - pluginExample.clear(); - List sysPluginList = sysPluginDao.selectByExample(pluginExample); - if(CollectionUtil.isNotEmpty(sysPluginList)) { - XSSFSheet sheet = xssfWorkbook.getSheet("插件"); - if (ObjectUtil.isNotNull(sheet)) { - Long taskId = null; - Long memberRoleId = null; - XSSFRow roleRow = sheet.getRow(2); - - for (int i = 3; i < sheet.getLastRowNum(); i++) { - XSSFRow pluginRow = sheet.getRow(i); - String task = ExcelUtil.getCellValue(pluginRow.getCell(1)); - //获取任务Id - if (StrUtil.isNotEmpty(task)) { - for (ProTaskDetail proTask : taskDetails) { - if (task.equals(proTask.getName())) { - taskId = proTask.getId(); - break; - } - } - } - - for (int a = 2; a < roleRow.getLastCellNum(); a++) { - //获取memberRoleId - String roleCell = ExcelUtil.getCellValue(roleRow.getCell(a)); - if (StrUtil.isNotEmpty(roleCell) && CollectionUtil.isNotEmpty(proRoles)) { - for (ProRole role : proRoles) { - if (roleCell.equals(role.getName())) { - memberRoleId = role.getId(); - break; - } - } - } - String plugin = ExcelUtil.getCellValue(pluginRow.getCell(a)); - if (StrUtil.isNotEmpty(plugin)) { - Long sysPluginId = null; - for(SysPlugin sysPlugin:sysPluginList){ - if(plugin.equalsIgnoreCase(sysPlugin.getName())){ - sysPluginId = sysPlugin.getId(); - } - } - if(ObjectUtil.isNull(sysPluginId)){ - throw new BaseException(CodeEnum.WBS_NOT_PLUGIN.addMsg(sheet.getSheetName()+i)); - } - ProTaskPlugin taskPlugin = new ProTaskPlugin(); - taskPlugin.setId(snowflake.nextId()); - taskPlugin.setTaskDetailId(taskId); - taskPlugin.setPluginId(sysPluginId); - taskPlugin.setMemberRoleId(memberRoleId); - taskPluginService.savePlugin(taskPlugin); - } - } - } - }else{ - throw new BaseException(CodeEnum.WBS_NOT_PLUGIN_SHEET); - } - } - } - - public ProjectVo.ProjectInfo selectByProjectId(Long currentUserId,SysProject sysProject) throws Exception { - //返回参数 - ProjectVo.ProjectInfo projectInfo = new ProjectVo.ProjectInfo(); - projectInfo.setId(sysProject.getId()); - projectInfo.setName(sysProject.getName()); - projectInfo.setAddress(sysProject.getAddress()); - projectInfo.setBeginTime(sysProject.getBeginTime()); - projectInfo.setEndTime(sysProject.getEndTime()); - projectInfo.setTotalDuration(sysProject.getEndTime() - sysProject.getBeginTime()); - if (ObjectUtil.isNotNull(projectInfo)) { - projectInfo.setCreator(true); - } -// //获取当前用户在本项目中的一级角色 -// List proRoles = proRoleService.getProRoleByProjectIdAndUserId(projectInfo.getId(), currentUserId); -// if (CollectionUtil.isNotEmpty(proRoles)) { -// projectInfo.setRoles(new ArrayList<>()); -// for (ProRole proRole : proRoles) { -// projectInfo.getRoles().add(proRole.getName()); -// } -// } - return projectInfo; - } -} +package com.ccsens.tall.service; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.ccsens.tall.bean.po.*; +import com.ccsens.tall.bean.vo.ProjectVo; +import com.ccsens.tall.persist.dao.SysPluginDao; +import com.ccsens.util.*; +import com.ccsens.util.cron.CronConstant; +import com.ccsens.util.cron.NatureToDate; +import com.ccsens.util.exception.BaseException; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.xssf.usermodel.XSSFCell; +import org.apache.poi.xssf.usermodel.XSSFRow; +import org.apache.poi.xssf.usermodel.XSSFSheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.io.FileInputStream; +import java.io.InputStream; +import java.util.*; + +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED) +public class ExcelService implements IExcelService { + @Autowired + private SysPluginDao sysPluginDao; + @Autowired + private IProjectService projectService; + @Autowired + private Snowflake snowflake; + @Autowired + private IProRoleService proRoleService; + @Autowired + private IProMemberRoleService proMemberRoleService; + @Autowired + private IExcludeRoleService excludeRoleService; + @Autowired + private IProMemberService proMemberService; + @Autowired + private IProTaskDetailService proTaskDetailService; + @Autowired + private ITaskSubTimeService taskSubTimeService; + @Autowired + private ITaskMemberService taskMemberService; + @Autowired + private ITaskDeliverService taskDeliverService; + @Autowired + private ITaskPluginService taskPluginService; + @Autowired + private IUserService userService; + @Autowired + private IUserAttentionService userAttentionService; + + + @Override + public ProjectVo.ProjectInfo readXls(String path, Long currentUserId) throws Exception { + InputStream is = new FileInputStream(path); + XSSFWorkbook xssfWorkbook = new XSSFWorkbook(is); + //读取WBS表 + SysProject sysProject = readWbs(xssfWorkbook, currentUserId); + ProjectVo.ProjectInfo projectInfo = selectByProjectId(currentUserId,sysProject); + return projectInfo; + } + + /** + * 读取Wbs + */ + public SysProject readWbs(XSSFWorkbook xssfWorkbook, Long currentUserId) throws Exception { + //项目 + SysProject sysProject = new SysProject(); + //角色 + List proRoles = new ArrayList<>(); + //成员 + List proMembers = new ArrayList<>(); + //任务 + List taskDetails = new ArrayList<>(); + + XSSFSheet memberSheet = xssfWorkbook.getSheet("项目成员表"); + XSSFSheet wbsSheet = xssfWorkbook.getSheetAt(0);//wbs + + int projectInfoStart = 0; + int projectInfoEnd = 0; + int memberStart = 0; + int memberEnd = 0; + int taskStart = 0; + int taskEnd = 0; + + taskEnd = wbsSheet.getLastRowNum(); + for (int i = 0; i <= wbsSheet.getLastRowNum(); i++) { + XSSFRow xssfRow = wbsSheet.getRow(i); + + if (xssfRow == null) { + continue; + } + XSSFCell xssfCell = xssfRow.getCell(0); + if (xssfCell == null) { + continue; + } + String s = ExcelUtil.getCellValue(xssfCell); + + if (s.indexOf("项目信息") == 0) { + projectInfoStart = i + 1; + } + if (s.indexOf("项目成员") == 0) { + projectInfoEnd = i - 1; + memberStart = i + 1; + } + if (s.indexOf("项目任务分解") == 0) { + memberEnd = i - 1; + taskStart = i + 1; + } + } + if(projectInfoStart==0){ + throw new BaseException(CodeEnum.WSB_NOT_PROJECT_HEADER); + } + if(projectInfoStart==0){ + throw new BaseException(CodeEnum.WSB_NOT_MEMBER_HEADER); + } + if(projectInfoStart==0){ + throw new BaseException(CodeEnum.WSB_NOT_TASK_HEADER); + } + readProject(wbsSheet, projectInfoStart, projectInfoEnd, currentUserId,sysProject); + readMember(wbsSheet, memberSheet,memberStart, memberEnd,sysProject, proRoles,proMembers); + readTask(xssfWorkbook, wbsSheet, taskStart, taskEnd, currentUserId,sysProject,taskDetails,proRoles,proMembers); + saveProTaskSubTime(taskDetails); + //读取插件表 + readPlugin(xssfWorkbook,taskDetails,proRoles); + return sysProject; + } + + private void readProject(XSSFSheet wbsSheet, int projectInfoStart, int projectInfoEnd, Long currentUserId,SysProject sysProject) { + XSSFRow row = wbsSheet.getRow(projectInfoStart + 1); + String projectName = ExcelUtil.getCellValue(row.getCell(0)); + if(StrUtil.isNotEmpty(projectName)){ + String begin = ExcelUtil.getCellValue(row.getCell(3)); + String end = ExcelUtil.getCellValue(row.getCell(4)); + if(StrUtil.isNotEmpty(begin)&&StrUtil.isNotEmpty(end)){ + Long beginTime = null; + Long endTime = null; + try { + beginTime = Long.parseLong(begin); + endTime = Long.parseLong(end); + }catch (Exception e){ + //日期格式错误 + throw new BaseException(CodeEnum.WBS_PROJECT_TIME_ERROR); + } + sysProject.setId(snowflake.nextId()); + sysProject.setName(projectName); + sysProject.setDescription(ExcelUtil.getCellValue(row.getCell(1))); + sysProject.setAddress(ExcelUtil.getCellValue(row.getCell(2))); + sysProject.setBeginTime(beginTime); + sysProject.setEndTime(endTime); + sysProject.setCreatorId(currentUserId); + //是否发布,默认是1发布的 + sysProject.setPublished((byte) 1); + //是否是模板，新加的不是模板 0 + sysProject.setTemplate((byte) 0); + projectService.saveProject(sysProject); + System.out.println(sysProject); + }else { + //没有开始结束时间 + throw new BaseException(CodeEnum.WBS_NOT_PROJECT_TIME); + } + }else { + //没有项目名 + throw new BaseException(CodeEnum.WBS_NOT_PROJECT_NAME); + } + } + + private void readMember(XSSFSheet wbsSheet, XSSFSheet memberSheet, int memberStart, int memberEnd, + SysProject sysProject, List proRoles, List proMembers) throws Exception { + + //添加奖惩干系人角色（一级角色） + ProRole stakeholderRole = new ProRole(); + stakeholderRole.setName(WebConstant.ROLE_NAME.MoneyStakeholder.value); + stakeholderRole.setDescription(WebConstant.ROLE_NAME.MoneyStakeholder.phase); + stakeholderRole.setProjectId(sysProject.getId()); + stakeholderRole.setId(snowflake.nextId()); + proRoleService.saveProRole(stakeholderRole); + proRoles.add(stakeholderRole); + //添加奖惩干系人角色（二级角色） + ProRole stakeholderProRole = new ProRole(); + stakeholderProRole.setName(WebConstant.ROLE_NAME.MoneyStakeholder.value); + stakeholderProRole.setDescription(WebConstant.ROLE_NAME.MoneyStakeholder.phase); + stakeholderProRole.setParentId(stakeholderRole.getId()); + stakeholderProRole.setProjectId(sysProject.getId()); + stakeholderProRole.setId(snowflake.nextId()); + proRoleService.saveProRole(stakeholderProRole); + proRoles.add(stakeholderProRole); + + //添加创建者一级角色 + ProRole creator = new ProRole(); + creator.setName(WebConstant.ROLE_NAME.Creator.value); + creator.setDescription(WebConstant.ROLE_NAME.Creator.phase); + creator.setProjectId(sysProject.getId()); + creator.setId(snowflake.nextId()); + proRoleService.saveProRole(creator); + proRoles.add(creator); + //添加创建者角色（二级角色） + ProRole creatorRole = new ProRole(); + creatorRole.setName(WebConstant.ROLE_NAME.Creator.value); + creatorRole.setDescription(WebConstant.ROLE_NAME.Creator.phase); + creatorRole.setParentId(creator.getId()); + creatorRole.setProjectId(sysProject.getId()); + creatorRole.setId(snowflake.nextId()); + proRoleService.saveProRole(creatorRole); + proRoles.add(creatorRole); + + //添加成员和奖惩干系人 + memberWhitStakeholder(memberSheet, stakeholderProRole.getId(),sysProject,proMembers); + + Long firstRoleId = null; + Long secondRoleId = null; + for (int i = memberStart + 1; i <= memberEnd; i++) { + XSSFRow row = wbsSheet.getRow(i); + String proRoleCell = ExcelUtil.getCellValue(row.getCell(1)); + String secondRoleCell = ExcelUtil.getCellValue(row.getCell(2)); + String memberCell = ExcelUtil.getCellValue(row.getCell(3)); + //添加一级角色 + if (StrUtil.isNotEmpty(proRoleCell)) { + ProRole role = new ProRole(); + role.setId(snowflake.nextId()); + role.setProjectId(sysProject.getId()); +// switch (proRoleCell){ +// case WebConstant.ROLE_NAME.God: +// break; +// default: +// } + if (proRoleCell.equalsIgnoreCase(WebConstant.ROLE_NAME.God.phase)) { + role.setName(WebConstant.ROLE_NAME.God.value); + role.setDescription(WebConstant.ROLE_NAME.God.phase); + }else + if (proRoleCell.equalsIgnoreCase(WebConstant.ROLE_NAME.ManageRepresent.phase)) { + role.setName(WebConstant.ROLE_NAME.ManageRepresent.value); + role.setDescription(WebConstant.ROLE_NAME.ManageRepresent.phase); + }else + if (proRoleCell.equalsIgnoreCase(WebConstant.ROLE_NAME.Stakeholder.phase)) { + role.setName(WebConstant.ROLE_NAME.Stakeholder.value); + role.setDescription(WebConstant.ROLE_NAME.Stakeholder.phase); + }else + if (proRoleCell.equalsIgnoreCase(WebConstant.ROLE_NAME.PM.phase)) { + role.setName(WebConstant.ROLE_NAME.PM.value); + role.setDescription(WebConstant.ROLE_NAME.PM.phase); + }else + if (proRoleCell.equalsIgnoreCase(WebConstant.ROLE_NAME.Member.phase)) { + role.setName(WebConstant.ROLE_NAME.Member.value); + role.setDescription(WebConstant.ROLE_NAME.Member.phase); + }else + if (proRoleCell.equalsIgnoreCase(WebConstant.ROLE_NAME.Attention.phase)) { + role.setName(WebConstant.ROLE_NAME.Attention.value); + role.setDescription(WebConstant.ROLE_NAME.Attention.phase); + }else{ + throw new BaseException(CodeEnum.WBS_NOT_FIRST_ROLE.addMsg(wbsSheet.getSheetName()+i)); + } + proRoleService.saveProRole(role); + proRoles.add(role); + firstRoleId = role.getId(); +// if(CollectionUtil.isNotEmpty(proRoles)) { +// for (ProRole proRole : proRoles) { +// if(ObjectUtil.isNull(proRole.getParentId())) { +// if (proRole.getDescription().equals(proRoleCell)) { +// firstRoleId = proRole.getId(); +// break; +// } +// } +// } +// } + } + if (ObjectUtil.isNull(firstRoleId)) { + throw new BaseException("找不到系统角色[" + i + "]"); + } + //二级角色 + if (StrUtil.isNotEmpty(secondRoleCell)) { + if (!proMemberRoleExist(secondRoleCell,proRoles)) { + ProRole proRole = new ProRole(); + proRole.setName(secondRoleCell); + proRole.setParentId(firstRoleId); + proRole.setProjectId(sysProject.getId()); + proRole.setId(snowflake.nextId()); + proRoleService.saveProRole(proRole); + proRoles.add(proRole); + secondRoleId = proRole.getId(); + }else { + throw new BaseException(CodeEnum.WBS_REPEAT_ROLE_NAME.addMsg(wbsSheet.getSheetName()+i)); + } + } + if (ObjectUtil.isNull(secondRoleId)) { + throw new BaseException("找不到二级角色[" + i + "]"); + } + + if (StrUtil.isNotEmpty(memberCell)) { + ProMemberRole memberRole = null; + for (ProMember member : proMembers) { + if (memberCell.equalsIgnoreCase(member.getNickname())) { + memberRole = new ProMemberRole(); + memberRole.setId(snowflake.nextId()); + memberRole.setMemberId(member.getId()); + memberRole.setRoleId(secondRoleId); + proMemberRoleService.saveMemberRole(memberRole); + } + } + if(ObjectUtil.isNull(memberRole)){ + throw new BaseException(CodeEnum.WSB_NOT_MEMBER.addMsg(wbsSheet.getSheetName()+i)); + } + } + } + //角色对谁不可见 + String[] excludeRoleCells; + for (int i = memberStart + 1; i <= memberEnd; i++) { + XSSFRow row = wbsSheet.getRow(i); + String secondRoleCell = ExcelUtil.getCellValue(row.getCell(2)); + String excludeRoleCell = StringUtil.replaceComma(ExcelUtil.getCellValue(row.getCell(4))); + //获取角色对谁不可见 + if (StrUtil.isNotEmpty(excludeRoleCell)) { + excludeRoleCells = excludeRoleCell.split(","); + + Long proRoleId = null; + if (StrUtil.isNotEmpty(secondRoleCell)) { + for (ProRole role : proRoles) { + if (secondRoleCell.equalsIgnoreCase(role.getName())) { + proRoleId = role.getId(); + break; + } + } + } + + if (ObjectUtil.isNotNull(excludeRoleCells)) { + for (int a = 0; a < excludeRoleCells.length; a++) { + ProRoleExeclude excludeRole = new ProRoleExeclude(); + excludeRole.setId(snowflake.nextId()); + excludeRole.setRoleId(proRoleId); + if (CollectionUtil.isNotEmpty(proRoles)) { + Long roleId = null; + for (ProRole memberRole : proRoles) { + if (excludeRoleCells[a].equals(memberRole.getName())) { + roleId = memberRole.getId(); + excludeRole.setOtherRoleId(roleId); + break; + } + } + if(ObjectUtil.isNull(roleId)){ + throw new BaseException(CodeEnum.WBS_NOT_FIND_ROLE.addMsg(wbsSheet.getSheetName()+i)); + } + } + excludeRoleService.saveExcludeRole(excludeRole); + } + } + } + } + + //TODO 添加mvp角色 + ProRole proMemberRole = new ProRole(); + proMemberRole.setName(WebConstant.ROLE_NAME.MVP.phase); + proMemberRole.setParentId(firstRoleId); + proMemberRole.setProjectId(sysProject.getId()); + proMemberRole.setId(snowflake.nextId()); + proRoleService.saveProRole(proMemberRole); + proRoles.add(proMemberRole); + } + + //判断集合是否为空，有没有相同内容 + private boolean proMemberRoleExist(String memberRoleName,List proRoles) { + if (CollectionUtil.isNotEmpty(proRoles)) { + for (ProRole proMemberRole : proRoles) { + if (proMemberRole.getName().equals(memberRoleName)) { + return true; + } + } + } + return false; + } + + //添加成员与奖惩干系人 + private void memberWhitStakeholder(XSSFSheet memberSheet, Long stakeholderId, SysProject sysProject, List proMembers) throws Exception { + List stakeholderList = new ArrayList<>(); + if (ObjectUtil.isNotNull(memberSheet)) { + Set userIdSet = new HashSet<>(); + + for (int i = 1; i <= memberSheet.getLastRowNum(); i++) { + String memberCell = ExcelUtil.getCellValue(memberSheet.getRow(i).getCell(1)); + String phoneCell = ExcelUtil.getCellValue(memberSheet.getRow(i).getCell(2)); + String stakeholderCell = ExcelUtil.getCellValue(memberSheet.getRow(i).getCell(3)); + String stakeholderPhoneCell = ExcelUtil.getCellValue(memberSheet.getRow(i).getCell(4)); + ProMember stakeholder = null; + ProMember member = null; + //手机号不能为空 + if((StrUtil.isNotEmpty(memberCell)&&StrUtil.isEmpty(phoneCell)) || + (StrUtil.isNotEmpty(stakeholderCell)&&StrUtil.isEmpty(stakeholderPhoneCell))){ + throw new BaseException(CodeEnum.WBS_NOT_PHONE.addMsg(memberSheet.getSheetName()+i)); + } + //TODO 判断手机号格式 + + //添加奖惩干系人 + if (StrUtil.isNotEmpty(stakeholderCell)) { + if(!stakeholderWithPhone(stakeholderList,stakeholderCell,stakeholderPhoneCell)) { + Long userId = userService.selectUserIdByPhone(stakeholderPhoneCell); + if(ObjectUtil.isNotNull(userId)){ + userIdSet.add(userId); + } + stakeholder = new ProMember(); + stakeholder.setId(snowflake.nextId()); + stakeholder.setProjectId(sysProject.getId()); + stakeholder.setUserId(userId); + stakeholder.setNickname(stakeholderCell); + stakeholder.setPhone(stakeholderPhoneCell); + proMemberService.saveMember(stakeholder); + stakeholderList.add(stakeholder); + + ProMemberRole proMemberRole = new ProMemberRole(); + proMemberRole.setId(snowflake.nextId()); + proMemberRole.setMemberId(stakeholder.getId()); + proMemberRole.setRoleId(stakeholderId); + proMemberRoleService.saveMemberRole(proMemberRole); + }else { + throw new BaseException(CodeEnum.WBS_STAKEHOLDER_PHONE.addMsg(memberSheet.getSheetName()+i)); + } + } + //成员 + if (StrUtil.isNotEmpty(memberCell)) { + if (!memberAndPhoneRepeat(proMembers, memberCell, phoneCell)) { + Long userId = userService.selectUserIdByPhone(phoneCell); + if(ObjectUtil.isNotNull(userId)){ + userIdSet.add(userId); + } + member = new ProMember(); + member.setId(snowflake.nextId()); + member.setProjectId(sysProject.getId()); + member.setUserId(userId); + member.setNickname(memberCell); + member.setPhone(phoneCell); + if (ObjectUtil.isNotNull(stakeholder)) { + member.setStakeholderId(stakeholder.getId()); + } + proMemberService.saveMember(member); + proMembers.add(member); +// //创建者依据project的creatorId判断，不需要添加成员 + }else { + throw new BaseException(CodeEnum.WBS_REPEAT_MEMBER_PHONE.addMsg(memberSheet.getSheetName()+i)); + } + } + } + //TODO 每个成员都关注此项目（暂时） + addUserAttention(userIdSet,sysProject); + } else { + throw new BaseException(CodeEnum.WBS_NOT_MEMBER_SHEET); + } + } + /** + * 项目成员表内的每个人都关注此项目（暂时，当前版本） + */ + private void addUserAttention(Set userIdList,SysProject sysProject){ + if(CollectionUtil.isNotEmpty(userIdList)){ + for(Long userId:userIdList){ + UserAttention userAttention = new UserAttention(); + userAttention.setId(snowflake.nextId()); + userAttention.setUserId(userId); + userAttention.setProjectId(sysProject.getId()); + userAttentionService.saveAttention(userAttention); + } + } + } + /** + * 判断奖惩干系人与手机号对应是否正确 + * 奖惩干系人可以重复，一个人只能对应一个手机号 + */ + private boolean stakeholderWithPhone(List stakeholderList, String stakeholderName, String phone){ + if(CollectionUtil.isNotEmpty(stakeholderList)){ + for(ProMember proMember:stakeholderList){ + if(stakeholderName.equalsIgnoreCase(proMember.getNickname())){ + if(!proMember.getPhone().equalsIgnoreCase(phone)){ + return true; + } + }else { + if(proMember.getPhone().equalsIgnoreCase(phone)){ + return true; + } + } + } + } + return false; + } + /** + *判断成员和手机号是否重复 + */ + private boolean memberAndPhoneRepeat(List proMembers, String memberName, String phone){ + if(CollectionUtil.isNotEmpty(proMembers)){ + for(ProMember proMember:proMembers){ + if(proMember.getNickname().equalsIgnoreCase(memberName)){ + return true; + } + if(proMember.getPhone().equalsIgnoreCase(phone)){ + return true; + } + } + } + return false; + } + + private void readTask(XSSFWorkbook xssfWorkbook, XSSFSheet wbsSheet, int taskStart, int taskEnd, + Long currentUserId, SysProject sysProject, List taskDetails, + List proRoles, List proMembers) throws Exception { + Long pmRoleId = null; + //获取项目经理的id（一级角色） + for (ProRole role : proRoles) { + if (role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.PM.value)) { + pmRoleId = role.getId(); + break; + } + } + //获取项目经理的id（二级角色） + if (ObjectUtil.isNotNull(pmRoleId)) { + for (ProRole secondRole : proRoles) { + if (ObjectUtil.isNotNull(secondRole.getParentId()) && + secondRole.getParentId().longValue() == pmRoleId.longValue()) { + pmRoleId = secondRole.getId(); + break; + } + } + } + //TODO 添加一个开始虚拟节点 + ProTaskDetail beginTask = new ProTaskDetail(); + beginTask.setId(snowflake.nextId()); + beginTask.setProjectId(sysProject.getId()); + beginTask.setName("开始"); + beginTask.setVirtual((byte) WebConstant.TASK_VIRTUAL.Virtual.value); + beginTask.setLevel((byte) WebConstant.TASK_LEVEL.Virtual.value); + beginTask.setExecutorRole(pmRoleId); + proTaskDetailService.saveTaskDetail(beginTask); + taskDetails.add(beginTask); + //一级任务id + Long firstTaskDetailId = null; + + for (int i = taskStart + 1; i <= taskEnd; i++) { + XSSFRow row = wbsSheet.getRow(i); + String task1 = ExcelUtil.getCellValue(row.getCell(1));//一级任务名称 + String task2 = ExcelUtil.getCellValue(row.getCell(2));//二级任务名称 + String description = ExcelUtil.getCellValue(row.getCell(3));//任务描述 + String beginTime = ExcelUtil.getCellValue(row.getCell(4));//开始时间 + String endTime = ExcelUtil.getCellValue(row.getCell(5));//结束时间 +// String duration = ExcelUtil.getCellValue(row.getCell(6));//任务时长 + String repeat = ExcelUtil.getCellValue(row.getCell(7));//重复 + String subTaskCell = ExcelUtil.getCellValue(row.getCell(8));//子任务 + String subProject = ExcelUtil.getCellValue(row.getCell(9));//子项目 + String deliver = ExcelUtil.getCellValue(row.getCell(10));//交付物 + String executorRole = ExcelUtil.getCellValue(row.getCell(11));//负责人 + String checkerRole = ExcelUtil.getCellValue(row.getCell(12));//检查人 + String money = ExcelUtil.getCellValue(row.getCell(13));//即使奖惩 + String delay = ExcelUtil.getCellValue(row.getCell(14));//任务切换模式 + String delayTime = ExcelUtil.getCellValue(row.getCell(15));//延迟时间 + String loopTo = ExcelUtil.getCellValue(row.getCell(16));//跳转任务 + String loopTimes = ExcelUtil.getCellValue(row.getCell(17));//跳转次数 + String input = ExcelUtil.getCellValue(row.getCell(18));//输入文档 + //二级任务名不能为空 +// if(StrUtil.isEmpty(task2)){ +// throw new BaseException(CodeEnum.WBS_NOT_TASK_NAME.addMsg(wbsSheet.getSheetName()+i)); +// } + //TODO 一级任务(时间暂时为空) + if (StrUtil.isNotEmpty(task1)) { + ProTaskDetail firstTaskDetail = new ProTaskDetail(); + firstTaskDetail.setId(snowflake.nextId()); + firstTaskDetail.setName(task1); + firstTaskDetail.setProjectId(sysProject.getId()); + firstTaskDetail.setDelay((byte) WebConstant.TASK_DELAY.SelfMotion.value); + firstTaskDetail.setVirtual((byte) WebConstant.TASK_VIRTUAL.Normal.value); + firstTaskDetail.setLevel((byte) WebConstant.TASK_LEVEL.FirstTask.value); + firstTaskDetail.setExecutorRole(pmRoleId); + proTaskDetailService.saveTaskDetail(firstTaskDetail); + taskDetails.add(firstTaskDetail); + + firstTaskDetailId = firstTaskDetail.getId(); +// if (CollectionUtil.isNotEmpty(taskDetails)) { +// for (ProTaskDetail proTask1 : taskDetails) { +// if (proTask1.getName().equals(task1)) { +// firstTaskDetailId = proTask1.getId(); +// break; +// } +// } +// } + } + if (ObjectUtil.isNull(firstTaskDetailId)) { + throw new BaseException("找不到任务[" + i + "]"); + } + + //二级任务 + if (StrUtil.isNotEmpty(task2)) { + ProTaskDetail taskDetail = new ProTaskDetail(); + taskDetail.setId(snowflake.nextId()); + taskDetail.setProjectId(sysProject.getId()); + taskDetail.setParentId(firstTaskDetailId); + taskDetail.setName(task2); + taskDetail.setDescription(description); + taskDetail.setVirtual((byte) WebConstant.TASK_VIRTUAL.Normal.value); + taskDetail.setLevel((byte) WebConstant.TASK_LEVEL.SecondTask.value); +// taskDetail.setGlobal((byte) 0); + taskDetail.setHasGroup((byte) 0); + taskDetail.setAllMember((byte) 1); + //子项目 + if (StrUtil.isNotEmpty(subProject)) { + SysProject project = projectService.selectByNameAndUserId(subProject, currentUserId); + if (ObjectUtil.isNotNull(project)) { + taskDetail.setSubProjectId(project.getId()); + taskDetail.setSubProject(subProject); + project.setParentTaskId(taskDetail.getId()); + projectService.updateProject(project); + } + } + //交付物 + if (StrUtil.isNotEmpty(deliver)) { + String str = ""; + if (deliver.length() > 4) { + str = deliver.substring(0, 3); + } + if (str.equals("关联表")) { + String subStr = deliver.substring(4); + XSSFSheet subSheet = xssfWorkbook.getSheet(subStr); + readSubSheet(subSheet, taskDetail.getId()); + } else { + ProTaskDeliver taskDeliver = new ProTaskDeliver(); + taskDeliver.setId(snowflake.nextId()); + taskDeliver.setTaskDetailId(taskDetail.getId()); + taskDeliver.setName(deliver); + taskDeliver.setIsInput(0); + taskDeliver.setIsFinal(1); + taskDeliverService.saveDeliver(taskDeliver); + } + } + //负责人 + if (CollectionUtil.isNotEmpty(proRoles)) { + Long executorRoleId = null; + for (ProRole proRole : proRoles) { + if (ObjectUtil.isNotNull(proRole.getParentId()) && proRole.getName().equals(executorRole)) { + executorRoleId = proRole.getId(); + taskDetail.setExecutorRole(executorRoleId); + break; + } + } + if(ObjectUtil.isNull(executorRoleId)){ + throw new BaseException(CodeEnum.WBS_NOT_FIND_EXECUTOR_ROLE.addMsg(wbsSheet.getSheetName()+i)); + } + } + //检查人 + if (CollectionUtil.isNotEmpty(proRoles)) { + Long checkerRoleId = null; + for (ProRole proRole : proRoles) { + if (ObjectUtil.isNotNull(proRole.getParentId()) && proRole.getName().equals(executorRole)) { + checkerRoleId = proRole.getId(); + taskDetail.setCheckerRole(checkerRoleId); + break; + } + } + if(ObjectUtil.isNull(checkerRoleId)){ + throw new BaseException(CodeEnum.WBS_NOT_FIND_CHECKER_ROLE.addMsg(wbsSheet.getSheetName()+i)); + } + } + //奖惩金额 + if (StrUtil.isNotEmpty(money)) { + taskDetail.setMoney(Long.parseLong(money) * 100); + } + //切换模式 + if (delay.equals(WebConstant.TASK_DELAY.SelfMotion.phase)) { + taskDetail.setDelay((byte) WebConstant.TASK_DELAY.SelfMotion.value); + } else if (delay.equals(WebConstant.TASK_DELAY.DelayManual.phase)) { + taskDetail.setDelay((byte) WebConstant.TASK_DELAY.DelayManual.value); + } else if (delay.equals(WebConstant.TASK_DELAY.Manual.phase)) { + taskDetail.setDelay((byte) WebConstant.TASK_DELAY.Manual.value); + }else { + throw new BaseException(CodeEnum.WBS_DELAY_ERROR.addMsg(wbsSheet.getSheetName()+i)); + } + //延迟时间 + if (StrUtil.isNotEmpty(delayTime)) { + taskDetail.setDelayTime(DateUtil.str2MillSeconds(delayTime)); + } + //TODO 跳转任务(应该在循环外处理) + + //跳转次数 + + //输入文档 + if (StrUtil.isNotEmpty(input)) { + ProTaskDeliver taskDeliver = new ProTaskDeliver(); + taskDeliver.setId(snowflake.nextId()); + taskDeliver.setTaskDetailId(taskDetail.getId()); + taskDeliver.setName(input); + taskDeliver.setIsInput(1); + taskDeliver.setIsFinal(0); + taskDeliverService.saveDeliver(taskDeliver); + } + //设备挂载暂不处理 + + //没有开始时间默认项目开始时间 + if (StrUtil.isNotEmpty(beginTime)) { + taskDetail.setBeginTime(Long.valueOf(beginTime)); + } else { + taskDetail.setBeginTime(sysProject.getBeginTime()); + } + //没有结束时间默认项目结束时间 + if (StrUtil.isNotEmpty(endTime)) { + taskDetail.setEndTime(Long.valueOf(endTime)); + } else { + taskDetail.setEndTime(sysProject.getEndTime()); + } + //重复 + if (StrUtil.isNotEmpty(repeat)) {//有重复就是全局任务 +// taskDetail.setGlobal((byte) 1); + taskDetail.setCycle(repeat); + } + //子任务 + if (StrUtil.isNotEmpty(subTaskCell)) {//有子日程表 + taskDetail.setHasGroup((byte) 1); + switch (subTaskCell){ + case "值日表": + getSubTask(xssfWorkbook, subTaskCell, taskDetail,taskDetails,proMembers); + break; + case "运动计划表": + getSubTask(xssfWorkbook, subTaskCell, taskDetail,taskDetails,proMembers); + break; + case "前端学习计划表": + getSubTask(xssfWorkbook, subTaskCell, taskDetail,taskDetails,proMembers); + break; + case "后台学习计划表": + getSubTask(xssfWorkbook, subTaskCell, taskDetail,taskDetails,proMembers); + break; + case "硬件学习计划表": + getSubTask(xssfWorkbook, subTaskCell, taskDetail,taskDetails,proMembers); + break; + case "方圆学习计划表": + getSubTask(xssfWorkbook, subTaskCell, taskDetail,taskDetails,proMembers); + break; + case "全体学习计划表": + getSubTask(xssfWorkbook, subTaskCell, taskDetail,taskDetails,proMembers); + break; + default: + throw new BaseException(CodeEnum.WBS_SUB_TASK_ANALYSIS.addMsg(wbsSheet.getSheetName()+i)); + } + } + //添加任务 + proTaskDetailService.saveTaskDetail(taskDetail); + taskDetails.add(taskDetail); + } + } + //添加一个结束虚拟节点 + ProTaskDetail endTask = new ProTaskDetail(); + endTask.setId(snowflake.nextId()); + endTask.setProjectId(sysProject.getId()); + endTask.setName("结束"); + endTask.setVirtual((byte) WebConstant.TASK_VIRTUAL.Virtual.value); + endTask.setLevel((byte) WebConstant.TASK_LEVEL.Virtual.value); + endTask.setExecutorRole(pmRoleId); + proTaskDetailService.saveTaskDetail(endTask); + taskDetails.add(endTask); + } + + public void saveProTaskSubTime(List taskDetails) throws Exception { + if (CollectionUtil.isNotEmpty(taskDetails)) { + for (ProTaskDetail taskDetail : taskDetails) { + //虚拟任务或一级任务不拆分 + if (taskDetail.getVirtual() == WebConstant.TASK_VIRTUAL.Virtual.value || taskDetail.getLevel() == 1) { + continue; + } + //cycle为空或者组任务，只加一条数据 + if (StrUtil.isEmpty(taskDetail.getCycle()) || taskDetail.getHasGroup() == 1) { + ProTaskSubTime proTaskSubTime = new ProTaskSubTime(); + proTaskSubTime.setId(snowflake.nextId()); + proTaskSubTime.setTaskDetailId(taskDetail.getId()); + proTaskSubTime.setBeginTime(taskDetail.getBeginTime()); + proTaskSubTime.setEndTime(taskDetail.getEndTime()); + taskSubTimeService.saveProTaskSubTask(proTaskSubTime); + } else { + Date startDate = new Date(taskDetail.getBeginTime()); + Date endDate = new Date(taskDetail.getEndTime()); + List taskDateList = + NatureToDate.generateDates(taskDetail.getCycle(), startDate, endDate); + if (CollectionUtil.isEmpty(taskDateList)) { + return; + } + for (CronConstant.TaskDate taskDate : taskDateList) { + ProTaskSubTime proTaskSubTime = new ProTaskSubTime(); + proTaskSubTime.setId(snowflake.nextId()); + proTaskSubTime.setTaskDetailId(taskDetail.getId()); + proTaskSubTime.setBeginTime(taskDate.getStartDate().getTime()); + proTaskSubTime.setEndTime(taskDate.getEndDate().getTime()); + taskSubTimeService.saveProTaskSubTask(proTaskSubTime); + } + } + } + } + } + + public void getSubTask(XSSFWorkbook xssfWorkbook, String sheetName, ProTaskDetail parentTaskDetail, + List taskDetails, List proMembers) { + XSSFSheet subTaskSheet = xssfWorkbook.getSheet(sheetName); + Long startTime = parentTaskDetail.getBeginTime(); + if (ObjectUtil.isNotNull(subTaskSheet)) { + String str = ExcelUtil.getCellValue(subTaskSheet.getRow(1).getCell(4)); + for (int a = 2; a < subTaskSheet.getLastRowNum(); a++) { + String nameCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(1));//任务名 + String beginCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(2));//开始时间 + String endCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(3));//结束时间 + String repeatCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(4));//重复时间、相对时间 + String memberCell = StringUtil.replaceComma(ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(6)));//成员 + String descriptionCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(8));//备注 + if (StrUtil.isNotEmpty(nameCell)) { + ProTaskDetail subTask = new ProTaskDetail(); + BeanUtil.copyProperties(parentTaskDetail, subTask); + subTask.setId(snowflake.nextId()); + subTask.setName(nameCell); + subTask.setDescription(descriptionCell); + subTask.setLevel((byte) 3); + subTask.setHasGroup((byte) 0); + subTask.setParentId(parentTaskDetail.getId()); + if (StrUtil.isNotEmpty(memberCell)) { + if (memberCell.equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase)) { + parentTaskDetail.setAllMember((byte) 1); + subTask.setAllMember((byte) 1); + } else { + parentTaskDetail.setAllMember((byte) 0); + subTask.setAllMember((byte) 0); + List memberList = StringUtil.extractMessage(memberCell); + if (CollectionUtil.isNotEmpty(memberList)) { + for (String memberName : memberList) { + if (CollectionUtil.isNotEmpty(proMembers)) { + Long proMemberId = null; + for (ProMember proMember : proMembers) { + if (memberName.equalsIgnoreCase(proMember.getNickname())) { + proMemberId = proMember.getId(); + ProTaskMember proTaskMember = new ProTaskMember(); + proTaskMember.setId(snowflake.nextId()); + proTaskMember.setTaskDetailId(subTask.getId()); + proTaskMember.setMemberId(proMemberId); + taskMemberService.saveTaskMember(proTaskMember); + break; + } + } + if(ObjectUtil.isNull(proMemberId)){ + throw new BaseException(CodeEnum.WSB_NOT_MEMBER.addMsg(subTaskSheet.getSheetName()+a)); + } + } + } + }else { + throw new BaseException(CodeEnum.WSB_NOT_MEMBER.addMsg(subTaskSheet.getSheetName()+a)); + } + } + } + + if (StrUtil.isNotEmpty(repeatCell)) { + if ("重复时间".equals(str)) { + subTask.setCycle(repeatCell); + } + if ("相对时间".equals(str)) { + subTask.setBeginTime(startTime); + Long relative = StringUtil.severalDay(repeatCell); + if (ObjectUtil.isNotNull(relative)) { + subTask.setEndTime(startTime + relative); + } + } + } else { + if (ObjectUtil.isNotNull(beginCell)) { + subTask.setBeginTime(Long.valueOf(beginCell)); + } + if (ObjectUtil.isNotNull(endCell)) { + subTask.setEndTime(Long.valueOf(endCell)); + } + parentTaskDetail.setBeginTime(subTask.getBeginTime()); + } + startTime = subTask.getEndTime(); + proTaskDetailService.saveTaskDetail(subTask); + taskDetails.add(subTask); + } + } + } else { + throw new BaseException(CodeEnum.WBS_NOT_SUB_TASK); + } + parentTaskDetail.setEndTime(startTime); + } + + /** + * //读取交付物表 + * + * @param subSheet + * @param taskId + */ + private void readSubSheet(XSSFSheet subSheet, Long taskId) { + for (int i = 2; i <= subSheet.getLastRowNum(); i++) { + String deliver = ExcelUtil.getCellValue(subSheet.getRow(i).getCell(1)); + if (StrUtil.isNotEmpty(deliver)) { + ProTaskDeliver taskDeliver = new ProTaskDeliver(); + taskDeliver.setId(snowflake.nextId()); + taskDeliver.setName(deliver); + taskDeliver.setTaskDetailId(taskId); + taskDeliver.setIsInput(0); + taskDeliver.setIsFinal(0); + if (i == subSheet.getLastRowNum()) { + taskDeliver.setIsFinal(1); + } + taskDeliverService.saveDeliver(taskDeliver); + } + } + } + + //插件 + private void readPlugin(XSSFWorkbook xssfWorkbook, List taskDetails, List proRoles) { + SysPluginExample pluginExample = new SysPluginExample(); + pluginExample.clear(); + List sysPluginList = sysPluginDao.selectByExample(pluginExample); + if(CollectionUtil.isNotEmpty(sysPluginList)) { + XSSFSheet sheet = xssfWorkbook.getSheet("插件"); + if (ObjectUtil.isNotNull(sheet)) { + Long taskId = null; + Long memberRoleId = null; + XSSFRow roleRow = sheet.getRow(2); + + for (int i = 3; i < sheet.getLastRowNum(); i++) { + XSSFRow pluginRow = sheet.getRow(i); + String task = ExcelUtil.getCellValue(pluginRow.getCell(1)); + //获取任务Id + if (StrUtil.isNotEmpty(task)) { + for (ProTaskDetail proTask : taskDetails) { + if (task.equals(proTask.getName())) { + taskId = proTask.getId(); + break; + } + } + } + + for (int a = 2; a < roleRow.getLastCellNum(); a++) { + //获取memberRoleId + String roleCell = ExcelUtil.getCellValue(roleRow.getCell(a)); + if (StrUtil.isNotEmpty(roleCell) && CollectionUtil.isNotEmpty(proRoles)) { + for (ProRole role : proRoles) { + if (roleCell.equals(role.getName())) { + memberRoleId = role.getId(); + break; + } + } + } + String plugin = ExcelUtil.getCellValue(pluginRow.getCell(a)); + if (StrUtil.isNotEmpty(plugin)) { + Long sysPluginId = null; + for(SysPlugin sysPlugin:sysPluginList){ + if(plugin.equalsIgnoreCase(sysPlugin.getName())){ + sysPluginId = sysPlugin.getId(); + } + } + if(ObjectUtil.isNull(sysPluginId)){ + throw new BaseException(CodeEnum.WBS_NOT_PLUGIN.addMsg(sheet.getSheetName()+i)); + } + ProTaskPlugin taskPlugin = new ProTaskPlugin(); + taskPlugin.setId(snowflake.nextId()); + taskPlugin.setTaskDetailId(taskId); + taskPlugin.setPluginId(sysPluginId); + taskPlugin.setMemberRoleId(memberRoleId); + taskPluginService.savePlugin(taskPlugin); + } + } + } + }else{ + throw new BaseException(CodeEnum.WBS_NOT_PLUGIN_SHEET); + } + } + } + + public ProjectVo.ProjectInfo selectByProjectId(Long currentUserId, SysProject sysProject) throws Exception { + //返回参数 + ProjectVo.ProjectInfo projectInfo = new ProjectVo.ProjectInfo(); + projectInfo.setId(sysProject.getId()); + projectInfo.setName(sysProject.getName()); + projectInfo.setAddress(sysProject.getAddress()); + projectInfo.setBeginTime(sysProject.getBeginTime()); + projectInfo.setEndTime(sysProject.getEndTime()); + projectInfo.setTotalDuration(sysProject.getEndTime() - sysProject.getBeginTime()); + if (ObjectUtil.isNotNull(projectInfo)) { + projectInfo.setCreator(true); + } +// //获取当前用户在本项目中的一级角色 +// List proRoles = proRoleService.getProRoleByProjectIdAndUserId(projectInfo.getId(), currentUserId); +// if (CollectionUtil.isNotEmpty(proRoles)) { +// projectInfo.setRoles(new ArrayList<>()); +// for (ProRole proRole : proRoles) { +// projectInfo.getRoles().add(proRole.getName()); +// } +// } + return projectInfo; + } +} diff --git a/tall/src/main/java/com/ccsens/tall/service/IProMemberService.java b/tall/src/main/java/com/ccsens/tall/service/IProMemberService.java index b7343658..f13cfe05 100644 --- a/tall/src/main/java/com/ccsens/tall/service/IProMemberService.java +++ b/tall/src/main/java/com/ccsens/tall/service/IProMemberService.java @@ -1,24 +1,27 @@ -package com.ccsens.tall.service; - -import com.ccsens.tall.bean.po.ProMember; -import com.ccsens.tall.bean.po.ProRole; -import com.ccsens.tall.bean.vo.MemberVo; -import com.ccsens.tall.bean.vo.ProjectVo; - -import java.util.List; - -public interface IProMemberService { - void saveMember(ProMember proMember); - - List selectMembersByProjectId(Long projectId) throws Exception; - - Boolean userIsBelongRole(Long currentUserId, Long id) throws Exception; - - List selectRolesByUserIdAndProjectId(Long currentUserId, Long projectId) throws Exception; - - MemberVo.MemberInfo getProMemberByProjectIdAndUserId(Long projectId, Long currentUserId)throws Exception; - - List getAuthedMemberByProjectId(Long projectId)throws Exception; - - ProMember selectByUserId(Long userId, Long projectId)throws Exception; -} +package com.ccsens.tall.service; + +import com.ccsens.tall.bean.po.ProMember; +import com.ccsens.tall.bean.po.ProRole; +import com.ccsens.tall.bean.vo.MemberVo; +import com.ccsens.tall.bean.vo.ProjectVo; + +import java.util.List; + +public interface IProMemberService { + void saveMember(ProMember proMember); + + List selectMembersByProjectId(Long projectId) throws Exception; + + Boolean userIsBelongRole(Long currentUserId, Long id) throws Exception; + + List selectRolesByUserIdAndProjectId(Long currentUserId, Long projectId) throws Exception; + + MemberVo.MemberInfo getProMemberByProjectIdAndUserId(Long projectId, Long currentUserId)throws Exception; + + List getAuthedMemberByProjectId(Long projectId)throws Exception; + + ProMember selectByUserId(Long userId, Long projectId)throws Exception; + + List selectByRole(Long roleId)throws Exception; + +} diff --git a/tall/src/main/java/com/ccsens/tall/service/IProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/IProTaskDetailService.java index 979576bc..26e64cdc 100644 --- a/tall/src/main/java/com/ccsens/tall/service/IProTaskDetailService.java +++ b/tall/src/main/java/com/ccsens/tall/service/IProTaskDetailService.java @@ -1,24 +1,24 @@ -package com.ccsens.tall.service; - -import com.ccsens.tall.bean.po.ProTaskDetail; -import com.ccsens.tall.bean.vo.TaskVo; - -import java.util.List; - -public interface IProTaskDetailService { - void saveTaskDetail(ProTaskDetail taskDetail); - - Object getTasksByRoleId(Long currentUserId, Long projectId, Long roleId, Long startTime, Long endTime, Integer process, Integer page, Integer pageSize); - - TaskVo.NormalTask getTaskInfoByTaskId(Long currentUserId, Long projectId, Long taskId) throws Exception; - - TaskVo.TaskCheckList selectTaskList(Long currentUserId, String key, String start, String end, String role, Integer page, Integer pageSize) throws Exception; - - TaskVo.TaskCheckList selectTaskListByProject(Long projectId, Long currentUserId, Integer page, Integer pageSize, String key, String start, String end, Long roleId) throws Exception; - - List getTaskDetailByKey(Long currentUserId, Long projectId, String key); - - TaskVo.NormalTask selectTaskByParentId(Long parentId, Long startTime, Long endTime); - - void deleteTaskByRoleId(Long roleId); -} +package com.ccsens.tall.service; + +import com.ccsens.tall.bean.po.ProTaskDetail; +import com.ccsens.tall.bean.vo.TaskVo; + +import java.util.List; + +public interface IProTaskDetailService { + void saveTaskDetail(ProTaskDetail taskDetail); + + Object getTasksByRoleId(Long currentUserId, Long projectId, Long roleId, Long startTime, Long endTime, Integer process, Integer page, Integer pageSize) throws Exception; + + TaskVo.NormalTask getTaskInfoByTaskId(Long currentUserId, Long projectId, Long taskId) throws Exception; + + TaskVo.TaskCheckList selectTaskList(Long currentUserId, String key, String start, String end, String role, Integer page, Integer pageSize) throws Exception; + + TaskVo.TaskCheckList selectTaskListByProject(Long projectId, Long currentUserId, Integer page, Integer pageSize, String key, String start, String end, Long roleId) throws Exception; + + List getTaskDetailByKey(Long currentUserId, Long projectId, String key); + + TaskVo.NormalTask selectTaskByParentId(Long parentId, Long startTime, Long endTime); + + void deleteTaskByRoleId(Long roleId); +} diff --git a/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java b/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java index 0a3e7d2f..43d77ff0 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java @@ -1,173 +1,198 @@ -package com.ccsens.tall.service; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; -import com.ccsens.tall.bean.po.*; -import com.ccsens.tall.bean.vo.MemberVo; -import com.ccsens.tall.bean.vo.ProjectVo; -import com.ccsens.tall.persist.dao.ProMemberDao; -import com.ccsens.tall.persist.dao.ProMemberRoleDao; -import com.ccsens.tall.persist.dao.ProRoleDao; -import com.ccsens.util.WebConstant; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; - -@Service -@Transactional(propagation = Propagation.REQUIRED) -public class ProMemberService implements IProMemberService{ - @Autowired - private ProMemberDao proMemberDao; - @Autowired - private ProRoleDao proRoleDao; - @Autowired - private ProMemberRoleDao proMemberRoleDao; - @Autowired - private IUserService userService; - - - @Override - public void saveMember(ProMember proMember) { - proMemberDao.insertSelective(proMember); - } - - @Override - public List selectMembersByProjectId(Long projectId) throws Exception { - List members = new ArrayList<>(); - ProjectVo.MembersByProject member = null; - List belongRoleList = null; - ProjectVo.MembersByProject.BelongRole belongRole = null; - ProMemberExample memberExample = new ProMemberExample(); - memberExample.createCriteria().andProjectIdEqualTo(projectId).andStakeholderIdIsNull(); - List memberList = proMemberDao.selectByExample(memberExample); - if(CollectionUtil.isNotEmpty(memberList)){ - for(ProMember proMember:memberList){ - member = new ProjectVo.MembersByProject(); - member.setMemberId(proMember.getId()); - member.setName(proMember.getNickname()); - member.setPhone(proMember.getPhone()); - member.setUserId(proMember.getUserId()); - } - } - - //查找所有角色 - ProRoleExample roleExample = new ProRoleExample(); - roleExample.createCriteria().andProjectIdEqualTo(projectId); - List roleList = proRoleDao.selectByExample(roleExample); - if(CollectionUtil.isNotEmpty(roleList)){ - for(ProRole role :roleList){ - if(!role.getName().equals(WebConstant.ROLE_NAME.AllMember.phase)&&!role.getName().equals("MVP")) { - //查找角色下所有成员 - ProMemberRoleExample memberRoleExample = new ProMemberRoleExample(); - memberRoleExample.createCriteria().andRoleIdEqualTo(role.getId()); - List memberRoleList = proMemberRoleDao.selectByExample(memberRoleExample); - if(CollectionUtil.isNotEmpty(memberRoleList)){ - for (ProMemberRole memberRole:memberRoleList){ - ProMember proMember = proMemberDao.selectByPrimaryKey(memberRole.getMemberId()); - if(ObjectUtil.isNotNull(proMember)){ - Boolean flag = false; - if (CollectionUtil.isNotEmpty(members)) { - for (ProjectVo.MembersByProject membersByProject : members) { - if (membersByProject.getPhone().equals(proMember.getPhone())) { - belongRole = new ProjectVo.MembersByProject.BelongRole(); - belongRole.setRoleId(role.getId()); - belongRole.setRoleName(role.getName()); - membersByProject.getBelongRole().add(belongRole); - flag = true; - break; - } - } - } - if (!flag) { - member = new ProjectVo.MembersByProject(); - member.setMemberId(proMember.getId()); - member.setName(proMember.getNickname()); - member.setPhone(proMember.getPhone()); - member.setUserId(proMember.getUserId()); - String mAccount = userService.selectAccountByPhone(member.getPhone()); - member.setAccount(mAccount); - - belongRoleList = new ArrayList<>(); - belongRole = new ProjectVo.MembersByProject.BelongRole(); - belongRole.setRoleId(role.getId()); - belongRole.setRoleName(role.getName()); - belongRoleList.add(belongRole); - member.setBelongRole(belongRoleList); - - members.add(member); - } - } - } - } - } - } - } - return members; - } - - @Override - public Boolean userIsBelongRole(Long userId, Long roleId) { - Boolean flag = false; - ProMemberRoleExample memberRoleExample = new ProMemberRoleExample(); - memberRoleExample.createCriteria().andRoleIdEqualTo(roleId); - List memberRoleList = proMemberRoleDao.selectByExample(memberRoleExample); - if (CollectionUtil.isNotEmpty(memberRoleList)) { - for (ProMemberRole memberRole : memberRoleList) { - ProMember proMember = proMemberDao.selectByPrimaryKey(memberRole.getMemberId()); - if (ObjectUtil.isNotNull(proMember) && proMember.getUserId().longValue() == userId) { - flag = true; - } - } - } - return flag; - } - - /** - * 获取用户在项目中所属的所有角色 - */ - @Override - public List selectRolesByUserIdAndProjectId(Long userId, Long projectId) throws Exception { - List roleList = new ArrayList<>(); - ProMemberExample memberExample = new ProMemberExample(); - memberExample.createCriteria().andUserIdEqualTo(userId).andProjectIdEqualTo(projectId); - List memberList = proMemberDao.selectByExample(memberExample); - if (CollectionUtil.isNotEmpty(memberList)) { - ProMember member = memberList.get(0); - ProMemberRoleExample memberRoleExample = new ProMemberRoleExample(); - memberRoleExample.createCriteria().andMemberIdEqualTo(member.getId()); - List memberRoleList = proMemberRoleDao.selectByExample(memberRoleExample); - if(CollectionUtil.isNotEmpty(memberRoleList)){ - for(ProMemberRole memberRole:memberRoleList){ - ProRole role = proRoleDao.selectByPrimaryKey(memberRole.getRoleId()); - roleList.add(role); - } - } - } - return roleList; - } - - @Override - public MemberVo.MemberInfo getProMemberByProjectIdAndUserId(Long projectId, Long currentUserId) throws Exception { - return proMemberDao.selectByProjectIdAndUserId(projectId,currentUserId); - } - @Override - public List getAuthedMemberByProjectId(Long projectId) throws Exception { - return proMemberDao.selectAuthedMemberByProjectId(projectId); - } - - @Override - public ProMember selectByUserId(Long userId,Long projectId) throws Exception { - ProMember member = null; - ProMemberExample memberExample = new ProMemberExample(); - memberExample.createCriteria().andUserIdEqualTo(userId).andProjectIdEqualTo(projectId); - List proMemberList = proMemberDao.selectByExample(memberExample); - if(CollectionUtil.isNotEmpty(proMemberList)){ - member = proMemberList.get(0); - } - return member; - } -} +package com.ccsens.tall.service; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import com.ccsens.tall.bean.po.*; +import com.ccsens.tall.bean.vo.MemberVo; +import com.ccsens.tall.bean.vo.ProjectVo; +import com.ccsens.tall.persist.dao.ProMemberDao; +import com.ccsens.tall.persist.dao.ProMemberRoleDao; +import com.ccsens.tall.persist.dao.ProRoleDao; +import com.ccsens.util.WebConstant; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +@Service +@Transactional(propagation = Propagation.REQUIRED) +public class ProMemberService implements IProMemberService { + @Autowired + private ProMemberDao proMemberDao; + @Autowired + private ProRoleDao proRoleDao; + @Autowired + private ProMemberRoleDao proMemberRoleDao; + @Autowired + private IUserService userService; + + + @Override + public void saveMember(ProMember proMember) { + proMemberDao.insertSelective(proMember); + } + + @Override + public List selectMembersByProjectId(Long projectId) throws Exception { + List members = new ArrayList<>(); + ProjectVo.MembersByProject member = null; + List belongRoleList = null; + ProjectVo.MembersByProject.BelongRole belongRole = null; + ProMemberExample memberExample = new ProMemberExample(); + memberExample.createCriteria().andProjectIdEqualTo(projectId).andStakeholderIdIsNull(); + List memberList = proMemberDao.selectByExample(memberExample); + if(CollectionUtil.isNotEmpty(memberList)){ + for(ProMember proMember:memberList){ + member = new ProjectVo.MembersByProject(); + member.setMemberId(proMember.getId()); + member.setName(proMember.getNickname()); + member.setPhone(proMember.getPhone()); + member.setUserId(proMember.getUserId()); + } + } + + //查找所有角色 + ProRoleExample roleExample = new ProRoleExample(); + roleExample.createCriteria().andProjectIdEqualTo(projectId); + List roleList = proRoleDao.selectByExample(roleExample); + if(CollectionUtil.isNotEmpty(roleList)){ + for(ProRole role :roleList){ + if(!role.getName().equals(WebConstant.ROLE_NAME.AllMember.phase)&&!role.getName().equals("MVP")) { + //查找角色下所有成员 + ProMemberRoleExample memberRoleExample = new ProMemberRoleExample(); + memberRoleExample.createCriteria().andRoleIdEqualTo(role.getId()); + List memberRoleList = proMemberRoleDao.selectByExample(memberRoleExample); + if(CollectionUtil.isNotEmpty(memberRoleList)){ + for (ProMemberRole memberRole:memberRoleList){ + ProMember proMember = proMemberDao.selectByPrimaryKey(memberRole.getMemberId()); + if(ObjectUtil.isNotNull(proMember)){ + Boolean flag = false; + if (CollectionUtil.isNotEmpty(members)) { + for (ProjectVo.MembersByProject membersByProject : members) { + if (membersByProject.getPhone().equals(proMember.getPhone())) { + belongRole = new ProjectVo.MembersByProject.BelongRole(); + belongRole.setRoleId(role.getId()); + belongRole.setRoleName(role.getName()); + membersByProject.getBelongRole().add(belongRole); + flag = true; + break; + } + } + } + if (!flag) { + member = new ProjectVo.MembersByProject(); + member.setMemberId(proMember.getId()); + member.setName(proMember.getNickname()); + member.setPhone(proMember.getPhone()); + member.setUserId(proMember.getUserId()); + String mAccount = userService.selectAccountByPhone(member.getPhone()); + member.setAccount(mAccount); + + belongRoleList = new ArrayList<>(); + belongRole = new ProjectVo.MembersByProject.BelongRole(); + belongRole.setRoleId(role.getId()); + belongRole.setRoleName(role.getName()); + belongRoleList.add(belongRole); + member.setBelongRole(belongRoleList); + + members.add(member); + } + } + } + } + } + } + } + return members; + } + + /** + *该用户是否是角色下的成员 + */ + @Override + public Boolean userIsBelongRole(Long userId, Long roleId) { + Boolean flag = false; + ProMemberRoleExample memberRoleExample = new ProMemberRoleExample(); + memberRoleExample.createCriteria().andRoleIdEqualTo(roleId); + List memberRoleList = proMemberRoleDao.selectByExample(memberRoleExample); + if (CollectionUtil.isNotEmpty(memberRoleList)) { + for (ProMemberRole memberRole : memberRoleList) { + ProMember proMember = proMemberDao.selectByPrimaryKey(memberRole.getMemberId()); + if (ObjectUtil.isNotNull(proMember) && proMember.getUserId().longValue() == userId) { + flag = true; + } + } + } + return flag; + } + + /** + * 获取用户在项目中所属的所有角色 + */ + @Override + public List selectRolesByUserIdAndProjectId(Long userId, Long projectId) throws Exception { + List roleList = new ArrayList<>(); + ProMemberExample memberExample = new ProMemberExample(); + memberExample.createCriteria().andUserIdEqualTo(userId).andProjectIdEqualTo(projectId); + List memberList = proMemberDao.selectByExample(memberExample); + if (CollectionUtil.isNotEmpty(memberList)) { + ProMember member = memberList.get(0); + ProMemberRoleExample memberRoleExample = new ProMemberRoleExample(); + memberRoleExample.createCriteria().andMemberIdEqualTo(member.getId()); + List memberRoleList = proMemberRoleDao.selectByExample(memberRoleExample); + if(CollectionUtil.isNotEmpty(memberRoleList)){ + for(ProMemberRole memberRole:memberRoleList){ + ProRole role = proRoleDao.selectByPrimaryKey(memberRole.getRoleId()); + roleList.add(role); + } + } + } + return roleList; + } + + @Override + public MemberVo.MemberInfo getProMemberByProjectIdAndUserId(Long projectId, Long currentUserId) throws Exception { + return proMemberDao.selectByProjectIdAndUserId(projectId,currentUserId); + } + @Override + public List getAuthedMemberByProjectId(Long projectId) throws Exception { + return proMemberDao.selectAuthedMemberByProjectId(projectId); + } + + /** + * 查找用户在项目下对应的成员 + */ + @Override + public ProMember selectByUserId(Long userId, Long projectId) throws Exception { + ProMember member = null; + ProMemberExample memberExample = new ProMemberExample(); + memberExample.createCriteria().andUserIdEqualTo(userId).andProjectIdEqualTo(projectId); + List proMemberList = proMemberDao.selectByExample(memberExample); + if(CollectionUtil.isNotEmpty(proMemberList)){ + member = proMemberList.get(0); + } + return member; + } + + /** + * 查找角色下的所有成员 + */ + @Override + public List selectByRole(Long roleId){ + List memberList = new ArrayList<>(); + ProMemberRoleExample memberRoleExample = new ProMemberRoleExample(); + memberRoleExample.createCriteria().andRoleIdEqualTo(roleId); + List memberRoleList = proMemberRoleDao.selectByExample(memberRoleExample); + if(CollectionUtil.isNotEmpty(memberRoleList)){ + for(ProMemberRole memberRole:memberRoleList){ + ProMember member = proMemberDao.selectByPrimaryKey(memberRole.getMemberId()); + memberList.add(member); + } + } + return memberList; + } + +} diff --git a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java index 3e80ce00..60ed5561 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java @@ -1,213 +1,233 @@ -package com.ccsens.tall.service; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; -import com.ccsens.tall.bean.po.*; -import com.ccsens.tall.bean.vo.ProjectVo; -import com.ccsens.tall.bean.vo.TaskVo; -import com.ccsens.tall.persist.dao.ProMemberDao; -import com.ccsens.tall.persist.dao.ProMemberRoleDao; -import com.ccsens.tall.persist.dao.ProRoleDao; -import com.ccsens.util.WebConstant; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -@Service -@Transactional(propagation = Propagation.REQUIRED) -public class ProRoleService implements IProRoleService{ - @Autowired - private ProRoleDao proRoleDao; - @Autowired - private ProMemberDao proMemberDao; - @Autowired - private ProMemberRoleDao proMemberRoleDao; - @Autowired - private IProTaskDetailService taskDetailService; - @Autowired - private IUserService userService; - - @Override - public void saveProRole(ProRole proRole) { - proRoleDao.insertSelective(proRole); - } - - /** - * 查询此用户在项目中的一级角色 - */ - @Override - public List getProRoleByProjectIdAndUserId(Long projectId, Long currentUserId) { - return proRoleDao.selectFirstRoleByProjectIdAndUserId(projectId,currentUserId); - } - - /** - * 查询项目下的所有角色（二级角色） - */ - @Override - public List getRolesByProjectIdAndUserId(Long projectId, Long currentUserId) throws Exception { - List memberRoleList = null; - //1.查询二级角色(项目经理+项目成员+mvp) - memberRoleList = getRealMemberRolesByProjectId(projectId); - - //排除该角色不能看的其他角色 - List carelessMemberRoleList = getCareLessRoleByProjectIdAndUserId(projectId, currentUserId); - if (CollectionUtil.isNotEmpty(carelessMemberRoleList)) { - for (Long otherRoleId : carelessMemberRoleList) { - for (ProjectVo.RoleInfo memberRole : memberRoleList) { - if (otherRoleId.longValue() == memberRole.getId().longValue()) { - memberRoleList.remove(memberRole); - break; - } - } - } - } - - //是否PM - if (CollectionUtil.isNotEmpty(memberRoleList)) { - for (ProjectVo.RoleInfo memberRole : memberRoleList) { - ProRole parentRole = proRoleDao.selectByPrimaryKey(memberRole.getParentId()); - if (parentRole.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.PM.value)) { - memberRole.setPm(true); - } else { - memberRole.setPm(false); - } - } - } - - //是否mine - if (CollectionUtil.isNotEmpty(memberRoleList)) { - List roleList = proRoleDao.selectRolesByProjectIdAndUserId(projectId, currentUserId); - for (ProjectVo.RoleInfo memberRole : memberRoleList) { - if (ObjectUtil.isNotNull(roleList)) { - for(ProRole role:roleList){ - if (memberRole.getId().equals(role.getId())) { - memberRole.setMine(true); - break; - } else { - memberRole.setMine(false); - } - } - } - } - } - //奖惩干系人信息 - if (CollectionUtil.isNotEmpty(memberRoleList)) { - for (ProjectVo.RoleInfo memberRole : memberRoleList) { - if (CollectionUtil.isNotEmpty(memberRole.getMembers())) { - for (ProjectVo.ProMemberVo member : memberRole.getMembers()) { - String mAccount = userService.selectAccountByPhone(member.getMPhone()); - member.setMUsername(mAccount); - //查找奖惩干系人 - if(ObjectUtil.isNotNull(member.getStakeholderId())) { - ProMember stakeholder = proMemberDao.selectByPrimaryKey(member.getStakeholderId()); - if(ObjectUtil.isNotNull(stakeholder)){ - member.setSId(stakeholder.getId()); - member.setSName(stakeholder.getNickname()); - member.setMPhone(stakeholder.getPhone()); - String stakeholderAccount = userService.selectAccountByPhone(member.getMPhone()); - member.setSUsername(stakeholderAccount); - if(ObjectUtil.isNotNull(stakeholder.getUserId())){ - if (currentUserId.longValue() == stakeholder.getUserId()) { - member.setStakeholder(true); - } - } - } - } - } - } - } - } - return memberRoleList; - } - - /** - * 查询项目下所有二级角色 - */ - @Override - public List getRealMemberRolesByProjectId(Long projectId) { - //查询二级角色 - List memberRoleList = null; - memberRoleList = proRoleDao.selectSecondRolesByProjectId(projectId); - return memberRoleList; - } - - /** - * 获取此用户不可见的角色 - * @param projectId - * @param currentUserId - * @return - */ - public List getCareLessRoleByProjectIdAndUserId(Long projectId, Long currentUserId) { - return proRoleDao.selectCareLessRoleByProjectIdAndUserId(projectId, currentUserId); - } - - /** - * 获取用户在项目中的最高权限 - * @param roles 用户在项目中所属的一级角色的名字 - * @return - */ - @Override - public int selectPowerByRoleName(List roles) { - int power = 0; - if(CollectionUtil.isNotEmpty(roles)){ - for(ProRole role:roles){ - int i = proRoleDao.selectPowerByRoleName(role.getDescription()); - power = i > power ? i : power; - } - } - return power; - } - - /** - * 根据roleId查找角色的id和姓名 - */ - @Override - public TaskVo.RoleCheckList selectRoleByCheckOrExecutor(Long roleId) { - TaskVo.RoleCheckList roleCheckList = new TaskVo.RoleCheckList(); - if(roleId != 0) { - ProRole role = proRoleDao.selectByPrimaryKey(roleId); - roleCheckList.setId(role.getId()); - roleCheckList.setName(role.getName()); - } - return roleCheckList; - } - - /** - * 查找“全体成员”角色 - */ - @Override - public ProRole getAllMember(Long projectId) { - ProRole role = null; - ProRoleExample roleExample = new ProRoleExample(); - roleExample.createCriteria().andProjectIdEqualTo(projectId).andNameEqualTo(WebConstant.ROLE_NAME.AllMember.phase); - List roleList = proRoleDao.selectByExample(roleExample); - if(CollectionUtil.isNotEmpty(roleList)){ - role = roleList.get(0); - } - return role; - } - - //======================================================================= - - /** - * 删除所有角色 - * @param projectId - */ - @Override - public void deleteRoleByProjectId(Long projectId) { - ProRoleExample roleExample = new ProRoleExample(); - roleExample.createCriteria().andProjectIdEqualTo(projectId); - List roleList = proRoleDao.selectByExample(roleExample); - if(CollectionUtil.isNotEmpty(roleList)){ - //删除任务 - for(ProRole role:roleList){ - taskDetailService.deleteTaskByRoleId(role.getId()); - } - } - } - - -} +package com.ccsens.tall.service; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import com.ccsens.tall.bean.po.ProMember; +import com.ccsens.tall.bean.po.ProRole; +import com.ccsens.tall.bean.po.ProRoleExample; +import com.ccsens.tall.bean.vo.ProjectVo; +import com.ccsens.tall.bean.vo.TaskVo; +import com.ccsens.tall.persist.dao.ProMemberDao; +import com.ccsens.tall.persist.dao.ProMemberRoleDao; +import com.ccsens.tall.persist.dao.ProRoleDao; +import com.ccsens.util.WebConstant; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@Transactional(propagation = Propagation.REQUIRED) +public class ProRoleService implements IProRoleService { + @Autowired + private ProRoleDao proRoleDao; + @Autowired + private ProMemberDao proMemberDao; + @Autowired + private ProMemberRoleDao proMemberRoleDao; + @Autowired + private IProTaskDetailService taskDetailService; + @Autowired + private IUserService userService; + + @Override + public void saveProRole(ProRole proRole) { + proRoleDao.insertSelective(proRole); + } + + /** + * 查询此用户在项目中的一级角色 + */ + @Override + public List getProRoleByProjectIdAndUserId(Long projectId, Long currentUserId) { + return proRoleDao.selectFirstRoleByProjectIdAndUserId(projectId,currentUserId); + } + + /** + * 查询项目下的所有角色（二级角色） + */ + @Override + public List getRolesByProjectIdAndUserId(Long projectId, Long currentUserId) throws Exception { + List memberRoleList = null; + //1.查询二级角色(项目经理+项目成员+mvp) + memberRoleList = getRealMemberRolesByProjectId(projectId); + + //是否mine + if (CollectionUtil.isNotEmpty(memberRoleList)) { + List roleList = proRoleDao.selectRolesByProjectIdAndUserId(projectId, currentUserId); + for (ProjectVo.RoleInfo memberRole : memberRoleList) { + if (ObjectUtil.isNotNull(roleList)) { + for(ProRole role:roleList){ + if (memberRole.getId().equals(role.getId())) { + memberRole.setMine(true); + break; + } else { + memberRole.setMine(false); + } + } + } + } + } + //排除该角色不能看的其他角色 + List carelessMemberRoleList = getCareLessRoleByProjectIdAndUserId(projectId, currentUserId); + if (CollectionUtil.isNotEmpty(carelessMemberRoleList)) { + for (Long otherRoleId : carelessMemberRoleList) { + for (ProjectVo.RoleInfo memberRole : memberRoleList) { + if (otherRoleId.longValue() == memberRole.getId().longValue()) { + if(!memberRole.isMine()){ + memberRoleList.remove(memberRole); + } + break; + } + } + } + } + + //是否PM + if (CollectionUtil.isNotEmpty(memberRoleList)) { + for (ProjectVo.RoleInfo memberRole : memberRoleList) { + ProRole parentRole = proRoleDao.selectByPrimaryKey(memberRole.getParentId()); + if (parentRole.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.PM.value)) { + memberRole.setPm(true); + } else { + memberRole.setPm(false); + } + } + } + +// //是否mine +// if (CollectionUtil.isNotEmpty(memberRoleList)) { +// List roleList = proRoleDao.selectRolesByProjectIdAndUserId(projectId, currentUserId); +// for (ProjectVo.RoleInfo memberRole : memberRoleList) { +// if (ObjectUtil.isNotNull(roleList)) { +// for(ProRole role:roleList){ +// if (memberRole.getId().equals(role.getId())) { +// memberRole.setMine(true); +// break; +// } else { +// memberRole.setMine(false); +// } +// } +// } +// } +// } + //奖惩干系人信息 + if (CollectionUtil.isNotEmpty(memberRoleList)) { + for (ProjectVo.RoleInfo memberRole : memberRoleList) { + if (CollectionUtil.isNotEmpty(memberRole.getMembers())) { + for (ProjectVo.ProMemberVo member : memberRole.getMembers()) { + String mAccount = userService.selectAccountByPhone(member.getMPhone()); + member.setMUsername(mAccount); + //查找奖惩干系人 + if(ObjectUtil.isNotNull(member.getStakeholderId())) { + ProMember stakeholder = proMemberDao.selectByPrimaryKey(member.getStakeholderId()); + if(ObjectUtil.isNotNull(stakeholder)){ + member.setSId(stakeholder.getId()); + member.setSName(stakeholder.getNickname()); + member.setMPhone(stakeholder.getPhone()); + String stakeholderAccount = userService.selectAccountByPhone(member.getMPhone()); + member.setSUsername(stakeholderAccount); + if(ObjectUtil.isNotNull(stakeholder.getUserId())){ + if (currentUserId.longValue() == stakeholder.getUserId()) { + member.setStakeholder(true); + } + } + } + } + } + } + } + } + return memberRoleList; + } + + /** + * 查询项目下所有二级角色 + */ + @Override + public List getRealMemberRolesByProjectId(Long projectId) { + //查询二级角色 + List memberRoleList = null; + memberRoleList = proRoleDao.selectSecondRolesByProjectId(projectId); + return memberRoleList; + } + + /** + * 获取此用户不可见的角色 + * @param projectId + * @param currentUserId + * @return + */ + public List getCareLessRoleByProjectIdAndUserId(Long projectId, Long currentUserId) { + return proRoleDao.selectCareLessRoleByProjectIdAndUserId(projectId, currentUserId); + } + + /** + * 获取用户在项目中的最高权限 + * @param roles 用户在项目中所属的一级角色的名字 + * @return + */ + @Override + public int selectPowerByRoleName(List roles) { + int power = 0; + if(CollectionUtil.isNotEmpty(roles)){ + for(ProRole role:roles){ + int i = proRoleDao.selectPowerByRoleName(role.getDescription()); + power = i > power ? i : power; + } + } + return power; + } + + /** + * 根据roleId查找角色的id和姓名 + */ + @Override + public TaskVo.RoleCheckList selectRoleByCheckOrExecutor(Long roleId) { + TaskVo.RoleCheckList roleCheckList = new TaskVo.RoleCheckList(); + if(roleId != 0) { + ProRole role = proRoleDao.selectByPrimaryKey(roleId); + roleCheckList.setId(role.getId()); + roleCheckList.setName(role.getName()); + } + return roleCheckList; + } + + /** + * 查找“全体成员”角色 + */ + @Override + public ProRole getAllMember(Long projectId) { + ProRole role = null; + ProRoleExample roleExample = new ProRoleExample(); + roleExample.createCriteria().andProjectIdEqualTo(projectId).andNameEqualTo(WebConstant.ROLE_NAME.AllMember.phase); + List roleList = proRoleDao.selectByExample(roleExample); + if(CollectionUtil.isNotEmpty(roleList)){ + role = roleList.get(0); + } + return role; + } + + //======================================================================= + + /** + * 删除所有角色 + * @param projectId + */ + @Override + public void deleteRoleByProjectId(Long projectId) { + ProRoleExample roleExample = new ProRoleExample(); + roleExample.createCriteria().andProjectIdEqualTo(projectId); + List roleList = proRoleDao.selectByExample(roleExample); + if(CollectionUtil.isNotEmpty(roleList)){ + //删除任务 + for(ProRole role:roleList){ + taskDetailService.deleteTaskByRoleId(role.getId()); + } + } + } + + +} diff --git a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java index 1a70d243..54269222 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java @@ -1,650 +1,768 @@ -package com.ccsens.tall.service; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.ccsens.tall.bean.po.*; -import com.ccsens.tall.bean.vo.TaskVo; -import com.ccsens.tall.persist.dao.ProRoleDao; -import com.ccsens.tall.persist.dao.SysProjectDao; -import com.ccsens.tall.persist.dao.TaskDetailDao; -import com.ccsens.tall.persist.dao.TaskSubTimeDao; -import com.ccsens.tall.util.TaskUtil; -import com.ccsens.util.CodeEnum; -import com.ccsens.util.DateUtil; -import com.ccsens.util.WebConstant; -import com.ccsens.util.exception.BaseException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; - - -@Service -@Transactional(propagation = Propagation.REQUIRED) -public class ProTaskDetailService implements IProTaskDetailService{ - @Autowired - private IProRoleService proRoleService; - @Autowired - private ITaskDeliverService taskDeliverService; - @Autowired - private IUserAttentionService attentionService; - @Autowired - private ITaskPluginService pluginService; - @Autowired - private TaskDetailDao taskDetailDao; - @Autowired - private TaskSubTimeDao taskSubTimeDao; - @Autowired - private ProRoleDao proRoleDao; - @Autowired - private SysProjectDao sysProjectDao; - - @Override - public void saveTaskDetail(ProTaskDetail taskDetail) { - taskDetailDao.insertSelective(taskDetail); - } - - @Override - public Object getTasksByRoleId(Long currentUserId, Long projectId, Long roleId, Long startTime, Long endTime, Integer process, Integer page, Integer pageSize) { - SysProject sysProject = sysProjectDao.selectByPrimaryKey(projectId); - if(ObjectUtil.isNull(sysProject)){ - throw new BaseException(CodeEnum.NOT_PROJECT); - } - startTime = startTime == null ? sysProject.getBeginTime() : startTime; - endTime = endTime == null ? sysProject.getEndTime() : endTime; - - Object obj = null; - ProRole role = proRoleDao.selectByPrimaryKey(roleId); - if(ObjectUtil.isNull(role)){ - throw new BaseException(CodeEnum.NOT_ROLE); - } - ProRole parentRole = proRoleDao.selectByPrimaryKey(role.getParentId()); - if(ObjectUtil.isNull(parentRole)){ - throw new BaseException(CodeEnum.NOT_ROLE); - } - if(ObjectUtil.isNotNull(role)) { - if (role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.MVP.value)) { - obj = getTaskInfoByMvp(projectId, page, pageSize); - } else if (parentRole.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.PM.value)) { - obj = getTaskInfoByProjectIdAndPM(projectId, startTime, endTime, process, page, pageSize); - } else if (parentRole.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.Member.value)) { - obj = getTaskInfoByProjectIdAndRoleId(currentUserId, projectId, roleId, startTime, endTime, process, page, pageSize); - } - }else { - throw new BaseException(CodeEnum.NOT_ROLE); - } - return obj; - } - - /** - * 查看任务 项目经理 - */ - private TaskVo.ProTaskInfo getTaskInfoByProjectIdAndPM(Long projectId,Long startTime, Long endTime, Integer process, Integer page, Integer pageSize) { - TaskVo.ProTaskInfo proTaskInfo = new TaskVo.ProTaskInfo(); - List globalTaskList = new ArrayList<>(); - List normalTaskList = new ArrayList<>(); - TaskVo.GlobalTask globalTask = null; - TaskVo.NormalTask normalTask = null; - //1、查找一级任务 - SysProject project = sysProjectDao.selectByPrimaryKey(projectId); - if(endTime < project.getBeginTime() || startTime > project.getEndTime()){ - return proTaskInfo; - } - ProTaskDetailExample proTaskDetailExample = new ProTaskDetailExample(); - proTaskDetailExample.createCriteria().andProjectIdEqualTo(projectId).andLevelEqualTo((byte) 1); - List firstTaskDetailList = taskDetailDao.selectByExample(proTaskDetailExample); - if(CollectionUtil.isNotEmpty(firstTaskDetailList)){ - int sequence = 1; - for(ProTaskDetail firstTaskDetail:firstTaskDetailList){ - normalTask = new TaskVo.NormalTask(); - BeanUtil.copyProperties(firstTaskDetail,normalTask); - normalTask.setDetailId(firstTaskDetail.getId()); - normalTask.setId(null); - normalTask.setSequence(sequence); - //查找一级任务下的二级任务 - List secondNormalTaskList = taskDetailDao.selectNormalTaskListByPM(projectId,firstTaskDetail.getId(),startTime,endTime); - if(CollectionUtil.isNotEmpty(secondNormalTaskList)){ - TaskUtil.Task task = TaskUtil.splitTask(secondNormalTaskList,startTime,endTime,process); - if(CollectionUtil.isNotEmpty(task.getGlobalTask())){ - for(TaskVo.NormalTask global:task.getGlobalTask()){ - globalTask = new TaskVo.GlobalTask(); - BeanUtil.copyProperties(global,globalTask); - globalTaskList.add(globalTask); - } - } - if(CollectionUtil.isNotEmpty(task.getCommonTask())){ - normalTask.setSecondTasks(new ArrayList<>()); - normalTask.getSecondTasks().addAll(task.getCommonTask()); - } - } -// if(CollectionUtil.isNotEmpty(normalTask.getSecondTasks())) { - normalTaskList.add(normalTask); - sequence++; -// } - } - } - TaskVo.PageInfo pageInfo = new TaskVo.PageInfo(); - pageInfo.setTotalPage(page); - pageInfo.setCurrentPage(page); - - proTaskInfo.setPageInfo(pageInfo); - proTaskInfo.setGlobalTaskList(globalTaskList); - proTaskInfo.setNormalTaskList(normalTaskList); - return proTaskInfo; - } - /** - * 查看任务 项目成员 - */ - private TaskVo.ProTaskInfo getTaskInfoByProjectIdAndRoleId(Long currentUserId, Long projectId, Long roleId, Long startTime, Long endTime, Integer process, Integer page, Integer pageSize) { - TaskVo.ProTaskInfo proTaskInfo = new TaskVo.ProTaskInfo(); - List globalTaskList = new ArrayList<>(); - List normalTaskList = new ArrayList<>(); - TaskVo.GlobalTask globalTask = null; - //获取“全体成员”角色 - ProRole allMember = proRoleService.getAllMember(projectId); - Long allMemberId = null; - if(ObjectUtil.isNotNull(allMember)) { - allMemberId = allMember.getId(); - } - //查找该角色的所有任务(全体成员的任务也是这个角色的任务） - List secondTaskVoList = taskDetailDao.selectTaskByRoleAndAllMembers(projectId, roleId, allMemberId,startTime,endTime); - if(CollectionUtil.isNotEmpty(secondTaskVoList)){ - TaskUtil.Task task = TaskUtil.splitTask(secondTaskVoList,startTime,endTime,process); - if(CollectionUtil.isNotEmpty(task.getGlobalTask())){ - for(TaskVo.NormalTask global:task.getGlobalTask()){ - globalTask = new TaskVo.GlobalTask(); - BeanUtil.copyProperties(global,globalTask); - globalTaskList.add(globalTask); - } - } - if(CollectionUtil.isNotEmpty(task.getCommonTask())){ - normalTaskList = sortTaskTime(task.getCommonTask()); - } - } - - //2.业务层分页 - List theNormalTaskList = null; - int totalPages = 1; - if (CollectionUtil.isNotEmpty(normalTaskList)) { - //1.计算分页条件 - if (page > 0) { - int size = normalTaskList.size(); - totalPages = size / pageSize + 1; - int num = pageSize; - int startIndex = pageSize * (page - 1); - if (startIndex >= size) { - startIndex = -1; - } else { - if (startIndex + num > size) { - num = size - startIndex; - } - } - //拷贝分页数据 - if (startIndex >= 0) { - theNormalTaskList = CollectionUtil.newArrayList(); - for (int i = startIndex; i < startIndex + num; i++) { - theNormalTaskList.add(normalTaskList.get(i)); - } - } - } else { //不分页 - page = 1; - theNormalTaskList = CollectionUtil.newArrayList(normalTaskList); - } - } - TaskVo.PageInfo pageInfo = new TaskVo.PageInfo(); - pageInfo.setTotalPage(totalPages); - pageInfo.setCurrentPage(page); - - proTaskInfo.setPageInfo(pageInfo); - proTaskInfo.setGlobalTaskList(globalTaskList); - proTaskInfo.setNormalTaskList(theNormalTaskList); - return proTaskInfo; - } - private List sortTaskTime(List commonTask) { - List normalTaskList = new ArrayList<>(); - List secondTaskVoList = null; - Set longSet = new HashSet<>(); - List timeList = new ArrayList<>(); - if (CollectionUtil.isNotEmpty(commonTask)) { - for (TaskVo.NormalTask secondTaskVo : commonTask) { - longSet.add(secondTaskVo.getBeginTime()); - longSet.add(secondTaskVo.getEndTime()); - } - timeList.addAll(longSet); - for (int i = 0; i < timeList.size(); i++) { - for (int j = 0; j < timeList.size() - i - 1; j++) { - if (timeList.get(j) > timeList.get(j + 1)) { - Long r = timeList.get(j); - timeList.set(j, timeList.get(j + 1)); - timeList.set(j + 1, r); - } - } - } - int sequence = 1; - for (int i = 0; i < timeList.size() - 1; i++) { - TaskVo.NormalTask normalTask = null; - secondTaskVoList = new ArrayList<>(); - Long startTime = timeList.get(i); - Long endTime = timeList.get(i + 1); - - for (TaskVo.NormalTask secondTaskVo : commonTask) { - if(secondTaskVo.getTimeStatus() == 1){ - if(secondTaskVo.getBeginTime().longValue() == startTime.longValue()) { - normalTask = new TaskVo.NormalTask(); - BeanUtil.copyProperties(secondTaskVo, normalTask); - normalTask.setEndTime(null); - normalTask.setSequence(sequence); - sequence++; - normalTaskList.add(normalTask); - } - continue; - } - if(secondTaskVo.getTimeStatus() == 2){ - if(secondTaskVo.getEndTime().longValue() == endTime.longValue()) { - normalTask = new TaskVo.NormalTask(); - BeanUtil.copyProperties(secondTaskVo, normalTask); - normalTask.setBeginTime(null); - normalTask.setSequence(sequence); - sequence++; - normalTaskList.add(normalTask); - } - continue; - } - if (secondTaskVo.getBeginTime() < startTime && secondTaskVo.getEndTime() <= endTime && secondTaskVo.getEndTime() > startTime) { - secondTaskVo.setBeginTime(startTime); - secondTaskVoList.add(secondTaskVo); - } else if (secondTaskVo.getBeginTime() >= startTime && secondTaskVo.getEndTime() <= endTime) { - secondTaskVoList.add(secondTaskVo); - } else if (secondTaskVo.getBeginTime() >= startTime && secondTaskVo.getBeginTime() < endTime && secondTaskVo.getEndTime() > endTime) { - secondTaskVo.setEndTime(endTime); - secondTaskVoList.add(secondTaskVo); - } else if (secondTaskVo.getBeginTime() < startTime && secondTaskVo.getEndTime() > endTime) { - secondTaskVo.setBeginTime(startTime); - secondTaskVo.setEndTime(endTime); - secondTaskVoList.add(secondTaskVo); - } - } - if (CollectionUtil.isNotEmpty(secondTaskVoList)) { - if (secondTaskVoList.size() == 1) { - normalTask = new TaskVo.NormalTask(); - BeanUtil.copyProperties(secondTaskVoList.get(0), normalTask); - normalTask.setSequence(sequence); - sequence++; - normalTaskList.add(normalTask); - } else { - normalTask = new TaskVo.NormalTask(); - normalTask.setBeginTime(startTime); - normalTask.setEndTime(endTime); - normalTask.setSecondTasks(secondTaskVoList); - normalTask.setSequence(sequence); - sequence++; - normalTaskList.add(normalTask); - } - } - } - } - return normalTaskList; - } - - /** - * 点击MVP查看交付物 - */ - private TaskVo.ProTaskInfoByMVP getTaskInfoByMvp( Long projectId, Integer page, Integer pageSize) { - TaskVo.PageInfo pageInfo = new TaskVo.PageInfo(); - TaskVo.ProTaskInfoByMVP proTaskInfoByMVP = new TaskVo.ProTaskInfoByMVP(); - List taskDeliverByMVPList = new ArrayList<>(); - TaskVo.TaskDeliverByMVP taskDeliverByMVP = null; - List firstTasks =new ArrayList<>(); - TaskVo.FirstTask firstProTask = null; - //查找项目下的一级任务 - ProTaskDetailExample firstTaskExample = new ProTaskDetailExample(); - firstTaskExample.createCriteria().andProjectIdEqualTo(projectId).andVirtualEqualTo((byte) WebConstant.TASK_VIRTUAL.Normal.value).andParentIdEqualTo(0L); - List firstTaskList = taskDetailDao.selectByExample(firstTaskExample); - if(CollectionUtil.isNotEmpty(firstTaskList)){ - for(ProTaskDetail firstTask:firstTaskList){ - taskDeliverByMVPList = new ArrayList<>(); - //查找项目下所有的二级任务 - ProTaskDetailExample taskExample = new ProTaskDetailExample(); - taskExample.createCriteria().andProjectIdEqualTo(projectId).andVirtualEqualTo((byte) WebConstant.TASK_VIRTUAL.Normal.value).andParentIdEqualTo(firstTask.getId()); - List taskList = taskDetailDao.selectByExample(taskExample); - if (CollectionUtil.isNotEmpty(taskList)) { - for (ProTaskDetail task : taskList) { - - taskDeliverByMVP = new TaskVo.TaskDeliverByMVP(); - taskDeliverByMVP.setId(task.getId()); - taskDeliverByMVP.setName(task.getName()); - //负责人信息 - TaskVo.RoleCheckList roleCheckList = proRoleService.selectRoleByCheckOrExecutor(task.getExecutorRole()); - if (ObjectUtil.isNotNull(roleCheckList)) { - List roleCheckListList = new ArrayList<>(); - if (roleCheckList.getName().equals(WebConstant.ROLE_NAME.AllMember.phase)) { - roleCheckListList = proRoleDao.findAll(projectId); - } else { - roleCheckListList.add(roleCheckList); - } - taskDeliverByMVP.setRoles(roleCheckListList); - } - //检查人信息 - taskDeliverByMVP.setChecker(proRoleService.selectRoleByCheckOrExecutor(task.getCheckerRole())); - //查找任务下的交付物 - taskDeliverByMVP.setDelivers(taskDeliverService.selectDeliverOrInputByTask(task.getId(), 0)); - //查找任务的输入文档 - taskDeliverByMVP.setInputs(taskDeliverService.selectDeliverOrInputByTask(task.getId(), 1)); - - taskDeliverByMVPList.add(taskDeliverByMVP); - } - } - firstProTask = new TaskVo.FirstTask(); - firstProTask.setId(firstTask.getId()); - firstProTask.setName(firstTask.getName()); - firstProTask.setTaskDeliverByMVP(taskDeliverByMVPList); - firstTasks.add(firstProTask); - } - } - - proTaskInfoByMVP.setFirstTaskList(firstTasks); - return proTaskInfoByMVP; - } - - /** - *通过任务id查任务详情 - */ - @Override - public TaskVo.NormalTask getTaskInfoByTaskId(Long currentUserId, Long projectId, Long taskId) throws Exception { - ProTaskSubTime subTime = taskSubTimeDao.selectByPrimaryKey(taskId); - TaskVo.NormalTask taskDetail = null; - if(ObjectUtil.isNotNull(subTime)) { - taskDetail = taskDetailDao.selectTaskByTaskId(projectId, subTime.getTaskDetailId()); - //添加项目信息和插件信息 - normalTaskAddPlugin(currentUserId,subTime.getTaskDetailId(),taskDetail); - if (ObjectUtil.isNotNull(taskDetail)) { - List groupTaskList = new ArrayList<>(); - groupTaskList = taskDetailDao.selectTaskByParentId(projectId, taskDetail.getDetailId()); - if (CollectionUtil.isNotEmpty(groupTaskList)) { - taskDetail.setSecondTasks(new ArrayList<>()); - taskDetail.getSecondTasks().addAll(groupTaskList); - } - } - } - return taskDetail; - } - private void normalTaskAddPlugin(Long userId,Long taskId,TaskVo.NormalTask normalTask) throws Exception { - ProTaskDetail task = taskDetailDao.selectByPrimaryKey(taskId); - //添加项目信息 - SysProject project = sysProjectDao.selectByPrimaryKey(task.getProjectId()); - if(ObjectUtil.isNotNull(project)){ - normalTask.setProjectId(project.getId()); - normalTask.setProjectName(project.getName()); - } - ProRole role = proRoleDao.selectByPrimaryKey(normalTask.getExecutorRole()); - if(ObjectUtil.isNotNull(role)){ - normalTask.setExecutorRoleName(role.getName()); - } - //添加插件 - List pluginVoList = pluginService.getPluginByTask(task.getId(),userId); - normalTask.setPlugins(new ArrayList<>()); - normalTask.getPlugins().addAll(pluginVoList); - } - - - /** - * 任务清单 - */ - @Override - public TaskVo.TaskCheckList selectTaskList(Long currentUserId, String key, String start, String end, - String role, Integer page, Integer pageSize) throws Exception { - TaskVo.TaskCheckList taskCheckList = new TaskVo.TaskCheckList(); - List normalTaskList = new ArrayList<>(); - TaskVo.PageInfo pageInfo = new TaskVo.PageInfo(); - - //获取日期的开始结束时间 - Long startMillisTime = null; - Long endMillisTime = null; - Map timeMap = null; - if(StrUtil.isNotEmpty(start)){ - timeMap = DateUtil.projectFormatDateTime(start); - startMillisTime = timeMap.get("startMillisTime"); - } - if(StrUtil.isNotEmpty(end)){ - timeMap = DateUtil.projectFormatDateTime(start); - endMillisTime = timeMap.get("endMillisTime"); - } - //获取该用户关注的项目 - List projectList = attentionService.findProjectIdByUserId(currentUserId); - if(CollectionUtil.isNotEmpty(projectList)){ - if(StrUtil.isNotEmpty(role)) { - switch (role) { - case "创建者": - for (SysProject project : projectList) { - if (project.getCreatorId().longValue() == currentUserId.longValue()) { - List taskList = getTaskInfoByProjectIdAndUserId(project, currentUserId, startMillisTime, endMillisTime); - if (CollectionUtil.isNotEmpty(taskList)) { - normalTaskList.addAll(taskList); - } - } - } - break; - case "参与者": - for (SysProject project : projectList) { - if (project.getCreatorId().longValue() != currentUserId.longValue()) { - List taskList = getTaskInfoByProjectIdAndUserId(project, currentUserId, startMillisTime, endMillisTime); - if (CollectionUtil.isNotEmpty(taskList)) { - normalTaskList.addAll(taskList); - } - } - } - break; - default: - break; - } - }else { - for (SysProject project : projectList) { - List taskList = getTaskInfoByProjectIdAndUserId(project, currentUserId, startMillisTime, endMillisTime); - if (CollectionUtil.isNotEmpty(taskList)) { - normalTaskList.addAll(taskList); - } - } - } - } - //关键词模糊搜索 - if (StrUtil.isNotEmpty(key)) { - if (CollectionUtil.isNotEmpty(normalTaskList)) { - Iterator it = normalTaskList.iterator(); - while (it.hasNext()) { - TaskVo.NormalTask normalTask = it.next(); - if (!normalTask.getName().contains(key)) { - it.remove(); - } - } - } - } - - //业务分页 - List theNormalList = null; - int totalPages = 1; - if (CollectionUtil.isNotEmpty(normalTaskList)) { - //1.计算分页条件 - if (page > 0) { - int size = normalTaskList.size(); - totalPages = size / pageSize + 1; - int num = pageSize; - int startIndex = pageSize * (page - 1); - if (startIndex >= size) { - startIndex = -1; - } else { - if (startIndex + num > size) { - num = size - startIndex; - } - } - //拷贝分页数据 - if (startIndex >= 0) { - theNormalList = CollectionUtil.newArrayList(); - for (int i = startIndex; i < startIndex + num; i++) { - theNormalList.add(normalTaskList.get(i)); - } - } - } else { //不分页 - theNormalList = CollectionUtil.newArrayList(normalTaskList); - } - } - pageInfo.setCurrentPage(page); - pageInfo.setTotalPage(totalPages); - - taskCheckList.setNormalTaskList(theNormalList); - taskCheckList.setPageInfo(pageInfo); - return taskCheckList; - } - private List getTaskInfoByProjectIdAndUserId(SysProject project,Long userId, - Long startTime,Long endTime){ - List normalTaskList = new ArrayList<>(); - //获取用户的角色 - List roleList = proRoleService.getProRoleByProjectIdAndUserId(project.getId(),userId); - //获取“全体成员”角色 - ProRole allMember = proRoleService.getAllMember(project.getId()); - Long allMemberId = null; - if(ObjectUtil.isNotNull(allMember)) { - allMemberId = allMember.getId(); - } - if(CollectionUtil.isNotEmpty(roleList)) { - for(ProRole role:roleList) { - SysProject sysProject = sysProjectDao.selectByPrimaryKey(role.getProjectId()); - List taskList = - taskDetailDao.selectTaskByRoleAndAllMembers(project.getId(), role.getId(), allMemberId, startTime, endTime); - if(CollectionUtil.isNotEmpty(taskList)) { - for(TaskVo.NormalTask normalTask:taskList){ - ProRole proRole = proRoleDao.selectByPrimaryKey(normalTask.getExecutorRole()); - if(ObjectUtil.isNotNull(sysProject)) { - normalTask.setProjectId(sysProject.getId()); - normalTask.setProjectName(sysProject.getName()); - } - if(ObjectUtil.isNotNull(proRole)){ - normalTask.setExecutorRoleName(proRole.getName()); - } - } - normalTaskList.addAll(taskList); - } - } - } - return normalTaskList; - } - - /** - * 项目内的任务清单 - * - */ - @Override - public TaskVo.TaskCheckList selectTaskListByProject(Long projectId, Long currentUserId, Integer page, Integer pageSize, - String key, String start, String end, Long roleId) throws Exception { - TaskVo.TaskCheckList taskCheckList = new TaskVo.TaskCheckList(); - List normalTaskList = new ArrayList<>(); - TaskVo.PageInfo pageInfo = new TaskVo.PageInfo(); - - //获取日期的开始结束时间 - Long startMillisTime = null; - Long endMillisTime = null; - Map timeMap = null; - if(StrUtil.isNotEmpty(start)){ - timeMap = DateUtil.projectFormatDateTime(start); - startMillisTime = timeMap.get("startMillisTime"); - } - if(StrUtil.isNotEmpty(end)){ - timeMap = DateUtil.projectFormatDateTime(start); - endMillisTime = timeMap.get("endMillisTime"); - } - //获取项目 - SysProject sysProject = sysProjectDao.selectByPrimaryKey(projectId); - if(ObjectUtil.isNotNull(sysProject)) { - List taskList = getTaskInfoByProjectIdAndUserId(sysProject, currentUserId, startMillisTime, endMillisTime); - if (CollectionUtil.isNotEmpty(taskList)) { - normalTaskList.addAll(taskList); - } - } - //关键词模糊搜索 - if (StrUtil.isNotEmpty(key)) { - if (CollectionUtil.isNotEmpty(normalTaskList)) { - Iterator it = normalTaskList.iterator(); - while (it.hasNext()) { - TaskVo.NormalTask normalTask = it.next(); - if (!normalTask.getName().contains(key)) { - it.remove(); - } - } - } - } - //业务分页 - List theNormalList = null; - int totalPages = 1; - if (CollectionUtil.isNotEmpty(normalTaskList)) { - //1.计算分页条件 - if (page > 0) { - int size = normalTaskList.size(); - totalPages = size / pageSize + 1; - int num = pageSize; - int startIndex = pageSize * (page - 1); - if (startIndex >= size) { - startIndex = -1; - } else { - if (startIndex + num > size) { - num = size - startIndex; - } - } - //拷贝分页数据 - if (startIndex >= 0) { - theNormalList = CollectionUtil.newArrayList(); - for (int i = startIndex; i < startIndex + num; i++) { - theNormalList.add(normalTaskList.get(i)); - } - } - } else { //不分页 - theNormalList = CollectionUtil.newArrayList(normalTaskList); - } - } - pageInfo.setCurrentPage(page); - pageInfo.setTotalPage(totalPages); - - taskCheckList.setNormalTaskList(theNormalList); - taskCheckList.setPageInfo(pageInfo); - return taskCheckList; - } - - /** - * 任务模糊搜索 - */ - @Override - public List getTaskDetailByKey(Long currentUserId, Long projectId, String key) { - List taskDetailByKeyList = taskDetailDao.selectTaskByKey(currentUserId,projectId,key); - return taskDetailByKeyList; - } - - /** - * 查询子任务最早的一条 - */ - @Override - public TaskVo.NormalTask selectTaskByParentId(Long parentId,Long startTime, Long endTime){ - TaskVo.NormalTask normalTask = taskDetailDao.selectTaskByParentIdAndTime(parentId,startTime,endTime); - return normalTask; - } - - //=================================================================== - - /** - * 删除角色下的所有任务相关(taskDetail，taskSubTime，taskMember，plugin) - * @param roleId - */ - @Override - public void deleteTaskByRoleId(Long roleId) { -// taskDetailDao.deleteTaskByRoleId(roleId); - } - - /** - * 删除任务和所有相关信息 - */ - private void deleteTaskById(Long taskId){ - //删除交付物 - taskDeliverService.deleteDeliverByTaskId(taskId); - } -} +package com.ccsens.tall.service; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.ccsens.tall.bean.po.*; +import com.ccsens.tall.bean.vo.TaskVo; +import com.ccsens.tall.persist.dao.*; +import com.ccsens.tall.util.TaskUtil; +import com.ccsens.util.CodeEnum; +import com.ccsens.util.DateUtil; +import com.ccsens.util.WebConstant; +import com.ccsens.util.exception.BaseException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; + + +@Service +@Transactional(propagation = Propagation.REQUIRED) +public class ProTaskDetailService implements IProTaskDetailService { + @Autowired + private IProRoleService proRoleService; + @Autowired + private ITaskDeliverService taskDeliverService; + @Autowired + private IUserAttentionService attentionService; + @Autowired + private ITaskPluginService pluginService; + @Autowired + private IProMemberService proMemberService; + @Autowired + private TaskDetailDao taskDetailDao; + @Autowired + private TaskSubTimeDao taskSubTimeDao; + @Autowired + private TaskMemberDao taskMemberDao; + @Autowired + private ProSubTimeMemberDao proSubTimeMemberDao; + @Autowired + private ProRoleDao proRoleDao; + @Autowired + private ProMemberDao proMemberDao; + @Autowired + private SysProjectDao sysProjectDao; + + @Override + public void saveTaskDetail(ProTaskDetail taskDetail) { + taskDetailDao.insertSelective(taskDetail); + } + + @Override + public Object getTasksByRoleId(Long currentUserId, Long projectId, Long roleId, Long startTime, Long endTime, Integer process, Integer page, Integer pageSize) throws Exception { + SysProject sysProject = sysProjectDao.selectByPrimaryKey(projectId); + if(ObjectUtil.isNull(sysProject)){ + throw new BaseException(CodeEnum.NOT_PROJECT); + } + startTime = startTime == null ? sysProject.getBeginTime() : startTime; + endTime = endTime == null ? sysProject.getEndTime() : endTime; + + Object obj = null; + ProRole role = proRoleDao.selectByPrimaryKey(roleId); + if(ObjectUtil.isNull(role)){ + throw new BaseException(CodeEnum.NOT_ROLE); + } + ProRole parentRole = proRoleDao.selectByPrimaryKey(role.getParentId()); + if(ObjectUtil.isNull(parentRole)){ + throw new BaseException(CodeEnum.NOT_ROLE); + } + if(ObjectUtil.isNotNull(role)) { + if (role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.MVP.value)) { + obj = getTaskInfoByMvp(projectId, page, pageSize); + } else if (parentRole.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.PM.value)) { + obj = getTaskInfoByProjectIdAndPM(currentUserId,projectId, startTime, endTime, process, page, pageSize); + } else if (parentRole.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.Member.value)) { + obj = getTaskInfoByProjectIdAndRoleId(currentUserId, projectId, roleId, startTime, endTime, process, page, pageSize); + } + }else { + throw new BaseException(CodeEnum.NOT_ROLE); + } + return obj; + } + + /** + * 查看任务 项目经理 + */ + private TaskVo.ProTaskInfo getTaskInfoByProjectIdAndPM(Long currentUserId, Long projectId, Long startTime, Long endTime, Integer process, Integer page, Integer pageSize) throws Exception { + TaskVo.ProTaskInfo proTaskInfo = new TaskVo.ProTaskInfo(); + List globalTaskList = new ArrayList<>(); + List normalTaskList = new ArrayList<>(); + TaskVo.GlobalTask globalTask = null; + TaskVo.NormalTask normalTask = null; + //1、查找一级任务 + SysProject project = sysProjectDao.selectByPrimaryKey(projectId); + if(endTime < project.getBeginTime() || startTime > project.getEndTime()){ + return proTaskInfo; + } + ProTaskDetailExample proTaskDetailExample = new ProTaskDetailExample(); + proTaskDetailExample.createCriteria().andProjectIdEqualTo(projectId).andLevelEqualTo((byte) 1); + List firstTaskDetailList = taskDetailDao.selectByExample(proTaskDetailExample); + if(CollectionUtil.isNotEmpty(firstTaskDetailList)){ + int sequence = 1; + for(ProTaskDetail firstTaskDetail:firstTaskDetailList){ + normalTask = new TaskVo.NormalTask(); + BeanUtil.copyProperties(firstTaskDetail,normalTask); + normalTask.setDetailId(firstTaskDetail.getId()); + normalTask.setId(null); + normalTask.setSequence(sequence); + //查找一级任务下的二级任务 + List secondNormalTaskList = taskDetailDao.selectNormalTaskListByPM(projectId,firstTaskDetail.getId(),startTime,endTime); + if(CollectionUtil.isNotEmpty(secondNormalTaskList)){ + for(TaskVo.NormalTask task:secondNormalTaskList){ + ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId,task.getId()); + if(ObjectUtil.isNotNull(subTimeMember)){ + task.setRealEndTime(subTimeMember.getRealFinishTime()); + task.setProcess(subTimeMember.getComplatedStatus()); + } + } + TaskUtil.Task task = TaskUtil.splitTask(secondNormalTaskList,startTime,endTime,process); + if(CollectionUtil.isNotEmpty(task.getGlobalTask())){ + for(TaskVo.NormalTask global:task.getGlobalTask()){ + globalTask = new TaskVo.GlobalTask(); + BeanUtil.copyProperties(global,globalTask); + globalTaskList.add(globalTask); + } + } + if(CollectionUtil.isNotEmpty(task.getCommonTask())){ + normalTask.setSecondTasks(new ArrayList<>()); + normalTask.getSecondTasks().addAll(task.getCommonTask()); + } + } +// if(CollectionUtil.isNotEmpty(normalTask.getSecondTasks())) { + normalTaskList.add(normalTask); + sequence++; +// } + } + } + TaskVo.PageInfo pageInfo = new TaskVo.PageInfo(); + pageInfo.setTotalPage(page); + pageInfo.setCurrentPage(page); + + proTaskInfo.setPageInfo(pageInfo); + proTaskInfo.setGlobalTaskList(globalTaskList); + proTaskInfo.setNormalTaskList(normalTaskList); + return proTaskInfo; + } + /** + * 查看任务 项目成员 + */ + private TaskVo.ProTaskInfo getTaskInfoByProjectIdAndRoleId(Long currentUserId, Long projectId, Long roleId, Long startTime, Long endTime, Integer process, Integer page, Integer pageSize) throws Exception { + TaskVo.ProTaskInfo proTaskInfo = new TaskVo.ProTaskInfo(); + List globalTaskList = new ArrayList<>(); + List normalTaskList = new ArrayList<>(); + TaskVo.GlobalTask globalTask = null; + //获取“全体成员”角色 + ProRole allMember = proRoleService.getAllMember(projectId); + Long allMemberId = null; + if(ObjectUtil.isNotNull(allMember)) { + allMemberId = allMember.getId(); + } + //查找该角色的所有任务(全体成员的任务也是这个角色的任务） + List secondTaskVoList = taskDetailDao.selectTaskByRoleAndAllMembers(projectId, roleId, allMemberId,startTime,endTime); + if(CollectionUtil.isNotEmpty(secondTaskVoList)){ + for(TaskVo.NormalTask normalTask:secondTaskVoList){ + ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId,normalTask.getId()); + if(ObjectUtil.isNotNull(subTimeMember)){ + normalTask.setProcess(subTimeMember.getComplatedStatus()); + normalTask.setRealEndTime(subTimeMember.getRealFinishTime()); + } + } + TaskUtil.Task task = TaskUtil.splitTask(secondTaskVoList,startTime,endTime,process); + if(CollectionUtil.isNotEmpty(task.getGlobalTask())){ + for(TaskVo.NormalTask global:task.getGlobalTask()){ + globalTask = new TaskVo.GlobalTask(); + BeanUtil.copyProperties(global,globalTask); + globalTaskList.add(globalTask); + } + } + if(CollectionUtil.isNotEmpty(task.getCommonTask())){ + normalTaskList = sortTaskTime(task.getCommonTask()); + } + } + + //2.业务层分页 + List theNormalTaskList = null; + int totalPages = 1; + if (CollectionUtil.isNotEmpty(normalTaskList)) { + //1.计算分页条件 + if (page > 0) { + int size = normalTaskList.size(); + totalPages = size / pageSize + 1; + int num = pageSize; + int startIndex = pageSize * (page - 1); + if (startIndex >= size) { + startIndex = -1; + } else { + if (startIndex + num > size) { + num = size - startIndex; + } + } + //拷贝分页数据 + if (startIndex >= 0) { + theNormalTaskList = CollectionUtil.newArrayList(); + for (int i = startIndex; i < startIndex + num; i++) { + theNormalTaskList.add(normalTaskList.get(i)); + } + } + } else { //不分页 + page = 1; + theNormalTaskList = CollectionUtil.newArrayList(normalTaskList); + } + } + TaskVo.PageInfo pageInfo = new TaskVo.PageInfo(); + pageInfo.setTotalPage(totalPages); + pageInfo.setCurrentPage(page); + + proTaskInfo.setPageInfo(pageInfo); + proTaskInfo.setGlobalTaskList(globalTaskList); + proTaskInfo.setNormalTaskList(theNormalTaskList); + return proTaskInfo; + } + private List sortTaskTime(List commonTask) { + List normalTaskList = new ArrayList<>(); + List secondTaskVoList = null; + Set longSet = new HashSet<>(); + List timeList = new ArrayList<>(); + if (CollectionUtil.isNotEmpty(commonTask)) { + for (TaskVo.NormalTask secondTaskVo : commonTask) { + longSet.add(secondTaskVo.getBeginTime()); + longSet.add(secondTaskVo.getEndTime()); + } + timeList.addAll(longSet); + for (int i = 0; i < timeList.size(); i++) { + for (int j = 0; j < timeList.size() - i - 1; j++) { + if (timeList.get(j) > timeList.get(j + 1)) { + Long r = timeList.get(j); + timeList.set(j, timeList.get(j + 1)); + timeList.set(j + 1, r); + } + } + } + int sequence = 1; + for (int i = 0; i < timeList.size() - 1; i++) { + TaskVo.NormalTask normalTask = null; + secondTaskVoList = new ArrayList<>(); + Long startTime = timeList.get(i); + Long endTime = timeList.get(i + 1); + + for (TaskVo.NormalTask secondTaskVo : commonTask) { + if(secondTaskVo.getTimeStatus() == 1){ + if(secondTaskVo.getBeginTime().longValue() == startTime.longValue()) { + normalTask = new TaskVo.NormalTask(); + BeanUtil.copyProperties(secondTaskVo, normalTask); + normalTask.setEndTime(null); + normalTask.setSequence(sequence); + sequence++; + normalTaskList.add(normalTask); + } + continue; + } + if(secondTaskVo.getTimeStatus() == 2){ + if(secondTaskVo.getEndTime().longValue() == endTime.longValue()) { + normalTask = new TaskVo.NormalTask(); + BeanUtil.copyProperties(secondTaskVo, normalTask); + normalTask.setBeginTime(null); + normalTask.setSequence(sequence); + sequence++; + normalTaskList.add(normalTask); + } + continue; + } + if (secondTaskVo.getBeginTime() < startTime && secondTaskVo.getEndTime() <= endTime && secondTaskVo.getEndTime() > startTime) { + secondTaskVo.setBeginTime(startTime); + secondTaskVoList.add(secondTaskVo); + } else if (secondTaskVo.getBeginTime() >= startTime && secondTaskVo.getEndTime() <= endTime) { + secondTaskVoList.add(secondTaskVo); + } else if (secondTaskVo.getBeginTime() >= startTime && secondTaskVo.getBeginTime() < endTime && secondTaskVo.getEndTime() > endTime) { + secondTaskVo.setEndTime(endTime); + secondTaskVoList.add(secondTaskVo); + } else if (secondTaskVo.getBeginTime() < startTime && secondTaskVo.getEndTime() > endTime) { + secondTaskVo.setBeginTime(startTime); + secondTaskVo.setEndTime(endTime); + secondTaskVoList.add(secondTaskVo); + } + } + if (CollectionUtil.isNotEmpty(secondTaskVoList)) { + if (secondTaskVoList.size() == 1) { + normalTask = new TaskVo.NormalTask(); + BeanUtil.copyProperties(secondTaskVoList.get(0), normalTask); + normalTask.setSequence(sequence); + sequence++; + normalTaskList.add(normalTask); + } else { + normalTask = new TaskVo.NormalTask(); + normalTask.setBeginTime(startTime); + normalTask.setEndTime(endTime); + normalTask.setSecondTasks(secondTaskVoList); + normalTask.setSequence(sequence); + sequence++; + normalTaskList.add(normalTask); + } + } + } + } + return normalTaskList; + } + + /** + * 点击MVP查看交付物 + */ + private TaskVo.ProTaskInfoByMVP getTaskInfoByMvp(Long projectId, Integer page, Integer pageSize) { + TaskVo.PageInfo pageInfo = new TaskVo.PageInfo(); + TaskVo.ProTaskInfoByMVP proTaskInfoByMVP = new TaskVo.ProTaskInfoByMVP(); + List taskDeliverByMVPList = new ArrayList<>(); + TaskVo.TaskDeliverByMVP taskDeliverByMVP = null; + List firstTasks =new ArrayList<>(); + TaskVo.FirstTask firstProTask = null; + //查找项目下的一级任务 + ProTaskDetailExample firstTaskExample = new ProTaskDetailExample(); + firstTaskExample.createCriteria().andProjectIdEqualTo(projectId).andVirtualEqualTo((byte) WebConstant.TASK_VIRTUAL.Normal.value).andParentIdEqualTo(0L); + List firstTaskList = taskDetailDao.selectByExample(firstTaskExample); + if(CollectionUtil.isNotEmpty(firstTaskList)){ + for(ProTaskDetail firstTask:firstTaskList){ + taskDeliverByMVPList = new ArrayList<>(); + //查找项目下所有的二级任务 + ProTaskDetailExample taskExample = new ProTaskDetailExample(); + taskExample.createCriteria().andProjectIdEqualTo(projectId).andVirtualEqualTo((byte) WebConstant.TASK_VIRTUAL.Normal.value).andParentIdEqualTo(firstTask.getId()); + List taskList = taskDetailDao.selectByExample(taskExample); + if (CollectionUtil.isNotEmpty(taskList)) { + for (ProTaskDetail task : taskList) { + + taskDeliverByMVP = new TaskVo.TaskDeliverByMVP(); + taskDeliverByMVP.setId(task.getId()); + taskDeliverByMVP.setName(task.getName()); + //负责人信息 + TaskVo.RoleCheckList roleCheckList = proRoleService.selectRoleByCheckOrExecutor(task.getExecutorRole()); + if (ObjectUtil.isNotNull(roleCheckList)) { + List roleCheckListList = new ArrayList<>(); + if (roleCheckList.getName().equals(WebConstant.ROLE_NAME.AllMember.phase)) { + roleCheckListList = proRoleDao.findAll(projectId); + } else { + roleCheckListList.add(roleCheckList); + } + taskDeliverByMVP.setRoles(roleCheckListList); + } + //检查人信息 + taskDeliverByMVP.setChecker(proRoleService.selectRoleByCheckOrExecutor(task.getCheckerRole())); + //查找任务下的交付物 + taskDeliverByMVP.setDelivers(taskDeliverService.selectDeliverOrInputByTask(task.getId(), 0)); + //查找任务的输入文档 + taskDeliverByMVP.setInputs(taskDeliverService.selectDeliverOrInputByTask(task.getId(), 1)); + + taskDeliverByMVPList.add(taskDeliverByMVP); + } + } + firstProTask = new TaskVo.FirstTask(); + firstProTask.setId(firstTask.getId()); + firstProTask.setName(firstTask.getName()); + firstProTask.setTaskDeliverByMVP(taskDeliverByMVPList); + firstTasks.add(firstProTask); + } + } + + proTaskInfoByMVP.setFirstTaskList(firstTasks); + return proTaskInfoByMVP; + } + + /** + *通过任务id查任务详情 + */ + @Override + public TaskVo.NormalTask getTaskInfoByTaskId(Long currentUserId, Long projectId, Long taskId) throws Exception { + ProTaskSubTime subTime = taskSubTimeDao.selectByPrimaryKey(taskId); + TaskVo.NormalTask taskDetail = null; + if(ObjectUtil.isNotNull(subTime)) { + taskDetail = taskDetailDao.selectTaskByTaskId(subTime.getId(),subTime.getTaskDetailId()); + //修改任务的完成状态 + ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId,taskDetail.getId()); + if(ObjectUtil.isNotNull(subTimeMember)){ + taskDetail.setProcess(subTimeMember.getComplatedStatus()); + taskDetail.setRealEndTime(subTimeMember.getRealFinishTime()); + } + //添加项目信息和插件信息 + normalTaskAddPlugin(currentUserId,subTime.getTaskDetailId(),taskDetail); + if (ObjectUtil.isNotNull(taskDetail)) { + List groupTaskList = new ArrayList<>(); + groupTaskList = taskDetailDao.selectTaskByParentId(projectId, taskDetail.getDetailId()); + if (CollectionUtil.isNotEmpty(groupTaskList)) { + for(TaskVo.NormalTask groupTask:groupTaskList){ + //修改任务的完成状态 + ProSubTimeMember proSubTimeMember = getProcessByUserIdAndTask(currentUserId,groupTask.getId()); + if(ObjectUtil.isNotNull(proSubTimeMember)){ + groupTask.setProcess(proSubTimeMember.getComplatedStatus()); + groupTask.setRealEndTime(proSubTimeMember.getRealFinishTime()); + } + //添加项目信息和插件信息 + normalTaskAddPlugin(currentUserId,groupTask.getDetailId(),groupTask); + //修改返回时子任务的名字（“任务名+（xx和XX）”） + ProTaskDetail proTaskDetail = taskDetailDao.selectByPrimaryKey(groupTask.getDetailId()); + if(proTaskDetail.getAllMember()==0){ + groupTask.setName(updateSubTaskName(groupTask.getDetailId(),groupTask.getName())); + } + + } + taskDetail.setSecondTasks(new ArrayList<>()); + taskDetail.getSecondTasks().addAll(groupTaskList); + } + } + } + return taskDetail; + } + private void normalTaskAddPlugin(Long userId,Long taskId,TaskVo.NormalTask normalTask) throws Exception { + ProTaskDetail task = taskDetailDao.selectByPrimaryKey(taskId); + //添加项目信息 + SysProject project = sysProjectDao.selectByPrimaryKey(task.getProjectId()); + if(ObjectUtil.isNotNull(project)){ + normalTask.setProjectId(project.getId()); + normalTask.setProjectName(project.getName()); + } + ProRole role = proRoleDao.selectByPrimaryKey(normalTask.getExecutorRole()); + if(ObjectUtil.isNotNull(role)){ + normalTask.setExecutorRoleName(role.getName()); + } + //添加插件 + List pluginVoList = pluginService.getPluginByTask(task.getId(),userId); + normalTask.setPlugins(new ArrayList<>()); + normalTask.getPlugins().addAll(pluginVoList); + } + /** + * 修改返回时子任务的名字 格式：“任务名+（xx和XX）” + */ + private String updateSubTaskName(Long taskId,String taskName){ + String name = taskName + "("; + ProTaskMemberExample taskMemberExample = new ProTaskMemberExample(); + taskMemberExample.createCriteria().andTaskDetailIdEqualTo(taskId); + List taskMemberList = taskMemberDao.selectByExample(taskMemberExample); + if(CollectionUtil.isNotEmpty(taskMemberList)){ + for(int i = 0;i < taskMemberList.size();i++){ + ProMember member = proMemberDao.selectByPrimaryKey(taskMemberList.get(i).getMemberId()); + if(ObjectUtil.isNotNull(member)){ + name += member.getNickname(); + if(i != taskMemberList.size()-1){ + name += "和"; + } + } + } + } + name = name + ")"; + return name; + } + + /** + * 任务清单 + */ + @Override + public TaskVo.TaskCheckList selectTaskList(Long currentUserId, String key, String start, String end, + String role, Integer page, Integer pageSize) throws Exception { + TaskVo.TaskCheckList taskCheckList = new TaskVo.TaskCheckList(); + List normalTaskList = new ArrayList<>(); + TaskVo.PageInfo pageInfo = new TaskVo.PageInfo(); + + //获取日期的开始结束时间 + Long startMillisTime = null; + Long endMillisTime = null; + Map timeMap = null; + if(StrUtil.isNotEmpty(start)){ + timeMap = DateUtil.projectFormatDateTime(start); + startMillisTime = timeMap.get("startMillisTime"); + } + if(StrUtil.isNotEmpty(end)){ + timeMap = DateUtil.projectFormatDateTime(start); + endMillisTime = timeMap.get("endMillisTime"); + } + //获取该用户关注的项目 + List projectList = attentionService.findProjectIdByUserId(currentUserId); + if(CollectionUtil.isNotEmpty(projectList)){ + if(StrUtil.isNotEmpty(role)) { + switch (role) { + case "创建者": + for (SysProject project : projectList) { + if (project.getCreatorId().longValue() == currentUserId.longValue()) { + List taskList = getTaskInfoByProjectIdAndUserId(project, currentUserId, startMillisTime, endMillisTime); + if (CollectionUtil.isNotEmpty(taskList)) { + normalTaskList.addAll(taskList); + } + } + } + break; + case "参与者": + for (SysProject project : projectList) { + if (project.getCreatorId().longValue() != currentUserId.longValue()) { + List taskList = getTaskInfoByProjectIdAndUserId(project, currentUserId, startMillisTime, endMillisTime); + if (CollectionUtil.isNotEmpty(taskList)) { + normalTaskList.addAll(taskList); + } + } + } + break; + default: + break; + } + }else { + for (SysProject project : projectList) { + List taskList = getTaskInfoByProjectIdAndUserId(project, currentUserId, startMillisTime, endMillisTime); + if (CollectionUtil.isNotEmpty(taskList)) { + normalTaskList.addAll(taskList); + } + } + } + } + //关键词模糊搜索 + if (StrUtil.isNotEmpty(key)) { + if (CollectionUtil.isNotEmpty(normalTaskList)) { + Iterator it = normalTaskList.iterator(); + while (it.hasNext()) { + TaskVo.NormalTask normalTask = it.next(); + if (!normalTask.getName().contains(key)) { + it.remove(); + } + } + } + } + + //业务分页 + List theNormalList = null; + int totalPages = 1; + if (CollectionUtil.isNotEmpty(normalTaskList)) { + //1.计算分页条件 + if (page > 0) { + int size = normalTaskList.size(); + totalPages = size / pageSize + 1; + int num = pageSize; + int startIndex = pageSize * (page - 1); + if (startIndex >= size) { + startIndex = -1; + } else { + if (startIndex + num > size) { + num = size - startIndex; + } + } + //拷贝分页数据 + if (startIndex >= 0) { + theNormalList = CollectionUtil.newArrayList(); + for (int i = startIndex; i < startIndex + num; i++) { + theNormalList.add(normalTaskList.get(i)); + } + } + } else { //不分页 + theNormalList = CollectionUtil.newArrayList(normalTaskList); + } + } + pageInfo.setCurrentPage(page); + pageInfo.setTotalPage(totalPages); + + taskCheckList.setNormalTaskList(theNormalList); + taskCheckList.setPageInfo(pageInfo); + return taskCheckList; + } + private List getTaskInfoByProjectIdAndUserId(SysProject project, Long userId, + Long startTime, Long endTime) throws Exception { + List normalTaskList = new ArrayList<>(); + //获取用户的角色 + List roleList = proRoleService.getProRoleByProjectIdAndUserId(project.getId(),userId); + //获取“全体成员”角色 + ProRole allMember = proRoleService.getAllMember(project.getId()); + Long allMemberId = null; + if(ObjectUtil.isNotNull(allMember)) { + allMemberId = allMember.getId(); + } + if(CollectionUtil.isNotEmpty(roleList)) { + for(ProRole role:roleList) { + SysProject sysProject = sysProjectDao.selectByPrimaryKey(role.getProjectId()); + List taskList = + taskDetailDao.selectTaskByRoleAndAllMembers(project.getId(), role.getId(), allMemberId, startTime, endTime); + if(CollectionUtil.isNotEmpty(taskList)) { + for(TaskVo.NormalTask normalTask:taskList){ + //修改任务的完成状态 + ProSubTimeMember proSubTimeMember = getProcessByUserIdAndTask(userId,normalTask.getId()); + if(ObjectUtil.isNotNull(proSubTimeMember)){ + normalTask.setProcess(proSubTimeMember.getComplatedStatus()); + normalTask.setRealEndTime(proSubTimeMember.getRealFinishTime()); + } + ProRole proRole = proRoleDao.selectByPrimaryKey(normalTask.getExecutorRole()); + if(ObjectUtil.isNotNull(sysProject)) { + normalTask.setProjectId(sysProject.getId()); + normalTask.setProjectName(sysProject.getName()); + } + if(ObjectUtil.isNotNull(proRole)){ + normalTask.setExecutorRoleName(proRole.getName()); + } + } + normalTaskList.addAll(taskList); + } + } + } + return normalTaskList; + } + + /** + * 项目内的任务清单 + * + */ + @Override + public TaskVo.TaskCheckList selectTaskListByProject(Long projectId, Long currentUserId, Integer page, Integer pageSize, + String key, String start, String end, Long roleId) throws Exception { + TaskVo.TaskCheckList taskCheckList = new TaskVo.TaskCheckList(); + List normalTaskList = new ArrayList<>(); + TaskVo.PageInfo pageInfo = new TaskVo.PageInfo(); + + //获取日期的开始结束时间 + Long startMillisTime = null; + Long endMillisTime = null; + Map timeMap = null; + if(StrUtil.isNotEmpty(start)){ + timeMap = DateUtil.projectFormatDateTime(start); + startMillisTime = timeMap.get("startMillisTime"); + } + if(StrUtil.isNotEmpty(end)){ + timeMap = DateUtil.projectFormatDateTime(start); + endMillisTime = timeMap.get("endMillisTime"); + } + //获取项目 + SysProject sysProject = sysProjectDao.selectByPrimaryKey(projectId); + if(ObjectUtil.isNotNull(sysProject)) { + List taskList = getTaskInfoByProjectIdAndUserId(sysProject, currentUserId, startMillisTime, endMillisTime); + if (CollectionUtil.isNotEmpty(taskList)) { + normalTaskList.addAll(taskList); + } + } + //关键词模糊搜索 + if (StrUtil.isNotEmpty(key)) { + if (CollectionUtil.isNotEmpty(normalTaskList)) { + Iterator it = normalTaskList.iterator(); + while (it.hasNext()) { + TaskVo.NormalTask normalTask = it.next(); + if (!normalTask.getName().contains(key)) { + it.remove(); + } + } + } + } + //业务分页 + List theNormalList = null; + int totalPages = 1; + if (CollectionUtil.isNotEmpty(normalTaskList)) { + //1.计算分页条件 + if (page > 0) { + int size = normalTaskList.size(); + totalPages = size / pageSize + 1; + int num = pageSize; + int startIndex = pageSize * (page - 1); + if (startIndex >= size) { + startIndex = -1; + } else { + if (startIndex + num > size) { + num = size - startIndex; + } + } + //拷贝分页数据 + if (startIndex >= 0) { + theNormalList = CollectionUtil.newArrayList(); + for (int i = startIndex; i < startIndex + num; i++) { + theNormalList.add(normalTaskList.get(i)); + } + } + } else { //不分页 + theNormalList = CollectionUtil.newArrayList(normalTaskList); + } + } + pageInfo.setCurrentPage(page); + pageInfo.setTotalPage(totalPages); + + taskCheckList.setNormalTaskList(theNormalList); + taskCheckList.setPageInfo(pageInfo); + return taskCheckList; + } + + /** + * 任务模糊搜索 + */ + @Override + public List getTaskDetailByKey(Long currentUserId, Long projectId, String key) { + List taskDetailByKeyList = taskDetailDao.selectTaskByKey(currentUserId,projectId,key); + return taskDetailByKeyList; + } + + /** + * 查询子任务最早的一条 + */ + @Override + public TaskVo.NormalTask selectTaskByParentId(Long parentId, Long startTime, Long endTime){ + TaskVo.NormalTask normalTask = taskDetailDao.selectTaskByParentIdAndTime(parentId,startTime,endTime); + return normalTask; + } + + /** + * 查看任务的完成状态 + */ + private ProSubTimeMember getProcessByUserIdAndTask(Long userId, Long subTimeId) throws Exception { + ProSubTimeMember subTimeMember = null; + ProTaskSubTime subTime = taskSubTimeDao.selectByPrimaryKey(subTimeId); + ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(subTime.getTaskDetailId()); + if(taskDetail.getFinishNeedAll()==0){ + ProSubTimeMemberExample subTimeMemberExample = new ProSubTimeMemberExample(); + subTimeMemberExample.createCriteria().andTaskSubTimeIdEqualTo(subTimeId).andComplatedStatusEqualTo(2); + subTimeMemberExample.setOrderByClause("real_finish_time DESC"); + List subTimeMemberList = proSubTimeMemberDao.selectByExample(subTimeMemberExample); + if(CollectionUtil.isNotEmpty(subTimeMemberList)){ + subTimeMember = subTimeMemberList.get(0); + } + }else { + //查找此用户在任务下的成员 + ProMember porMember = proMemberService.selectByUserId(userId,taskDetail.getProjectId()); + //该用户是否是任务的负责人 + ProRole role = proRoleDao.selectByPrimaryKey(taskDetail.getExecutorRole()); + Boolean isBelongRole = proMemberService.userIsBelongRole(userId, role.getId()); + if (role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase) || isBelongRole) { + ProSubTimeMemberExample subTimeMemberExample = new ProSubTimeMemberExample(); + subTimeMemberExample.createCriteria().andTaskSubTimeIdEqualTo(subTimeId) + .andMemberIdEqualTo(porMember.getId()).andComplatedStatusEqualTo(2); + List subTimeMemberList = proSubTimeMemberDao.selectByExample(subTimeMemberExample); + if (CollectionUtil.isNotEmpty(subTimeMemberList)) { + subTimeMember = subTimeMemberList.get(0); + } + }else { + //查找任务负责人下的所有成员 + List memberList = proMemberService.selectByRole(taskDetail.getExecutorRole()); + if (CollectionUtil.isNotEmpty(memberList)) { + for (ProMember member : memberList) { + ProSubTimeMemberExample subTimeMemberExample = new ProSubTimeMemberExample(); + subTimeMemberExample.createCriteria().andTaskSubTimeIdEqualTo(subTimeId) + .andMemberIdEqualTo(member.getId()).andComplatedStatusEqualTo(2); + subTimeMemberExample.setOrderByClause("real_finish_time"); + List subTimeMemberList = proSubTimeMemberDao.selectByExample(subTimeMemberExample); + if (CollectionUtil.isEmpty(subTimeMemberList)) { + break; + } + subTimeMember = subTimeMemberList.get(0); + } + } + } + } + return subTimeMember; + } + + //=================================================================== + + /** + * 删除角色下的所有任务相关(taskDetail，taskSubTime，taskMember，plugin) + * @param roleId + */ + @Override + public void deleteTaskByRoleId(Long roleId) { +// taskDetailDao.deleteTaskByRoleId(roleId); + } + + /** + * 删除任务和所有相关信息 + */ + private void deleteTaskById(Long taskId){ + //删除交付物 + taskDeliverService.deleteDeliverByTaskId(taskId); + } +} diff --git a/tall/src/main/java/com/ccsens/tall/service/ProjectService.java b/tall/src/main/java/com/ccsens/tall/service/ProjectService.java index 6b8fd431..4d102da4 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProjectService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProjectService.java @@ -1,582 +1,587 @@ -package com.ccsens.tall.service; - -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.lang.Snowflake; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.ccsens.tall.bean.po.*; -import com.ccsens.tall.bean.vo.ProjectVo; -import com.ccsens.tall.persist.dao.*; -import com.ccsens.util.CodeEnum; -import com.ccsens.util.DateUtil; -import com.ccsens.util.WebConstant; -import com.ccsens.util.cron.CronConstant; -import com.ccsens.util.cron.NatureToDate; -import com.ccsens.util.exception.BaseException; -import com.github.pagehelper.PageHelper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -import java.text.SimpleDateFormat; -import java.util.*; - -@Service -@Transactional(propagation = Propagation.REQUIRED) -public class ProjectService implements IProjectService{ - @Autowired - private SysProjectDao sysProjectDao; - @Autowired - private ProRoleExecludeDao roleExecludeDao; - @Autowired - private ProRoleDao proRoleDao; - @Autowired - private TaskDetailDao taskDetailDao; - @Autowired - private TaskSubTimeDao taskSubTimeDao; - @Autowired - private UserAttentionDao attentionDao; - @Autowired - private TaskPluginDao pluginDao; - @Autowired - private TaskDeliverDao taskDeliverDao; - @Autowired - private IProRoleService proRoleService; - @Autowired - private Snowflake snowflake; - - @Override - public void saveProject(SysProject sysProject) { - sysProjectDao.insertSelective(sysProject); - } - - @Override - public void updateProject(SysProject project) { - sysProjectDao.updateByPrimaryKeySelective(project); - } - - /** - * 根据名字查找此用户创建的项目 - * @param subProject - * @param currentUserId - * @return - */ - @Override - public SysProject selectByNameAndUserId(String subProject, Long currentUserId) throws Exception{ - SysProject project = new SysProject(); - SysProjectExample projectExample = new SysProjectExample(); - projectExample.createCriteria().andCreatorIdEqualTo(currentUserId).andNameEqualTo(subProject); - List projectList = sysProjectDao.selectByExample(projectExample); - if (CollectionUtil.isNotEmpty(projectList)) { - project = projectList.get(0); - } - return project; - } - - /** - * 查找本月哪一天有项目 - * @param currentUserId - * @param date - * @return - */ - @Override - public List haveProjectDay(Long currentUserId, String date) throws Exception { - List dateList = new ArrayList<>(); - //获取日期的开始结束时间 - Map timeMap = new HashMap<>(); - timeMap = DateUtil.projectFormatDateTime(date); - Long startMillisTime = timeMap.get("startMillisTime"); - Long endMillisTime = timeMap.get("endMillisTime"); - //查找此用户关注的项目 - List projectList = sysProjectDao.findProjectIdByUserId(currentUserId,startMillisTime,endMillisTime); - if(CollectionUtil.isNotEmpty(projectList)){ - for(SysProject sysProject:projectList){ - startMillisTime = sysProject.getBeginTime() > startMillisTime ? sysProject.getBeginTime() : startMillisTime; - endMillisTime = sysProject.getEndTime() < endMillisTime ? sysProject.getEndTime() : endMillisTime; - dateList = getTimeList(dateList,startMillisTime,endMillisTime); - } - } - return dateList; - } - private List getTimeList(List dateList, Long startTime,Long endTime){ - SimpleDateFormat sdf = new SimpleDateFormat("dd"); - Date s = new Date(startTime); - Date e = new Date(endTime); - - Calendar min = Calendar.getInstance(); - Calendar max = Calendar.getInstance(); - min.setTime(s); - max.setTime(e); - Calendar curr = min; - while (curr.before(max)) { - for(String str:dateList){ - if(!sdf.format(min.getTime()).equalsIgnoreCase(str)){ - dateList.add(sdf.format(min.getTime())); - } - } - curr.add(Calendar.DATE, 1); - } - return dateList; - } - - /** - * 根据用户和日期查找项目 - * @param currentUserId - * @param date - * @return - * @throws Exception - */ - @Override - public List getProjectInfo(Long currentUserId, String date) throws Exception { - List projectInfoList = new ArrayList<>(); - //获取日期的开始结束时间 - Map timeMap = new HashMap<>(); - timeMap = DateUtil.projectFormatDateTime(date); - Long startMillisTime = timeMap.get("startMillisTime"); - Long endMillisTime = timeMap.get("endMillisTime"); - //查找此用户关注的项目 - List projectList = sysProjectDao.findProjectIdByUserId(currentUserId,startMillisTime,endMillisTime); - projectInfoList = projectInfoByProject(projectList,currentUserId); -// if(CollectionUtil.isNotEmpty(projectList)){ -// ProjectVo.ProjectInfo projectInfo = null; -// for(SysProject project:projectList){ -// projectInfo = new ProjectVo.ProjectInfo(); -// BeanUtil.copyProperties(project,projectInfo); -// projectInfo.setCreator(false); -// projectInfo.setRoles(new ArrayList<>()); -// //是否是创建者 -// if(project.getCreatorId().longValue()==currentUserId.longValue()){ -// projectInfo.getRoles().add(WebConstant.ROLE_NAME.Creator.phase); -// projectInfo.setCreator(true); -// } -// //本用户在项目中的角色 -// List proRoles = proRoleService.getProRoleByProjectIdAndUserId(project.getId(), currentUserId); -// if (CollectionUtil.isNotEmpty(proRoles)) { -// for (ProRole proRole : proRoles) { -// projectInfo.getRoles().add(proRole.getDescription()); -// } -// } -// if(CollectionUtil.isEmpty(projectInfo.getRoles())){ -// projectInfo.getRoles().add(WebConstant.ROLE_NAME.Attention.phase); -// } -// //用户在项目中的最高权限 -// int power = proRoleService.selectPowerByRoleName(projectInfo.getRoles()); -// projectInfo.setPower(power); -// -// projectInfoList.add(projectInfo); -// } -// } - return projectInfoList; - } - private List projectInfoByProject(List projectList,Long currentUserId){ - List projectInfoList = new ArrayList<>(); - if(CollectionUtil.isNotEmpty(projectList)){ - ProjectVo.ProjectInfo projectInfo = null; - for(SysProject project:projectList){ - projectInfo = new ProjectVo.ProjectInfo(); - BeanUtil.copyProperties(project,projectInfo); - projectInfo.setCreator(false); - projectInfo.setRoles(new ArrayList<>()); - //是否是创建者 - if(project.getCreatorId().longValue()==currentUserId.longValue()){ - projectInfo.getRoles().add(WebConstant.ROLE_NAME.Creator.phase); - projectInfo.setCreator(true); - } - //本用户在项目中的角色 - List proRoles = proRoleService.getProRoleByProjectIdAndUserId(project.getId(), currentUserId); - if (CollectionUtil.isNotEmpty(proRoles)) { - for (ProRole proRole : proRoles) { - projectInfo.getRoles().add(proRole.getDescription()); - } - } - if(CollectionUtil.isEmpty(projectInfo.getRoles())){ - projectInfo.getRoles().add(WebConstant.ROLE_NAME.Attention.phase); - } - //用户在项目中的最高权限 - int power = proRoleService.selectPowerByRoleName(proRoles); - projectInfo.setPower(power); - - projectInfoList.add(projectInfo); - } - } - return projectInfoList; - } - - /** - * 通过项目id查询项目 - * @param userId 用户id - * @param projectId - * @return - */ - @Override - public ProjectVo.ProjectInfo getProjectInfoById(Long userId,Long projectId) { - SysProject sysProject = sysProjectDao.selectByPrimaryKey(projectId); - ProjectVo.ProjectInfo projectInfo = new ProjectVo.ProjectInfo(); - BeanUtil.copyProperties(sysProject,projectInfo); - projectInfo.setCreator(false); - projectInfo.setRoles(new ArrayList<>()); - //是否是创建者 - if(sysProject.getCreatorId().longValue()==userId.longValue()){ - projectInfo.getRoles().add(WebConstant.ROLE_NAME.Creator.phase); - projectInfo.setCreator(true); - } - //本用户在项目中的角色 - List proRoles = proRoleService.getProRoleByProjectIdAndUserId(sysProject.getId(), userId); - if (CollectionUtil.isNotEmpty(proRoles)) { - for (ProRole proRole : proRoles) { - projectInfo.getRoles().add(proRole.getDescription()); - } - } - if(CollectionUtil.isEmpty(projectInfo.getRoles())){ - projectInfo.getRoles().add(WebConstant.ROLE_NAME.Attention.phase); - } - //用户在项目中的最高权限 - int power = proRoleService.selectPowerByRoleName(proRoles); - projectInfo.setPower(power); - - return projectInfo; - } - - /** - * 根据类型查项目 项目类型 0普通项目 1模板项目 2常驻项目 - * @return - */ - @Override - public List getTemplate() { - List project = new ArrayList<>(); - //查询四个模板项目，两个普通项目 - PageHelper.startPage(1, 4); - List templateProject = sysProjectDao.selectByTemplateStatus(1); - - - PageHelper.startPage(1, 2); - List commonProject = sysProjectDao.selectByTemplateStatus(0); -// PageInfo pageInfo =new PageInfo<>(project); - project.addAll(templateProject); - project.addAll(commonProject); - - return project; - } - - @Override - public List getForever() { - List templateProject = sysProjectDao.selectByTemplateStatus(2); - return templateProject; - } - - /** - * 项目清单 - */ - @Override - public ProjectVo.ProjectAllDetailed getProjectList(Long currentUserId, Integer page, Integer pageSize, String key, String start, String end, String role) throws Exception { - ProjectVo.ProjectAllDetailed projectAllDetailed = new ProjectVo.ProjectAllDetailed(); - List projectInfoList = new ArrayList<>(); - - //获取日期的开始结束时间 - Long startMillisTime = null; - Long endMillisTime = null; - Map timeMap = null; - if(StrUtil.isNotEmpty(start)){ - timeMap = DateUtil.projectFormatDateTime(start); - startMillisTime = timeMap.get("startMillisTime"); - } - if(StrUtil.isNotEmpty(end)){ - timeMap = DateUtil.projectFormatDateTime(start); - endMillisTime = timeMap.get("endMillisTime"); - } - List projectList = sysProjectDao.findProjectIdByUserId(currentUserId,startMillisTime,endMillisTime); -// List projectList = attentionService.findProjectIdByUserId(currentUserId); - projectInfoList = projectInfoByProject(projectList,currentUserId); - //关键字模糊查询和是否创建者 - if (CollectionUtil.isNotEmpty(projectInfoList) && StrUtil.isNotEmpty(key)) { - Iterator it = projectInfoList.iterator(); - while (it.hasNext()) { - ProjectVo.ProjectInfo projectInfo = it.next(); - if (!projectInfo.getName().contains(key)) { - it.remove(); - } - if(StrUtil.isNotEmpty(role)){ - if("创建者".equalsIgnoreCase(role)&&!projectInfo.isCreator()){ - it.remove(); - }else if("参与者".equalsIgnoreCase(role)&&projectInfo.isCreator()){ - it.remove(); - } - } - } - } - //业务层分页 - List theProjectInfoList = null; - int totalPages = 1; - if (CollectionUtil.isNotEmpty(projectInfoList)) { - //1.计算分页条件 - if (page > 0) { - int size = projectInfoList.size(); - totalPages = size / pageSize + 1; - int num = pageSize; - int startIndex = pageSize * (page - 1); - if (startIndex >= size) { - startIndex = -1; - } else { - if (startIndex + num > size) { - num = size - startIndex; - } - } - //拷贝分页数据 - if (startIndex >= 0) { - theProjectInfoList = CollectionUtil.newArrayList(); - for (int i = startIndex; i < startIndex + num; i++) { - theProjectInfoList.add(projectInfoList.get(i)); - } - } - } else { //不分页 - theProjectInfoList = CollectionUtil.newArrayList(projectInfoList); - } - } - ProjectVo.PageInfo pageInfo = new ProjectVo.PageInfo(); - pageInfo.setCurrentPage(page); - pageInfo.setTotalPage(totalPages); - projectAllDetailed.setProjectInfoList(theProjectInfoList); - projectAllDetailed.setPageInfo(pageInfo); - - return projectAllDetailed; - } - - /** - * 通过名字模糊查询项目 - */ - @Override - public List getProjectByKey(Long currentUserId, String key) throws Exception { - - return sysProjectDao.getProjectByKey(currentUserId,key); - } - - //=========================================================================== - /** - * 删除项目 - */ - @Override - public void deleteProject(Long currentUserId, Long projectId) throws Exception { - //本用户在项目中的角色 - List proRoles = proRoleService.getProRoleByProjectIdAndUserId(projectId, currentUserId); - //用户在项目中的最高权限 - int power = proRoleService.selectPowerByRoleName(proRoles); - if(power>1){ - //修改项目状态 - SysProject project = sysProjectDao.selectByPrimaryKey(projectId); - project.setRecStatus((byte) 1); - sysProjectDao.updateByPrimaryKeySelective(project); - }else { - throw new BaseException(CodeEnum.NOT_POWER); - } - } - - /** - * 复制项目 - */ - @Override - public void copyProject(Long userId ,Long projectId) { - SysProject oldProject = sysProjectDao.selectByPrimaryKey(projectId); - SysProject newProject = new SysProject(); - if(ObjectUtil.isNotNull(oldProject)){ - BeanUtil.copyProperties(oldProject,newProject); - newProject.setId(snowflake.nextId()); - newProject.setCreatorId(userId); - saveProject(newProject); - //该用户关注新项目 - UserAttention userAttention = new UserAttention(); - userAttention.setId(snowflake.nextId()); - userAttention.setUserId(userId); - userAttention.setProjectId(newProject.getId()); - attentionDao.insertSelective(userAttention); - //添加角色 - copyRole(oldProject.getId(),newProject.getId()); - }else { - throw new BaseException(CodeEnum.NOT_PROJECT); - } - } - /** - * 复制角色 - */ - private void copyRole(Long oldProjectId,Long newProjectId){ - //查找被复制的项目下的二级角色 - Map oldRoleMap = new HashMap<>(); - Map newRoleMap = new HashMap<>(); - List newRoleList = new ArrayList<>(); - ProRoleExample roleExample = new ProRoleExample(); - roleExample.createCriteria().andProjectIdEqualTo(oldProjectId); - List oldRoleList = proRoleDao.selectByExample(roleExample); - if(CollectionUtil.isNotEmpty(oldRoleList)){ - for(ProRole oldRole:oldRoleList){ - oldRoleMap.put(oldRole.getId(),oldRole.getName()); - //创建新的角色 - ProRole newRole = new ProRole(); - BeanUtil.copyProperties(oldRole,newRole); - newRole.setId(snowflake.nextId()); - newRole.setProjectId(newProjectId); - proRoleDao.insertSelective(newRole); - newRoleList.add(newRole); - newRoleMap.put(newRole.getName(),newRole.getId()); - } - //修改角色的parentId - if(CollectionUtil.isNotEmpty(newRoleList)){ - for(ProRole role:newRoleList){ - if(role.getParentId() != 0){ - role.setParentId(newRoleMap.get(oldRoleMap.get(role.getParentId()))); - proRoleDao.updateByPrimaryKeySelective(role); - } - } - } - //添加对谁不可见 - copyRoleExeclude(oldRoleList,oldRoleMap,newRoleMap); - //复制任务 - copyTask(oldProjectId,newProjectId,oldRoleMap,newRoleMap); - } - } - private void copyRoleExeclude(List oldRoleList,Map oldRoleMap, Map newRoleMap){ - if(CollectionUtil.isNotEmpty(oldRoleList)) { - for (ProRole oldRole : oldRoleList) { - ProRoleExecludeExample execludeExample = new ProRoleExecludeExample(); - execludeExample.createCriteria().andRoleIdEqualTo(oldRole.getId()); - List roleExecludeList = roleExecludeDao.selectByExample(execludeExample); - if(CollectionUtil.isNotEmpty(roleExecludeList)){ - for(ProRoleExeclude roleExeclude:roleExecludeList){ - ProRoleExeclude newRoleExeclude = new ProRoleExeclude(); - newRoleExeclude.setRoleId(newRoleMap.get(oldRoleMap.get(roleExeclude.getRoleId()))); - newRoleExeclude.setOtherRoleId(newRoleMap.get(oldRoleMap.get(roleExeclude.getRoleId()))); - roleExecludeDao.insertSelective(newRoleExeclude); - } - } - } - } - } - - /** - * 复制任务 - */ - private void copyTask(Long oldProjectId,Long newProjectId,Map oldRoleMap, Map newRoleMap){ - ProTaskDetailExample detailExample = new ProTaskDetailExample(); - detailExample.createCriteria().andProjectIdEqualTo(oldProjectId).andLevelEqualTo((byte) 1); - List detailList = taskDetailDao.selectByExample(detailExample); - if(CollectionUtil.isNotEmpty(detailList)){ - for(ProTaskDetail oldDetail: detailList){ - ProTaskDetail newDetail = new ProTaskDetail(); - BeanUtil.copyProperties(oldDetail,newDetail); - newDetail.setId(snowflake.nextId()); - newDetail.setProjectId(newProjectId); - newDetail.setExecutorRole(newRoleMap.get(oldRoleMap.get(newDetail.getExecutorRole()))); - if(newDetail.getCheckerRole() != 0){ - newDetail.setCheckerRole(newRoleMap.get(oldRoleMap.get(newDetail.getCheckerRole()))); - } - taskDetailDao.insertSelective(newDetail); - //查找一级任务下的二级任务 - ProTaskDetailExample oldSecondTask = new ProTaskDetailExample(); - oldSecondTask.createCriteria().andParentIdEqualTo(oldDetail.getId()).andLevelEqualTo((byte) 2); - List secondTaskList = taskDetailDao.selectByExample(oldSecondTask); - if(CollectionUtil.isNotEmpty(secondTaskList)){ - for(ProTaskDetail oldSecondDetail: secondTaskList){ - ProTaskDetail newSecondDetail = new ProTaskDetail(); - BeanUtil.copyProperties(oldSecondDetail,newSecondDetail); - newSecondDetail.setId(snowflake.nextId()); - newSecondDetail.setProjectId(newProjectId); - newSecondDetail.setParentId(newDetail.getId()); - newSecondDetail.setExecutorRole(newRoleMap.get(oldRoleMap.get(newSecondDetail.getExecutorRole()))); - if(newSecondDetail.getCheckerRole() != 0){ - newSecondDetail.setCheckerRole(newRoleMap.get(oldRoleMap.get(newSecondDetail.getCheckerRole()))); - } - taskDetailDao.insertSelective(newSecondDetail); - //分解时间 - taskToSubTime(newSecondDetail); - //查找二级任务的子任务 - ProTaskDetailExample oldSubTask = new ProTaskDetailExample(); - oldSubTask.createCriteria().andParentIdEqualTo(oldSecondDetail.getId()).andLevelEqualTo((byte) 3); - List subTaskList = taskDetailDao.selectByExample(oldSubTask); - if(CollectionUtil.isNotEmpty(subTaskList)){ - for(ProTaskDetail oldSubDetail: subTaskList){ - ProTaskDetail newSubDetail = new ProTaskDetail(); - BeanUtil.copyProperties(oldSubDetail,newSubDetail); - newSubDetail.setId(snowflake.nextId()); - newSubDetail.setProjectId(newProjectId); - newSubDetail.setParentId(newSecondDetail.getId()); - newSubDetail.setExecutorRole(newRoleMap.get(oldRoleMap.get(newSubDetail.getExecutorRole()))); - if(newSubDetail.getCheckerRole() != 0){ - newSubDetail.setCheckerRole(newRoleMap.get(oldRoleMap.get(newSubDetail.getCheckerRole()))); - } - taskDetailDao.insertSelective(newSubDetail); - //分解时间 - taskToSubTime(newSubDetail); - copyPluginAndDeliver(oldDetail.getId(),newDetail.getId(),oldRoleMap,newRoleMap); - } - } - copyPluginAndDeliver(oldDetail.getId(),newDetail.getId(),oldRoleMap,newRoleMap); - } - } - copyPluginAndDeliver(oldDetail.getId(),newDetail.getId(),oldRoleMap,newRoleMap); - } - } - } - private void taskToSubTime(ProTaskDetail taskDetail){ - //cycle为空，只加一条数据 - if(ObjectUtil.isNotNull(taskDetail)) { - if (StrUtil.isEmpty(taskDetail.getCycle())) { - ProTaskSubTime proTaskSubTime = new ProTaskSubTime(); - proTaskSubTime.setId(snowflake.nextId()); - proTaskSubTime.setTaskDetailId(taskDetail.getId()); - proTaskSubTime.setEndTime(taskDetail.getEndTime()); - proTaskSubTime.setBeginTime(taskDetail.getBeginTime()); - taskSubTimeDao.insertSelective(proTaskSubTime); - } else { - Date startDate = new Date(taskDetail.getBeginTime()); - Date endDate = new Date(taskDetail.getEndTime()); - List taskDateList = - NatureToDate.generateDates(taskDetail.getCycle(), startDate, endDate); - if (CollectionUtil.isNotEmpty(taskDateList)) { - for (CronConstant.TaskDate taskDate : taskDateList) { - ProTaskSubTime proTaskSubTime = new ProTaskSubTime(); - proTaskSubTime.setId(snowflake.nextId()); - proTaskSubTime.setTaskDetailId(taskDetail.getId()); - proTaskSubTime.setEndTime(taskDate.getEndDate().getTime()); - proTaskSubTime.setBeginTime(taskDate.getStartDate().getTime()); - taskSubTimeDao.insertSelective(proTaskSubTime); - } - } - } - } - } - - /** - * 复制插件和交付物 - */ - private void copyPluginAndDeliver(Long oldTaskId,Long newTaskId,Map oldRoleMap, Map newRoleMap){ - //插件 - ProTaskPluginExample pluginExample = new ProTaskPluginExample(); - pluginExample.createCriteria().andTaskDetailIdEqualTo(oldTaskId); - List pluginList = pluginDao.selectByExample(pluginExample); - if(CollectionUtil.isNotEmpty(pluginList)){ - for(ProTaskPlugin plugin:pluginList){ - ProTaskPlugin newPlugin = new ProTaskPlugin(); - BeanUtil.copyProperties(plugin,newPlugin); - newPlugin.setId(snowflake.nextId()); - newPlugin.setTaskDetailId(newTaskId); - newPlugin.setMemberRoleId(newRoleMap.get(oldRoleMap.get(newPlugin.getMemberRoleId()))); - pluginDao.insertSelective(newPlugin); - } - } - //交付物 - ProTaskDeliverExample deliverExample = new ProTaskDeliverExample(); - deliverExample.createCriteria().andTaskDetailIdEqualTo(oldTaskId); - List proTaskDeliverList = taskDeliverDao.selectByExample(deliverExample); - if(CollectionUtil.isNotEmpty(proTaskDeliverList)){ - for(ProTaskDeliver taskDeliver:proTaskDeliverList){ - ProTaskDeliver newTaskDeliver = new ProTaskDeliver(); - BeanUtil.copyProperties(taskDeliver,newTaskDeliver); - newTaskDeliver.setId(snowflake.nextId()); - newTaskDeliver.setTaskDetailId(newTaskId); - newTaskDeliver.setCheckStatus(0); - newTaskDeliver.setIsUpload(0); - taskDeliverDao.insertSelective(newTaskDeliver); - } - } - } -} +package com.ccsens.tall.service; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.ccsens.tall.bean.po.*; +import com.ccsens.tall.bean.vo.ProjectVo; +import com.ccsens.tall.persist.dao.*; +import com.ccsens.util.CodeEnum; +import com.ccsens.util.DateUtil; +import com.ccsens.util.WebConstant; +import com.ccsens.util.cron.CronConstant; +import com.ccsens.util.cron.NatureToDate; +import com.ccsens.util.exception.BaseException; +import com.github.pagehelper.PageHelper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.text.SimpleDateFormat; +import java.util.*; + +@Service +@Transactional(propagation = Propagation.REQUIRED) +public class ProjectService implements IProjectService { + @Autowired + private SysProjectDao sysProjectDao; + @Autowired + private ProRoleExecludeDao roleExecludeDao; + @Autowired + private ProRoleDao proRoleDao; + @Autowired + private TaskDetailDao taskDetailDao; + @Autowired + private TaskSubTimeDao taskSubTimeDao; + @Autowired + private UserAttentionDao attentionDao; + @Autowired + private TaskPluginDao pluginDao; + @Autowired + private TaskDeliverDao taskDeliverDao; + @Autowired + private IProRoleService proRoleService; + @Autowired + private Snowflake snowflake; + + @Override + public void saveProject(SysProject sysProject) { + sysProjectDao.insertSelective(sysProject); + } + + @Override + public void updateProject(SysProject project) { + sysProjectDao.updateByPrimaryKeySelective(project); + } + + /** + * 根据名字查找此用户创建的项目 + * @param subProject + * @param currentUserId + * @return + */ + @Override + public SysProject selectByNameAndUserId(String subProject, Long currentUserId) throws Exception{ + SysProject project = new SysProject(); + SysProjectExample projectExample = new SysProjectExample(); + projectExample.createCriteria().andCreatorIdEqualTo(currentUserId).andNameEqualTo(subProject); + List projectList = sysProjectDao.selectByExample(projectExample); + if (CollectionUtil.isNotEmpty(projectList)) { + project = projectList.get(0); + } + return project; + } + + /** + * 查找本月哪一天有项目 + * @param currentUserId + * @param date + * @return + */ + @Override + public List haveProjectDay(Long currentUserId, String date) throws Exception { + List dateList = new ArrayList<>(); + //获取日期的开始结束时间 + Map timeMap = new HashMap<>(); + timeMap = DateUtil.projectFormatDateTime(date); + Long startMillisTime = timeMap.get("startMillisTime"); + Long endMillisTime = timeMap.get("endMillisTime"); + //查找此用户关注的项目 + List projectList = sysProjectDao.findProjectIdByUserId(currentUserId,startMillisTime,endMillisTime); + if(CollectionUtil.isNotEmpty(projectList)){ + for(SysProject sysProject:projectList){ + startMillisTime = sysProject.getBeginTime() > startMillisTime ? sysProject.getBeginTime() : startMillisTime; + endMillisTime = sysProject.getEndTime() < endMillisTime ? sysProject.getEndTime() : endMillisTime; + dateList = getTimeList(dateList,startMillisTime,endMillisTime); + } + } + return dateList; + } + private List getTimeList(List dateList, Long startTime,Long endTime){ + SimpleDateFormat sdf = new SimpleDateFormat("dd"); + Date s = new Date(startTime); + Date e = new Date(endTime); + + Calendar min = Calendar.getInstance(); + Calendar max = Calendar.getInstance(); + min.setTime(s); + max.setTime(e); + Calendar curr = min; + while (curr.before(max)) { + for(String str:dateList){ + if(!sdf.format(min.getTime()).equalsIgnoreCase(str)){ + dateList.add(sdf.format(min.getTime())); + } + } + curr.add(Calendar.DATE, 1); + } + return dateList; + } + + /** + * 根据用户和日期查找项目 + * @param currentUserId + * @param date + * @return + * @throws Exception + */ + @Override + public List getProjectInfo(Long currentUserId, String date) throws Exception { + List projectInfoList = new ArrayList<>(); + //获取日期的开始结束时间 + Map timeMap = new HashMap<>(); + timeMap = DateUtil.projectFormatDateTime(date); + Long startMillisTime = timeMap.get("startMillisTime"); + Long endMillisTime = timeMap.get("endMillisTime"); + //查找此用户关注的项目 + List projectList = sysProjectDao.findProjectIdByUserId(currentUserId,startMillisTime,endMillisTime); + projectInfoList = projectInfoByProject(projectList,currentUserId); +// if(CollectionUtil.isNotEmpty(projectList)){ +// ProjectVo.ProjectInfo projectInfo = null; +// for(SysProject project:projectList){ +// projectInfo = new ProjectVo.ProjectInfo(); +// BeanUtil.copyProperties(project,projectInfo); +// projectInfo.setCreator(false); +// projectInfo.setRoles(new ArrayList<>()); +// //是否是创建者 +// if(project.getCreatorId().longValue()==currentUserId.longValue()){ +// projectInfo.getRoles().add(WebConstant.ROLE_NAME.Creator.phase); +// projectInfo.setCreator(true); +// } +// //本用户在项目中的角色 +// List proRoles = proRoleService.getProRoleByProjectIdAndUserId(project.getId(), currentUserId); +// if (CollectionUtil.isNotEmpty(proRoles)) { +// for (ProRole proRole : proRoles) { +// projectInfo.getRoles().add(proRole.getDescription()); +// } +// } +// if(CollectionUtil.isEmpty(projectInfo.getRoles())){ +// projectInfo.getRoles().add(WebConstant.ROLE_NAME.Attention.phase); +// } +// //用户在项目中的最高权限 +// int power = proRoleService.selectPowerByRoleName(projectInfo.getRoles()); +// projectInfo.setPower(power); +// +// projectInfoList.add(projectInfo); +// } +// } + return projectInfoList; + } + private List projectInfoByProject(List projectList, Long currentUserId){ + List projectInfoList = new ArrayList<>(); + if(CollectionUtil.isNotEmpty(projectList)){ + ProjectVo.ProjectInfo projectInfo = null; + for(SysProject project:projectList){ + projectInfo = new ProjectVo.ProjectInfo(); + BeanUtil.copyProperties(project,projectInfo); + projectInfo.setCreator(false); + projectInfo.setRoles(new ArrayList<>()); + //是否是创建者 + if(project.getCreatorId().longValue()==currentUserId.longValue()){ + projectInfo.getRoles().add(WebConstant.ROLE_NAME.Creator.phase); + projectInfo.setCreator(true); + } + //本用户在项目中的角色 + List proRoles = proRoleService.getProRoleByProjectIdAndUserId(project.getId(), currentUserId); + if (CollectionUtil.isNotEmpty(proRoles)) { + for (ProRole proRole : proRoles) { + projectInfo.getRoles().add(proRole.getDescription()); + } + } + if(CollectionUtil.isEmpty(projectInfo.getRoles())){ + projectInfo.getRoles().add(WebConstant.ROLE_NAME.Attention.phase); + } + //用户在项目中的最高权限 + int power = proRoleService.selectPowerByRoleName(proRoles); + projectInfo.setPower(power); + + projectInfoList.add(projectInfo); + } + } + return projectInfoList; + } + + /** + * 通过项目id查询项目 + * @param userId 用户id + * @param projectId + * @return + */ + @Override + public ProjectVo.ProjectInfo getProjectInfoById(Long userId, Long projectId) { + SysProject sysProject = sysProjectDao.selectByPrimaryKey(projectId); + ProjectVo.ProjectInfo projectInfo = new ProjectVo.ProjectInfo(); + BeanUtil.copyProperties(sysProject,projectInfo); + projectInfo.setCreator(false); + projectInfo.setRoles(new ArrayList<>()); + //是否是创建者 + if(sysProject.getCreatorId().longValue()==userId.longValue()){ + projectInfo.getRoles().add(WebConstant.ROLE_NAME.Creator.phase); + projectInfo.setCreator(true); + } + //本用户在项目中的角色 + List proRoles = proRoleService.getProRoleByProjectIdAndUserId(sysProject.getId(), userId); + if (CollectionUtil.isNotEmpty(proRoles)) { + for (ProRole proRole : proRoles) { + projectInfo.getRoles().add(proRole.getDescription()); + } + } + if(CollectionUtil.isEmpty(projectInfo.getRoles())){ + projectInfo.getRoles().add(WebConstant.ROLE_NAME.Attention.phase); + } + //用户在项目中的最高权限 + int power = proRoleService.selectPowerByRoleName(proRoles); + projectInfo.setPower(power); + + return projectInfo; + } + + /** + * 根据类型查项目 项目类型 0普通项目 1模板项目 2常驻项目 + * @return + */ + @Override + public List getTemplate() { + List project = new ArrayList<>(); + //查询四个模板项目，两个普通项目 + PageHelper.startPage(1, 4); + List templateProject = sysProjectDao.selectByTemplateStatus(1); + + + PageHelper.startPage(1, 2); + List commonProject = sysProjectDao.selectByTemplateStatus(0); +// PageInfo pageInfo =new PageInfo<>(project); + project.addAll(templateProject); + project.addAll(commonProject); + + return project; + } + + @Override + public List getForever() { + List templateProject = sysProjectDao.selectByTemplateStatus(2); + if(CollectionUtil.isNotEmpty(templateProject)){ + for(ProjectVo.TemplateStatus templateStatus:templateProject){ + templateStatus.setProcess(1); + } + } + return templateProject; + } + + /** + * 项目清单 + */ + @Override + public ProjectVo.ProjectAllDetailed getProjectList(Long currentUserId, Integer page, Integer pageSize, String key, String start, String end, String role) throws Exception { + ProjectVo.ProjectAllDetailed projectAllDetailed = new ProjectVo.ProjectAllDetailed(); + List projectInfoList = new ArrayList<>(); + + //获取日期的开始结束时间 + Long startMillisTime = null; + Long endMillisTime = null; + Map timeMap = null; + if(StrUtil.isNotEmpty(start)){ + timeMap = DateUtil.projectFormatDateTime(start); + startMillisTime = timeMap.get("startMillisTime"); + } + if(StrUtil.isNotEmpty(end)){ + timeMap = DateUtil.projectFormatDateTime(start); + endMillisTime = timeMap.get("endMillisTime"); + } + List projectList = sysProjectDao.findProjectIdByUserId(currentUserId,startMillisTime,endMillisTime); +// List projectList = attentionService.findProjectIdByUserId(currentUserId); + projectInfoList = projectInfoByProject(projectList,currentUserId); + //关键字模糊查询和是否创建者 + if (CollectionUtil.isNotEmpty(projectInfoList) && StrUtil.isNotEmpty(key)) { + Iterator it = projectInfoList.iterator(); + while (it.hasNext()) { + ProjectVo.ProjectInfo projectInfo = it.next(); + if (!projectInfo.getName().contains(key)) { + it.remove(); + } + if(StrUtil.isNotEmpty(role)){ + if("创建者".equalsIgnoreCase(role)&&!projectInfo.isCreator()){ + it.remove(); + }else if("参与者".equalsIgnoreCase(role)&&projectInfo.isCreator()){ + it.remove(); + } + } + } + } + //业务层分页 + List theProjectInfoList = null; + int totalPages = 1; + if (CollectionUtil.isNotEmpty(projectInfoList)) { + //1.计算分页条件 + if (page > 0) { + int size = projectInfoList.size(); + totalPages = size / pageSize + 1; + int num = pageSize; + int startIndex = pageSize * (page - 1); + if (startIndex >= size) { + startIndex = -1; + } else { + if (startIndex + num > size) { + num = size - startIndex; + } + } + //拷贝分页数据 + if (startIndex >= 0) { + theProjectInfoList = CollectionUtil.newArrayList(); + for (int i = startIndex; i < startIndex + num; i++) { + theProjectInfoList.add(projectInfoList.get(i)); + } + } + } else { //不分页 + theProjectInfoList = CollectionUtil.newArrayList(projectInfoList); + } + } + ProjectVo.PageInfo pageInfo = new ProjectVo.PageInfo(); + pageInfo.setCurrentPage(page); + pageInfo.setTotalPage(totalPages); + projectAllDetailed.setProjectInfoList(theProjectInfoList); + projectAllDetailed.setPageInfo(pageInfo); + + return projectAllDetailed; + } + + /** + * 通过名字模糊查询项目 + */ + @Override + public List getProjectByKey(Long currentUserId, String key) throws Exception { + + return sysProjectDao.getProjectByKey(currentUserId,key); + } + + //=========================================================================== + /** + * 删除项目 + */ + @Override + public void deleteProject(Long currentUserId, Long projectId) throws Exception { + //本用户在项目中的角色 + List proRoles = proRoleService.getProRoleByProjectIdAndUserId(projectId, currentUserId); + //用户在项目中的最高权限 + int power = proRoleService.selectPowerByRoleName(proRoles); + if(power>1){ + //修改项目状态 + SysProject project = sysProjectDao.selectByPrimaryKey(projectId); + project.setRecStatus((byte) 1); + sysProjectDao.updateByPrimaryKeySelective(project); + }else { + throw new BaseException(CodeEnum.NOT_POWER); + } + } + + /** + * 复制项目 + */ + @Override + public void copyProject(Long userId ,Long projectId) { + SysProject oldProject = sysProjectDao.selectByPrimaryKey(projectId); + SysProject newProject = new SysProject(); + if(ObjectUtil.isNotNull(oldProject)){ + BeanUtil.copyProperties(oldProject,newProject); + newProject.setId(snowflake.nextId()); + newProject.setCreatorId(userId); + saveProject(newProject); + //该用户关注新项目 + UserAttention userAttention = new UserAttention(); + userAttention.setId(snowflake.nextId()); + userAttention.setUserId(userId); + userAttention.setProjectId(newProject.getId()); + attentionDao.insertSelective(userAttention); + //添加角色 + copyRole(oldProject.getId(),newProject.getId()); + }else { + throw new BaseException(CodeEnum.NOT_PROJECT); + } + } + /** + * 复制角色 + */ + private void copyRole(Long oldProjectId,Long newProjectId){ + //查找被复制的项目下的二级角色 + Map oldRoleMap = new HashMap<>(); + Map newRoleMap = new HashMap<>(); + List newRoleList = new ArrayList<>(); + ProRoleExample roleExample = new ProRoleExample(); + roleExample.createCriteria().andProjectIdEqualTo(oldProjectId); + List oldRoleList = proRoleDao.selectByExample(roleExample); + if(CollectionUtil.isNotEmpty(oldRoleList)){ + for(ProRole oldRole:oldRoleList){ + oldRoleMap.put(oldRole.getId(),oldRole.getName()); + //创建新的角色 + ProRole newRole = new ProRole(); + BeanUtil.copyProperties(oldRole,newRole); + newRole.setId(snowflake.nextId()); + newRole.setProjectId(newProjectId); + proRoleDao.insertSelective(newRole); + newRoleList.add(newRole); + newRoleMap.put(newRole.getName(),newRole.getId()); + } + //修改角色的parentId + if(CollectionUtil.isNotEmpty(newRoleList)){ + for(ProRole role:newRoleList){ + if(role.getParentId() != 0){ + role.setParentId(newRoleMap.get(oldRoleMap.get(role.getParentId()))); + proRoleDao.updateByPrimaryKeySelective(role); + } + } + } + //添加对谁不可见 + copyRoleExeclude(oldRoleList,oldRoleMap,newRoleMap); + //复制任务 + copyTask(oldProjectId,newProjectId,oldRoleMap,newRoleMap); + } + } + private void copyRoleExeclude(List oldRoleList, Map oldRoleMap, Map newRoleMap){ + if(CollectionUtil.isNotEmpty(oldRoleList)) { + for (ProRole oldRole : oldRoleList) { + ProRoleExecludeExample execludeExample = new ProRoleExecludeExample(); + execludeExample.createCriteria().andRoleIdEqualTo(oldRole.getId()); + List roleExecludeList = roleExecludeDao.selectByExample(execludeExample); + if(CollectionUtil.isNotEmpty(roleExecludeList)){ + for(ProRoleExeclude roleExeclude:roleExecludeList){ + ProRoleExeclude newRoleExeclude = new ProRoleExeclude(); + newRoleExeclude.setRoleId(newRoleMap.get(oldRoleMap.get(roleExeclude.getRoleId()))); + newRoleExeclude.setOtherRoleId(newRoleMap.get(oldRoleMap.get(roleExeclude.getRoleId()))); + roleExecludeDao.insertSelective(newRoleExeclude); + } + } + } + } + } + + /** + * 复制任务 + */ + private void copyTask(Long oldProjectId,Long newProjectId,Map oldRoleMap, Map newRoleMap){ + ProTaskDetailExample detailExample = new ProTaskDetailExample(); + detailExample.createCriteria().andProjectIdEqualTo(oldProjectId).andLevelEqualTo((byte) 1); + List detailList = taskDetailDao.selectByExample(detailExample); + if(CollectionUtil.isNotEmpty(detailList)){ + for(ProTaskDetail oldDetail: detailList){ + ProTaskDetail newDetail = new ProTaskDetail(); + BeanUtil.copyProperties(oldDetail,newDetail); + newDetail.setId(snowflake.nextId()); + newDetail.setProjectId(newProjectId); + newDetail.setExecutorRole(newRoleMap.get(oldRoleMap.get(newDetail.getExecutorRole()))); + if(newDetail.getCheckerRole() != 0){ + newDetail.setCheckerRole(newRoleMap.get(oldRoleMap.get(newDetail.getCheckerRole()))); + } + taskDetailDao.insertSelective(newDetail); + //查找一级任务下的二级任务 + ProTaskDetailExample oldSecondTask = new ProTaskDetailExample(); + oldSecondTask.createCriteria().andParentIdEqualTo(oldDetail.getId()).andLevelEqualTo((byte) 2); + List secondTaskList = taskDetailDao.selectByExample(oldSecondTask); + if(CollectionUtil.isNotEmpty(secondTaskList)){ + for(ProTaskDetail oldSecondDetail: secondTaskList){ + ProTaskDetail newSecondDetail = new ProTaskDetail(); + BeanUtil.copyProperties(oldSecondDetail,newSecondDetail); + newSecondDetail.setId(snowflake.nextId()); + newSecondDetail.setProjectId(newProjectId); + newSecondDetail.setParentId(newDetail.getId()); + newSecondDetail.setExecutorRole(newRoleMap.get(oldRoleMap.get(newSecondDetail.getExecutorRole()))); + if(newSecondDetail.getCheckerRole() != 0){ + newSecondDetail.setCheckerRole(newRoleMap.get(oldRoleMap.get(newSecondDetail.getCheckerRole()))); + } + taskDetailDao.insertSelective(newSecondDetail); + //分解时间 + taskToSubTime(newSecondDetail); + //查找二级任务的子任务 + ProTaskDetailExample oldSubTask = new ProTaskDetailExample(); + oldSubTask.createCriteria().andParentIdEqualTo(oldSecondDetail.getId()).andLevelEqualTo((byte) 3); + List subTaskList = taskDetailDao.selectByExample(oldSubTask); + if(CollectionUtil.isNotEmpty(subTaskList)){ + for(ProTaskDetail oldSubDetail: subTaskList){ + ProTaskDetail newSubDetail = new ProTaskDetail(); + BeanUtil.copyProperties(oldSubDetail,newSubDetail); + newSubDetail.setId(snowflake.nextId()); + newSubDetail.setProjectId(newProjectId); + newSubDetail.setParentId(newSecondDetail.getId()); + newSubDetail.setExecutorRole(newRoleMap.get(oldRoleMap.get(newSubDetail.getExecutorRole()))); + if(newSubDetail.getCheckerRole() != 0){ + newSubDetail.setCheckerRole(newRoleMap.get(oldRoleMap.get(newSubDetail.getCheckerRole()))); + } + taskDetailDao.insertSelective(newSubDetail); + //分解时间 + taskToSubTime(newSubDetail); + copyPluginAndDeliver(oldDetail.getId(),newDetail.getId(),oldRoleMap,newRoleMap); + } + } + copyPluginAndDeliver(oldDetail.getId(),newDetail.getId(),oldRoleMap,newRoleMap); + } + } + copyPluginAndDeliver(oldDetail.getId(),newDetail.getId(),oldRoleMap,newRoleMap); + } + } + } + private void taskToSubTime(ProTaskDetail taskDetail){ + //cycle为空，只加一条数据 + if(ObjectUtil.isNotNull(taskDetail)) { + if (StrUtil.isEmpty(taskDetail.getCycle())) { + ProTaskSubTime proTaskSubTime = new ProTaskSubTime(); + proTaskSubTime.setId(snowflake.nextId()); + proTaskSubTime.setTaskDetailId(taskDetail.getId()); + proTaskSubTime.setEndTime(taskDetail.getEndTime()); + proTaskSubTime.setBeginTime(taskDetail.getBeginTime()); + taskSubTimeDao.insertSelective(proTaskSubTime); + } else { + Date startDate = new Date(taskDetail.getBeginTime()); + Date endDate = new Date(taskDetail.getEndTime()); + List taskDateList = + NatureToDate.generateDates(taskDetail.getCycle(), startDate, endDate); + if (CollectionUtil.isNotEmpty(taskDateList)) { + for (CronConstant.TaskDate taskDate : taskDateList) { + ProTaskSubTime proTaskSubTime = new ProTaskSubTime(); + proTaskSubTime.setId(snowflake.nextId()); + proTaskSubTime.setTaskDetailId(taskDetail.getId()); + proTaskSubTime.setEndTime(taskDate.getEndDate().getTime()); + proTaskSubTime.setBeginTime(taskDate.getStartDate().getTime()); + taskSubTimeDao.insertSelective(proTaskSubTime); + } + } + } + } + } + + /** + * 复制插件和交付物 + */ + private void copyPluginAndDeliver(Long oldTaskId,Long newTaskId,Map oldRoleMap, Map newRoleMap){ + //插件 + ProTaskPluginExample pluginExample = new ProTaskPluginExample(); + pluginExample.createCriteria().andTaskDetailIdEqualTo(oldTaskId); + List pluginList = pluginDao.selectByExample(pluginExample); + if(CollectionUtil.isNotEmpty(pluginList)){ + for(ProTaskPlugin plugin:pluginList){ + ProTaskPlugin newPlugin = new ProTaskPlugin(); + BeanUtil.copyProperties(plugin,newPlugin); + newPlugin.setId(snowflake.nextId()); + newPlugin.setTaskDetailId(newTaskId); + newPlugin.setMemberRoleId(newRoleMap.get(oldRoleMap.get(newPlugin.getMemberRoleId()))); + pluginDao.insertSelective(newPlugin); + } + } + //交付物 + ProTaskDeliverExample deliverExample = new ProTaskDeliverExample(); + deliverExample.createCriteria().andTaskDetailIdEqualTo(oldTaskId); + List proTaskDeliverList = taskDeliverDao.selectByExample(deliverExample); + if(CollectionUtil.isNotEmpty(proTaskDeliverList)){ + for(ProTaskDeliver taskDeliver:proTaskDeliverList){ + ProTaskDeliver newTaskDeliver = new ProTaskDeliver(); + BeanUtil.copyProperties(taskDeliver,newTaskDeliver); + newTaskDeliver.setId(snowflake.nextId()); + newTaskDeliver.setTaskDetailId(newTaskId); + newTaskDeliver.setCheckStatus(0); + newTaskDeliver.setIsUpload(0); + taskDeliverDao.insertSelective(newTaskDeliver); + } + } + } +} diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java index abd7f39a..99fbf51b 100644 --- a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java +++ b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java @@ -1,768 +1,790 @@ -package com.ccsens.tall.service; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.lang.Snowflake; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.ccsens.tall.bean.dto.DeliverDto; -import com.ccsens.tall.bean.dto.message.BaseMessageDto; -import com.ccsens.tall.bean.dto.message.DeliverMessageWithCheckerDto; -import com.ccsens.tall.bean.dto.message.DeliverMessageWithDeleteDto; -import com.ccsens.tall.bean.dto.message.DeliverMessageWithUploadDto; -import com.ccsens.tall.bean.po.*; -import com.ccsens.tall.bean.vo.DeliverVo; -import com.ccsens.tall.bean.vo.ProjectVo; -import com.ccsens.tall.bean.vo.TaskVo; -import com.ccsens.tall.persist.dao.*; -import com.ccsens.util.*; -import com.ccsens.util.exception.BaseException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -import java.io.File; -import java.util.*; - -@Service -@Transactional(propagation = Propagation.REQUIRED) -public class TaskDeliverService implements ITaskDeliverService { - @Autowired - private TaskDeliverDao taskDeliverDao; - @Autowired - private SysCommitedFileDao commitedFileDao; - @Autowired - private ProTaskDeliverPostLogDao deliverPostLogDao; - @Autowired - private PostLogCheckerDao postLogCheckerDao; - @Autowired - private TaskDetailDao taskDetailDao; - @Autowired - private TaskSubTimeDao taskSubTimeDao; - @Autowired - private ProRoleDao proRoleDao; - @Autowired - private ProMemberDao proMemberDao; - @Autowired - private IProMemberService proMemberService; - @Autowired - private IUserService userService; - @Autowired - private IMessageService messageService; - @Autowired - private Snowflake snowflake; - - @Override - public void saveDeliver(ProTaskDeliver taskDeliver) { - taskDeliverDao.insertSelective(taskDeliver); - } - - /** - * 根据taskId查找交付物或输入文档 - */ - @Override - public List selectDeliverOrInputByTask(Long taskId, int isInput) { - List deliverInfoByMVPList = new ArrayList<>(); - Long subTimeId = isTaskOrSubTime(taskId); - ProTaskDeliverExample deliverExample = new ProTaskDeliverExample(); - deliverExample.createCriteria().andIsInputEqualTo(isInput).andTaskDetailIdEqualTo(taskId); - List deliverList = taskDeliverDao.selectByExample(deliverExample); - if (CollectionUtil.isNotEmpty(deliverList)) { - for (ProTaskDeliver deliver : deliverList) { - TaskVo.TaskDeliverByMVP.DeliverInfoByMVP deliverInfoByMVP = new TaskVo.TaskDeliverByMVP.DeliverInfoByMVP(); - deliverInfoByMVP.setId(deliver.getId()); - deliverInfoByMVP.setName(deliver.getName()); - if (ObjectUtil.isNotNull(deliver.getIsFinal())) { - if (deliver.getIsFinal() == 0) { - deliverInfoByMVP.setFinals(false); - } else if (deliver.getIsFinal() == 1) { - deliverInfoByMVP.setFinals(true); - } - } - if(ObjectUtil.isNotNull(subTimeId)) { - ProTaskDeliverPostLogExample logExample = new ProTaskDeliverPostLogExample(); - logExample.createCriteria().andDeliverIdEqualTo(deliver.getId()).andTaskSubTimeIdEqualTo(subTimeId).andIsHistoryEqualTo(0); - logExample.setOrderByClause("time DESC"); - List postLogList = deliverPostLogDao.selectByExample(logExample); - if (CollectionUtil.isNotEmpty(postLogList)) { - ProTaskDeliverPostLog postLog = postLogList.get(0); - SysCommitedFile file = commitedFileDao.selectByPrimaryKey(postLog.getFileId()); - deliverInfoByMVP.setUrl(WebConstant.URL_BASE + file.getPath()); - - ProTaskDeliverPostLogCheckerExample checkerExample = new ProTaskDeliverPostLogCheckerExample(); - checkerExample.createCriteria().andDeliverPostLogIdEqualTo(postLog.getId()); - List postLogCheckerList = postLogCheckerDao.selectByExample(checkerExample); - if (CollectionUtil.isNotEmpty(postLogCheckerList)) { - Boolean isChecker = false; - for (ProTaskDeliverPostLogChecker checker : postLogCheckerList) { - if (checker.getCheckStatus() == 0) { - deliverInfoByMVP.setStatus("待检查"); - isChecker = true; - } else { - deliverInfoByMVP.setStatus("未通过"); - break; - } - } - if (!isChecker) { - deliverInfoByMVP.setStatus("已通过"); - } - } - } else { - deliverInfoByMVP.setStatus("未上传"); - } - } - deliverInfoByMVPList.add(deliverInfoByMVP); - } - } - - return deliverInfoByMVPList; - } - - /** - * 上传文件 - */ - @Override - public DeliverVo.DFile uploadDeliver(String filePath, String name) { - //添加文件File - SysCommitedFile commitedFile = new SysCommitedFile(); - commitedFile.setId(snowflake.nextId()); - commitedFile.setName(name); - commitedFile.setPath(filePath); - String md5 = Md5Util.getFileMD5(new File(WebConstant.UPLOAD_PATH_BASE + File.separator + filePath)); - String sha1 = Sha1Util.getFileSha1(new File(WebConstant.UPLOAD_PATH_BASE + File.separator + filePath)); - commitedFile.setMd5(md5); - commitedFile.setSha1(sha1); - commitedFile.setCount(1); - commitedFile.setTime(System.currentTimeMillis()); - commitedFileDao.insertSelective(commitedFile); - - DeliverVo.DFile dFile = new DeliverVo.DFile(); - dFile.setId(commitedFile.getId()); - dFile.setName(commitedFile.getName()); - dFile.setUrl(commitedFile.getPath()); - return dFile; - } - - /** - * 将文件绑定交付物 - */ - @Override - public ProjectVo.DeliverInfo addDeliver(Long currentUserId, DeliverDto.UploadDeliver uploadDeliver) throws Exception { - Long subTimeId = isTaskOrSubTime(uploadDeliver.getTaskId()); - if(ObjectUtil.isNull(subTimeId)){ - throw new BaseException(CodeEnum.NOT_TASK); - } - ProjectVo.DeliverInfo deliverInfo = null; - //查找交付 - ProTaskDeliver d = taskDeliverDao.selectByPrimaryKey(uploadDeliver.getDeliverId()); - if (ObjectUtil.isNull(d)) { - throw new BaseException(CodeEnum.NOT_DELIVER); - } - - ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(d.getTaskDetailId()); - ProRole role = proRoleDao.selectByPrimaryKey(taskDetail.getExecutorRole()); - Boolean isBelongRole = proMemberService.userIsBelongRole(currentUserId, role.getId()); - if (role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase) || isBelongRole) { - //发送信息 - List messageUserList = new ArrayList<>(); - BaseMessageDto.MessageUser messageUser = null; - List userIdList = new ArrayList<>(); - //查找以前的交付物。如果有，改为历史信息 - ProTaskDeliverPostLogExample logExample = new ProTaskDeliverPostLogExample(); - logExample.createCriteria().andTaskSubTimeIdEqualTo(subTimeId) - .andDeliverIdEqualTo(uploadDeliver.getDeliverId()).andUserIdEqualTo(currentUserId); - List deliverPostLogList = deliverPostLogDao.selectByExample(logExample); - if (CollectionUtil.isNotEmpty(deliverPostLogList)) { - for (ProTaskDeliverPostLog deliverPostLog : deliverPostLogList) { - if (deliverPostLog.getIsHistory() == 0) { - deliverPostLog.setIsHistory(1); - deliverPostLogDao.updateByPrimaryKeySelective(deliverPostLog); - } - } - } - //添加PostLog - if (CollectionUtil.isNotEmpty(uploadDeliver.getFileInfo())) { - for (DeliverDto.fileInfo fileInfo : uploadDeliver.getFileInfo()) { - SysCommitedFile file = commitedFileDao.selectByPrimaryKey(fileInfo.getId()); - if (ObjectUtil.isNotNull(file)) { - ProTaskDeliverPostLog deliverPostLog = new ProTaskDeliverPostLog(); - deliverPostLog.setId(snowflake.nextId()); - deliverPostLog.setDeliverId(uploadDeliver.getDeliverId()); - deliverPostLog.setTaskSubTimeId(subTimeId); - deliverPostLog.setFileId(fileInfo.getId()); - deliverPostLog.setUserId(currentUserId); - deliverPostLog.setDescription(uploadDeliver.getDescription()); - deliverPostLog.setTime(System.currentTimeMillis()); - deliverPostLog.setIsHistory(0); - deliverPostLogDao.insertSelective(deliverPostLog); - //添加交付物检查人表 - if (CollectionUtil.isNotEmpty(uploadDeliver.getCheckerIdList())) { - ProTaskDeliverPostLogChecker postLogChecker = null; - for (Long checkerId : uploadDeliver.getCheckerIdList()) { - postLogChecker = new ProTaskDeliverPostLogChecker(); - postLogChecker.setId(snowflake.nextId()); - postLogChecker.setDeliverPostLogId(deliverPostLog.getId()); - postLogChecker.setCheckerId(checkerId); - postLogCheckerDao.insertSelective(postLogChecker); - } - } else { - throw new BaseException(CodeEnum.NOT_CHECKER); - } - } else { - throw new BaseException(CodeEnum.NOT_DELIVER_FILE); - } - } - } - - //修改交付物状态 - ProTaskDeliver deliver = new ProTaskDeliver(); - deliver.setId(uploadDeliver.getDeliverId()); - deliver.setIsUpload(1); - taskDeliverDao.updateByPrimaryKeySelective(deliver); - - //返回 - List deliverInfoList = taskDeliverDao.selectByDeliverId(uploadDeliver.getDeliverId()); - if (CollectionUtil.isNotEmpty(deliverInfoList)) { - deliverInfo = deliverInfoList.get(0); - deliverInfo.setUrl(WebConstant.URL_BASE + deliverInfo.getUrl()); - } - - //消息的内容 - if (CollectionUtil.isNotEmpty(userIdList)) { - HashSet h = new HashSet<>(userIdList); - userIdList.clear(); - userIdList.addAll(h); - for (Long userId : userIdList) { - messageUser = new BaseMessageDto.MessageUser(); - messageUser.setUserId(userId); - messageUserList.add(messageUser); - } - } - DeliverMessageWithUploadDto uploadMessage = new DeliverMessageWithUploadDto(); - DeliverMessageWithUploadDto.Data uploadMessageData = new DeliverMessageWithUploadDto.Data(); - uploadMessageData.setProjectId(taskDetail.getProjectId()); - if (role.getName().equals(WebConstant.ROLE_NAME.AllMember.phase)) { - List roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, taskDetail.getProjectId()); - uploadMessageData.setRoleId(roleList.get(0).getId()); - } else { - uploadMessageData.setRoleId(taskDetail.getExecutorRole()); - } - uploadMessageData.setTaskId(taskDetail.getId()); - uploadMessageData.setDeliverId(d.getId()); - uploadMessageData.setDeliverName(d.getName()); - uploadMessageData.setUploadTime(System.currentTimeMillis()); - uploadMessageData.setFile(uploadDeliver.getFileInfo()); - uploadMessage.setData(uploadMessageData); - - uploadMessage.setReceivers(messageUserList); - messageService.sendDeliverMessageWithUpload(uploadMessage); - } else { - throw new BaseException(CodeEnum.IS_NOT_EXECUTOR); - } - return deliverInfo; - } - /** - * 判断id是taskId还是subTimeId - * @param id - * @return subTimeId - */ - private Long isTaskOrSubTime(Long id){ - Long subTimeId = null; - //获取今天的开始结束时间 - Long startTime = DateUtil.getYMD(cn.hutool.core.date.DateUtil.date()).getTime(); - Long endTime = DateUtil.getYMD(cn.hutool.core.date.DateUtil.tomorrow()).getTime(); - //判断传入的信息是详情id还是subTimeId - ProTaskSubTime taskSubTime = taskSubTimeDao.selectByPrimaryKey(id); - ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(id); - if(ObjectUtil.isNotNull(taskSubTime)){ - subTimeId = taskSubTime.getId(); - }else if(ObjectUtil.isNotNull(taskDetail)){ - Long now = System.currentTimeMillis(); - subTimeId = taskDetailDao.selectSubTimeByTaskIdAndTime(taskDetail.getId(),now); -// if(ObjectUtil.isNotNull(subTime)){ -// subTimeId = subTime.getId(); -// } - } - return subTimeId; - } - - - /** - * 获取任务下所有交付物的信息 - * - * @param currentUserId - * @param - * @return - * @throws Exception - */ - @Override - public List selectTaskDeliver(Long currentUserId, Long taskId) throws Exception { - Long subTimeId = isTaskOrSubTime(taskId); - if(ObjectUtil.isNull(subTimeId)){ - throw new BaseException(CodeEnum.NOT_TASK); - } - List deliverInfoList = new ArrayList<>(); - DeliverVo.DeliverInfo deliverInfo = null; - ProTaskSubTime subTime = taskSubTimeDao.selectByPrimaryKey(subTimeId); - if (ObjectUtil.isNotNull(subTimeId)) { - //获取角色负责人信息 - - //获取任务下所有交付物 - ProTaskDeliverExample deliverExample = new ProTaskDeliverExample(); - deliverExample.createCriteria().andTaskDetailIdEqualTo(subTime.getTaskDetailId()); - List taskDeliverList = taskDeliverDao.selectByExample(deliverExample); - if (CollectionUtil.isNotEmpty(taskDeliverList)) { - for (ProTaskDeliver deliver : taskDeliverList) { - if (deliver.getIsInput() == 0) { - deliverInfo = selectDeliverInfo(currentUserId, deliver.getId(), subTimeId); - deliverInfoList.add(deliverInfo); - } - } - } - } - return deliverInfoList; - -// //获取此用户在这个项目中的角色 -// ProTaskDetail task = taskDetailDao.selectByPrimaryKey(taskId); -// List roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, task.getProjectId()); -// //查找交付物的信息 -// List deliverInfoList = taskDeliverDao.selectBySubTimeId(subTimeId); -// if(CollectionUtil.isNotEmpty(deliverInfoList)){ -// for(DeliverVo.DeliverInfo deliverInfo:deliverInfoList){ -// if(CollectionUtil.isNotEmpty(deliverInfo.getFileList())) { -// for(DeliverVo.FilePath filePath:deliverInfo.getFileList()) { -// Boolean isChecker = false; -// //修改文件路径为可下载路径 -// filePath.setUrl(WebConstant.URL_BASE + filePath.getUrl()); -// if (ObjectUtil.isNotNull(filePath.getUploaderId())) { -// //添加上传人的姓名信息 -// ProMember member = proMemberService.selectByUserId(filePath.getUploaderId(),task.getProjectId()); -// if (ObjectUtil.isNotNull(member)) { -// filePath.setUploaderName(member.getNickname()); -// } -// //添加上传人所属的角色 -// List dRoleList = new ArrayList<>(); -// List uploaderRoleList = proMemberService.selectRolesByUserIdAndProjectId(filePath.getUploaderId(), task.getProjectId()); -// if (CollectionUtil.isNotEmpty(uploaderRoleList)) { -// for (ProRole role : uploaderRoleList) { -// DeliverVo.DRole dRole = new DeliverVo.DRole(); -// dRole.setId(role.getId()); -// dRole.setName(role.getName()); -// dRoleList.add(dRole); -// } -// } -// filePath.setRole(dRoleList); -// } -// //添加检查人的名称信息 -// if(CollectionUtil.isNotEmpty(filePath.getCheckerList())){ -// for (DeliverVo.Checker checker:filePath.getCheckerList()){ -// ProRole role = proRoleDao.selectByPrimaryKey(checker.getCheckerId()); -// checker.setCheckerName(role.getName()); -// //该用户是否是此交付物的检查人 -// isChecker = false; -// if (CollectionUtil.isNotEmpty(roleList)) { -// for (ProRole proRole : roleList) { -// if (proRole.getId().longValue() == checker.getCheckerId().longValue()) { -// isChecker = true; -// break; -// } -// } -// } -// } -// } -// filePath.setIsChecker(isChecker); -// } -// } -// } -// } -// return deliverInfoList; - } - - /** - * 查看单个交付物的信息 - * - * @param currentUserId - * @param deliverId - * @return - */ - @Override - public DeliverVo.DeliverInfo selectDeliverInfo(Long currentUserId, Long deliverId, Long taskId) throws Exception { - Long subTimeId = isTaskOrSubTime(taskId); - if(ObjectUtil.isNull(subTimeId)){ - throw new BaseException(CodeEnum.NOT_TASK); - } - - DeliverVo.DeliverInfo deliverInfo = new DeliverVo.DeliverInfo(); - ProTaskDeliver deliver = taskDeliverDao.selectByPrimaryKey(deliverId); - - //获取此用户在这个项目中的角色 - ProTaskDetail task = taskDetailDao.selectByPrimaryKey(deliver.getTaskDetailId()); - List roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, task.getProjectId()); - - if (ObjectUtil.isNotNull(deliver)) { - deliverInfo.setDeliverId(deliver.getId()); - deliverInfo.setDeliverName(deliver.getName()); - } - //负责人信息 - List executorRoleList = new ArrayList<>(); - DeliverVo.DRole executorRole = null; - ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(taskSubTimeDao.selectByPrimaryKey(subTimeId).getTaskDetailId()); - if(ObjectUtil.isNotNull(taskDetail)){ - ProRole role = proRoleDao.selectByPrimaryKey(taskDetail.getExecutorRole()); - if(ObjectUtil.isNotNull(role)){ - if(role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase)){ - List roleInfoList = proRoleDao.selectSecondRolesByProjectId(taskDetail.getProjectId()); - if(CollectionUtil.isNotEmpty(roleInfoList)){ - for(ProjectVo.RoleInfo roleInfo:roleInfoList){ - executorRole = new DeliverVo.DRole(); - executorRole.setId(roleInfo.getId()); - executorRole.setName(roleInfo.getName()); - executorRoleList.add(executorRole); - } - } - }else { - executorRole = new DeliverVo.DRole(); - executorRole.setId(role.getId()); - executorRole.setName(role.getName()); - executorRoleList.add(executorRole); - } - deliverInfo.setExecutorRoleList(executorRoleList); - } - } - - //检查人信息 - List checkerList = null; - Boolean isChecker = false; - DeliverVo.Checker checker = null; - //交付物文件的信息按时间排序 - List fileIds = taskDeliverDao.selectFileIdByDeliverId(deliver.getId(), subTimeId); - if (CollectionUtil.isNotEmpty(fileIds)) { - for (DeliverVo.FilePath filePath : fileIds) { - //修改文件路径为可下载路径 - filePath.setUrl(WebConstant.URL_BASE + filePath.getUrl()); - if (ObjectUtil.isNotNull(filePath.getUploaderId())) { - //添加上传人的姓名信息 - ProMember member = proMemberService.selectByUserId(filePath.getUploaderId(), task.getProjectId()); - if (ObjectUtil.isNotNull(member)) { - filePath.setUploaderName(member.getNickname()); - } - //添加上传人所属的角色 - List dRoleList = new ArrayList<>(); - List uploaderRoleList = proMemberService.selectRolesByUserIdAndProjectId(filePath.getUploaderId(), task.getProjectId()); - if (CollectionUtil.isNotEmpty(uploaderRoleList)) { - for (ProRole role : uploaderRoleList) { - DeliverVo.DRole dRole = new DeliverVo.DRole(); - dRole.setId(role.getId()); - dRole.setName(role.getName()); - dRoleList.add(dRole); - } - } - filePath.setRole(dRoleList); - } - - checkerList = new ArrayList<>(); - ProTaskDeliverPostLogCheckerExample checkerExample = new ProTaskDeliverPostLogCheckerExample(); - checkerExample.createCriteria().andDeliverPostLogIdEqualTo(filePath.getPostLogId()); - List postLogCheckerList = postLogCheckerDao.selectByExample(checkerExample); - if (CollectionUtil.isNotEmpty(postLogCheckerList)) { - for (ProTaskDeliverPostLogChecker postLogChecker : postLogCheckerList) { - ProRole role = proRoleDao.selectByPrimaryKey(postLogChecker.getCheckerId()); - checker = new DeliverVo.Checker(); - checker.setCheckerId(postLogChecker.getCheckerId()); - checker.setCheckerName(role.getName()); - checker.setRemark(postLogChecker.getRemark()); - checker.setCheckerStatus(postLogChecker.getCheckStatus()); - checkerList.add(checker); - if (CollectionUtil.isNotEmpty(roleList)) { - for (ProRole proRole : roleList) { - if (proRole.getId().longValue() == postLogChecker.getCheckerId().longValue()) { - isChecker = true; - break; - } - } - } - } - } - filePath.setCheckerList(checkerList); - filePath.setIsChecker(isChecker); - } - deliverInfo.setFileList(fileIds); - } - return deliverInfo; - } - - /** - * 检查人检查交付物 - */ - @Override - public DeliverVo.DeliverInfo checkDeliver(Long currentUserId, DeliverDto.CheckDeliver checkDeliver) throws Exception { - Long subTimeId = isTaskOrSubTime(checkDeliver.getTaskId()); - if(ObjectUtil.isNull(subTimeId)){ - throw new BaseException(CodeEnum.NOT_TASK); - } - List messageUserList = new ArrayList<>(); - BaseMessageDto.MessageUser messageUser = null; - ProRole checkRole = null; - - //查找该用户在此项目的角色 - ProTaskDeliver deliver = taskDeliverDao.selectByPrimaryKey(checkDeliver.getDeliverId()); - ProTaskDetail task = taskDetailDao.selectByPrimaryKey(deliver.getTaskDetailId()); - ProRole Role = proRoleDao.selectByPrimaryKey(task.getExecutorRole()); - List roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, task.getProjectId()); - if (CollectionUtil.isNotEmpty(roleList)) { - for (ProRole role : roleList) { - ProTaskDeliverPostLogExample logExample = new ProTaskDeliverPostLogExample(); - logExample.createCriteria().andTaskSubTimeIdEqualTo(subTimeId); - logExample.setOrderByClause("time DESC"); - List deliverPostLogList = deliverPostLogDao.selectByExample(logExample); - if (CollectionUtil.isNotEmpty(deliverPostLogList)) { - for (ProTaskDeliverPostLog postLog : deliverPostLogList) { - ProTaskDeliverPostLogCheckerExample checkerExample = new ProTaskDeliverPostLogCheckerExample(); - checkerExample.createCriteria().andDeliverPostLogIdEqualTo(postLog.getId()); - List postLogCheckerList = postLogCheckerDao.selectByExample(checkerExample); - if (CollectionUtil.isNotEmpty(postLogCheckerList)) { - for (ProTaskDeliverPostLogChecker postLogChecker : postLogCheckerList) { - if (role.getId().longValue() == postLogChecker.getCheckerId().longValue()) { - postLogChecker.setRemark(checkDeliver.getText()); - if (checkDeliver.getCheckStatus()) { - postLogChecker.setCheckStatus(1); - } else { - postLogChecker.setCheckStatus(-1); - } - postLogCheckerDao.updateByPrimaryKeySelective(postLogChecker); - } - } - } - messageUser = new BaseMessageDto.MessageUser(); - messageUser.setUserId(postLog.getUserId()); - messageUserList.add(messageUser); - checkRole = role; - } - } - if (ObjectUtil.isNull(checkRole)) { - throw new BaseException(CodeEnum.IS_NOT_CHECKER); - } - } - } - //发送消息 - Long checkTime = System.currentTimeMillis(); - DeliverMessageWithCheckerDto checkerDto = new DeliverMessageWithCheckerDto(); - DeliverMessageWithCheckerDto.Data checkerDtoData = new DeliverMessageWithCheckerDto.Data(); - checkerDtoData.setProjectId(task.getProjectId()); - if (Role.getName().equals(WebConstant.ROLE_NAME.AllMember.phase)) { - checkerDtoData.setRoleId(roleList.get(0).getId()); - } else { - checkerDtoData.setRoleId(task.getExecutorRole()); - } - checkerDtoData.setTaskId(task.getId()); - checkerDtoData.setDeliverId(deliver.getId()); - checkerDtoData.setDeliverName(deliver.getName()); - checkerDtoData.setCheckRoleId(checkRole.getId()); - checkerDtoData.setCheckRoleName(checkRole.getName()); - checkerDtoData.setCheckTime(checkTime); - checkerDtoData.setIsChecker(checkDeliver.getCheckStatus()); - checkerDto.setData(checkerDtoData); - - checkerDto.setReceivers(messageUserList); - messageService.sendDeliverMessageWithChecker(checkerDto); - - //检查完，返回数据 - DeliverVo.DeliverInfo deliverInfo = selectDeliverInfo(currentUserId, deliver.getId(), checkDeliver.getTaskId()); - return deliverInfo; - } - - /** - * 交付物清单 - * - * @param currentUserId - * @param page - * @param pageSize - * @param key - * @param start - * @param end - * @return - * @throws Exception - */ - @Override - public DeliverVo.DeliverFileList selectDeliverList(Long currentUserId, Integer page, Integer pageSize, String - key, String start, String end) throws Exception { - DeliverVo.DeliverFileList deliver = new DeliverVo.DeliverFileList(); - DeliverVo.PageInfo pageInfo = new DeliverVo.PageInfo(); - List deliverFileList = taskDeliverDao.selectDeliverByUserId(currentUserId); - - //根据时间筛选 - if (StrUtil.isNotEmpty(start) && StrUtil.isNotEmpty(end)) { - //获取日期的开始结束时间 - Long startMillisTime = null; - Long endMillisTime = null; - Map timeMap = null; - if (StrUtil.isNotEmpty(start)) { - timeMap = DateUtil.projectFormatDateTime(start); - startMillisTime = timeMap.get("startMillisTime"); - } - if (StrUtil.isNotEmpty(end)) { - timeMap = DateUtil.projectFormatDateTime(start); - endMillisTime = timeMap.get("endMillisTime"); - } - if (CollectionUtil.isNotEmpty(deliverFileList)) { - if (ObjectUtil.isNotNull(startMillisTime) && ObjectUtil.isNotNull(endMillisTime)) { - Iterator it = deliverFileList.iterator(); - while (it.hasNext()) { - DeliverVo.DeliverFile deliverFile = it.next(); - if ((deliverFile.getTask().getBeginTime() < startMillisTime && deliverFile.getTask().getBeginTime() > endMillisTime) || - (deliverFile.getTask().getEndTime() < startMillisTime) || - (deliverFile.getTask().getBeginTime() > endMillisTime)) { - it.remove(); - } - } - } - } - } - - //根据关键词筛选 - if (StrUtil.isNotEmpty(key)) { - if (CollectionUtil.isNotEmpty(deliverFileList)) { - Iterator it = deliverFileList.iterator(); - while (it.hasNext()) { - DeliverVo.DeliverFile deliverFile = it.next(); - if (deliverFile.getName().indexOf(key) == -1) { - it.remove(); - } - } - } - } - - //分页 - List theDeliverFile = null; - int totalPages = 1; - if (CollectionUtil.isNotEmpty(deliverFileList)) { - //1.计算分页条件 - if (page > 0) { - int size = deliverFileList.size(); - int num = pageSize; - totalPages = size / pageSize + 1; - int startIndex = pageSize * (page - 1); - if (startIndex >= size) { - startIndex = -1; - } else { - if (startIndex + num > size) { - num = size - startIndex; - } - } - //拷贝分页数据 - if (startIndex >= 0) { - theDeliverFile = CollectionUtil.newArrayList(); - for (int i = startIndex; i < startIndex + num; i++) { - theDeliverFile.add(deliverFileList.get(i)); - } - } - } else { //不分页 - theDeliverFile = CollectionUtil.newArrayList(deliverFileList); - } - } - pageInfo.setCurrentPage(page); - pageInfo.setTotalPage(totalPages); - deliver.setPageInfo(pageInfo); - deliver.setDeliverFileList(theDeliverFile); - return deliver; - } - - /** - * 删除交付物（修改状态变成历史项目） - * - * @param currentUserId - * @param deliverId - * @param taskId - */ - @Override - public void deleteDeliver(Long currentUserId, Long deliverId, Long taskId) throws Exception { - ProTaskDeliver deliver = taskDeliverDao.selectByPrimaryKey(deliverId); - Long subTimeId = isTaskOrSubTime(taskId); - //接受消息的角色 - List messageUserList = new ArrayList<>(); - BaseMessageDto.MessageUser messageUser = null; - List userIdList = new ArrayList<>(); - - //同步锁,防止多个用户同时操作该数据 - synchronized (this) { - //查找此交付物与文件的中间表 - ProTaskDeliverPostLogExample deliverPostLogExample = new ProTaskDeliverPostLogExample(); - deliverPostLogExample.createCriteria().andDeliverIdEqualTo(deliverId).andTaskSubTimeIdEqualTo(subTimeId); - List deliverPostLogList = deliverPostLogDao.selectByExample(deliverPostLogExample); - - if (CollectionUtil.isNotEmpty(deliverPostLogList)) { - for (ProTaskDeliverPostLog deliverPostLog : deliverPostLogList) { - if (currentUserId.longValue() == deliverPostLog.getUserId().longValue()) { - if (deliverPostLog.getIsHistory() == 0) { - deliverPostLog.setIsHistory(1); - deliverPostLogDao.updateByPrimaryKeySelective(deliverPostLog); - } - ProTaskDeliverPostLogCheckerExample checkerExample = new ProTaskDeliverPostLogCheckerExample(); - checkerExample.createCriteria().andDeliverPostLogIdEqualTo(deliverPostLog.getId()); - List postCheckerList = postLogCheckerDao.selectByExample(checkerExample); - if (CollectionUtil.isNotEmpty(postCheckerList)) { - for (ProTaskDeliverPostLogChecker postLogChecker : postCheckerList) { - userIdList.addAll(userService.selectUserIdByRoleId(postLogChecker.getCheckerId())); - } - } - } else { - throw new BaseException("您无法删除别人上传的交付物"); - } - } - } - deliver.setIsUpload(0); - taskDeliverDao.updateByPrimaryKeySelective(deliver); - - ProTaskDetail task = taskDetailDao.selectByPrimaryKey(deliver.getTaskDetailId()); - ProRole role = proRoleDao.selectByPrimaryKey(task.getExecutorRole()); - //发送消息 - if (CollectionUtil.isNotEmpty(userIdList)) { - HashSet h = new HashSet<>(userIdList); - userIdList.clear(); - userIdList.addAll(h); - for (Long userId : userIdList) { - messageUser = new BaseMessageDto.MessageUser(); - messageUser.setUserId(userId); - messageUserList.add(messageUser); - } - } - - Long deleteTime = System.currentTimeMillis(); - DeliverMessageWithDeleteDto deleteMessage = new DeliverMessageWithDeleteDto(); - DeliverMessageWithDeleteDto.Data deleteMessageData = new DeliverMessageWithDeleteDto.Data(); - deleteMessageData.setProjectId(task.getProjectId()); -// if (role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase)) { -// List roleList = memberService.selectRolesByUserIdAndProjectId(currentUserId, task.getProjectId()); -// deleteMessageData.setRoleId(roleList.get(0).getId()); -// } else { -// -// } - deleteMessageData.setRoleId(task.getExecutorRole()); - deleteMessageData.setTaskId(task.getId()); - deleteMessageData.setDeliverId(deliverId); - deleteMessageData.setDeliverName(deliver.getName()); - deleteMessageData.setDeleteTime(deleteTime); - deleteMessageData.setUserId(currentUserId); - deleteMessage.setData(deleteMessageData); - - deleteMessage.setReceivers(messageUserList); - messageService.sendDeliverMessageWithDelete(deleteMessage); - } - } - - //========================================================= - @Override - public void deleteDeliverByTaskId(Long taskId) { - //查找已上传的文件 - - } - - //删除文件 - public void deleteFile(String path) { - File file = new File(path); - // 路径为文件且不为空则进行删除 - if (file.isFile() && file.exists()) { - file.delete(); - } - } -} +package com.ccsens.tall.service; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.ccsens.tall.bean.dto.DeliverDto; +import com.ccsens.tall.bean.dto.message.BaseMessageDto; +import com.ccsens.tall.bean.dto.message.DeliverMessageWithCheckerDto; +import com.ccsens.tall.bean.dto.message.DeliverMessageWithDeleteDto; +import com.ccsens.tall.bean.dto.message.DeliverMessageWithUploadDto; +import com.ccsens.tall.bean.po.*; +import com.ccsens.tall.bean.vo.DeliverVo; +import com.ccsens.tall.bean.vo.ProjectVo; +import com.ccsens.tall.bean.vo.TaskVo; +import com.ccsens.tall.persist.dao.*; +import com.ccsens.util.*; +import com.ccsens.util.exception.BaseException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.io.File; +import java.util.*; + +@Service +@Transactional(propagation = Propagation.REQUIRED) +public class TaskDeliverService implements ITaskDeliverService { + @Autowired + private TaskDeliverDao taskDeliverDao; + @Autowired + private SysCommitedFileDao commitedFileDao; + @Autowired + private ProTaskDeliverPostLogDao deliverPostLogDao; + @Autowired + private PostLogCheckerDao postLogCheckerDao; + @Autowired + private TaskDetailDao taskDetailDao; + @Autowired + private TaskSubTimeDao taskSubTimeDao; + @Autowired + private ProRoleDao proRoleDao; + @Autowired + private ProSubTimeMemberDao proSubTimeMemberDao; + @Autowired + private ProMemberDao proMemberDao; + @Autowired + private IProMemberService proMemberService; + @Autowired + private IUserService userService; + @Autowired + private IMessageService messageService; + @Autowired + private Snowflake snowflake; + + @Override + public void saveDeliver(ProTaskDeliver taskDeliver) { + taskDeliverDao.insertSelective(taskDeliver); + } + + /** + * 根据taskId查找交付物或输入文档 + */ + @Override + public List selectDeliverOrInputByTask(Long taskId, int isInput) { + List deliverInfoByMVPList = new ArrayList<>(); + Long subTimeId = isTaskOrSubTime(taskId); + ProTaskDeliverExample deliverExample = new ProTaskDeliverExample(); + deliverExample.createCriteria().andIsInputEqualTo(isInput).andTaskDetailIdEqualTo(taskId); + List deliverList = taskDeliverDao.selectByExample(deliverExample); + if (CollectionUtil.isNotEmpty(deliverList)) { + for (ProTaskDeliver deliver : deliverList) { + TaskVo.TaskDeliverByMVP.DeliverInfoByMVP deliverInfoByMVP = new TaskVo.TaskDeliverByMVP.DeliverInfoByMVP(); + deliverInfoByMVP.setId(deliver.getId()); + deliverInfoByMVP.setName(deliver.getName()); + if (ObjectUtil.isNotNull(deliver.getIsFinal())) { + if (deliver.getIsFinal() == 0) { + deliverInfoByMVP.setFinals(false); + } else if (deliver.getIsFinal() == 1) { + deliverInfoByMVP.setFinals(true); + } + } + if (ObjectUtil.isNotNull(subTimeId)) { + ProTaskDeliverPostLogExample logExample = new ProTaskDeliverPostLogExample(); + logExample.createCriteria().andDeliverIdEqualTo(deliver.getId()).andTaskSubTimeIdEqualTo(subTimeId).andIsHistoryEqualTo(0); + logExample.setOrderByClause("time DESC"); + List postLogList = deliverPostLogDao.selectByExample(logExample); + if (CollectionUtil.isNotEmpty(postLogList)) { + ProTaskDeliverPostLog postLog = postLogList.get(0); + SysCommitedFile file = commitedFileDao.selectByPrimaryKey(postLog.getFileId()); + deliverInfoByMVP.setUrl(WebConstant.URL_BASE + file.getPath()); + + ProTaskDeliverPostLogCheckerExample checkerExample = new ProTaskDeliverPostLogCheckerExample(); + checkerExample.createCriteria().andDeliverPostLogIdEqualTo(postLog.getId()); + List postLogCheckerList = postLogCheckerDao.selectByExample(checkerExample); + if (CollectionUtil.isNotEmpty(postLogCheckerList)) { + Boolean isChecker = false; + for (ProTaskDeliverPostLogChecker checker : postLogCheckerList) { + if (checker.getCheckStatus() == 0) { + deliverInfoByMVP.setStatus("待检查"); + isChecker = true; + } else { + deliverInfoByMVP.setStatus("未通过"); + break; + } + } + if (!isChecker) { + deliverInfoByMVP.setStatus("已通过"); + } + } + } else { + deliverInfoByMVP.setStatus("未上传"); + } + } + deliverInfoByMVPList.add(deliverInfoByMVP); + } + } + return deliverInfoByMVPList; + } + + /** + * 上传文件 + */ + @Override + public DeliverVo.DFile uploadDeliver(String filePath, String name) { + //添加文件File + SysCommitedFile commitedFile = new SysCommitedFile(); + commitedFile.setId(snowflake.nextId()); + commitedFile.setName(name); + commitedFile.setPath(filePath); + String md5 = Md5Util.getFileMD5(new File(WebConstant.UPLOAD_PATH_BASE + File.separator + filePath)); + String sha1 = Sha1Util.getFileSha1(new File(WebConstant.UPLOAD_PATH_BASE + File.separator + filePath)); + commitedFile.setMd5(md5); + commitedFile.setSha1(sha1); + commitedFile.setCount(1); + commitedFile.setTime(System.currentTimeMillis()); + commitedFileDao.insertSelective(commitedFile); + + DeliverVo.DFile dFile = new DeliverVo.DFile(); + dFile.setId(commitedFile.getId()); + dFile.setName(commitedFile.getName()); + dFile.setUrl(commitedFile.getPath()); + return dFile; + } + + /** + * 将文件绑定交付物 + */ + @Override + public ProjectVo.DeliverInfo addDeliver(Long currentUserId, DeliverDto.UploadDeliver uploadDeliver) throws Exception { + Long subTimeId = isTaskOrSubTime(uploadDeliver.getTaskId()); + if (ObjectUtil.isNull(subTimeId)) { + throw new BaseException(CodeEnum.NOT_TASK); + } + ProjectVo.DeliverInfo deliverInfo = null; + //查找交付 + ProTaskDeliver d = taskDeliverDao.selectByPrimaryKey(uploadDeliver.getDeliverId()); + if (ObjectUtil.isNull(d)) { + throw new BaseException(CodeEnum.NOT_DELIVER); + } + + ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(d.getTaskDetailId()); + ProRole role = proRoleDao.selectByPrimaryKey(taskDetail.getExecutorRole()); + Boolean isBelongRole = proMemberService.userIsBelongRole(currentUserId, role.getId()); + if (role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase) || isBelongRole) { + //发送信息 + List messageUserList = new ArrayList<>(); + BaseMessageDto.MessageUser messageUser = null; + List userIdList = new ArrayList<>(); + //查找以前的交付物。如果有，改为历史信息 + ProTaskDeliverPostLogExample logExample = new ProTaskDeliverPostLogExample(); + logExample.createCriteria().andTaskSubTimeIdEqualTo(subTimeId) + .andDeliverIdEqualTo(uploadDeliver.getDeliverId()).andUserIdEqualTo(currentUserId); + List deliverPostLogList = deliverPostLogDao.selectByExample(logExample); + if (CollectionUtil.isNotEmpty(deliverPostLogList)) { + for (ProTaskDeliverPostLog deliverPostLog : deliverPostLogList) { + if (deliverPostLog.getIsHistory() == 0) { + deliverPostLog.setIsHistory(1); + deliverPostLogDao.updateByPrimaryKeySelective(deliverPostLog); + } + } + } + //添加PostLog + if (CollectionUtil.isNotEmpty(uploadDeliver.getFileInfo())) { + for (DeliverDto.fileInfo fileInfo : uploadDeliver.getFileInfo()) { + SysCommitedFile file = commitedFileDao.selectByPrimaryKey(fileInfo.getId()); + if (ObjectUtil.isNotNull(file)) { + ProTaskDeliverPostLog deliverPostLog = new ProTaskDeliverPostLog(); + deliverPostLog.setId(snowflake.nextId()); + deliverPostLog.setDeliverId(uploadDeliver.getDeliverId()); + deliverPostLog.setTaskSubTimeId(subTimeId); + deliverPostLog.setFileId(fileInfo.getId()); + deliverPostLog.setUserId(currentUserId); + deliverPostLog.setDescription(uploadDeliver.getDescription()); + deliverPostLog.setTime(System.currentTimeMillis()); + deliverPostLog.setIsHistory(0); + deliverPostLogDao.insertSelective(deliverPostLog); + //添加交付物检查人表 + if (CollectionUtil.isNotEmpty(uploadDeliver.getCheckerIdList())) { + ProTaskDeliverPostLogChecker postLogChecker = null; + for (Long checkerId : uploadDeliver.getCheckerIdList()) { + postLogChecker = new ProTaskDeliverPostLogChecker(); + postLogChecker.setId(snowflake.nextId()); + postLogChecker.setDeliverPostLogId(deliverPostLog.getId()); + postLogChecker.setCheckerId(checkerId); + postLogCheckerDao.insertSelective(postLogChecker); + } + } else { + throw new BaseException(CodeEnum.NOT_CHECKER); + } + } else { + throw new BaseException(CodeEnum.NOT_DELIVER_FILE); + } + } + } + + //修改交付物状态 + ProTaskDeliver deliver = new ProTaskDeliver(); + deliver.setId(uploadDeliver.getDeliverId()); + deliver.setIsUpload(1); + taskDeliverDao.updateByPrimaryKeySelective(deliver); + + //返回 + List deliverInfoList = taskDeliverDao.selectByDeliverId(uploadDeliver.getDeliverId()); + if (CollectionUtil.isNotEmpty(deliverInfoList)) { + deliverInfo = deliverInfoList.get(0); + deliverInfo.setUrl(WebConstant.URL_BASE + deliverInfo.getUrl()); + } + + //消息的内容 + if (CollectionUtil.isNotEmpty(userIdList)) { + HashSet h = new HashSet<>(userIdList); + userIdList.clear(); + userIdList.addAll(h); + for (Long userId : userIdList) { + messageUser = new BaseMessageDto.MessageUser(); + messageUser.setUserId(userId); + messageUserList.add(messageUser); + } + } + DeliverMessageWithUploadDto uploadMessage = new DeliverMessageWithUploadDto(); + DeliverMessageWithUploadDto.Data uploadMessageData = new DeliverMessageWithUploadDto.Data(); + uploadMessageData.setProjectId(taskDetail.getProjectId()); + if (role.getName().equals(WebConstant.ROLE_NAME.AllMember.phase)) { + List roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, taskDetail.getProjectId()); + uploadMessageData.setRoleId(roleList.get(0).getId()); + } else { + uploadMessageData.setRoleId(taskDetail.getExecutorRole()); + } + uploadMessageData.setTaskId(taskDetail.getId()); + uploadMessageData.setDeliverId(d.getId()); + uploadMessageData.setDeliverName(d.getName()); + uploadMessageData.setUploadTime(System.currentTimeMillis()); + uploadMessageData.setFile(uploadDeliver.getFileInfo()); + uploadMessage.setData(uploadMessageData); + + uploadMessage.setReceivers(messageUserList); + messageService.sendDeliverMessageWithUpload(uploadMessage); + } else { + throw new BaseException(CodeEnum.IS_NOT_EXECUTOR); + } + return deliverInfo; + } + + /** + * 判断id是taskId还是subTimeId + * + * @param id + * @return subTimeId + */ + private Long isTaskOrSubTime(Long id) { + Long subTimeId = null; + //获取今天的开始结束时间 + Long startTime = DateUtil.getYMD(cn.hutool.core.date.DateUtil.date()).getTime(); + Long endTime = DateUtil.getYMD(cn.hutool.core.date.DateUtil.tomorrow()).getTime(); + //判断传入的信息是详情id还是subTimeId + ProTaskSubTime taskSubTime = taskSubTimeDao.selectByPrimaryKey(id); + ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(id); + if (ObjectUtil.isNotNull(taskSubTime)) { + subTimeId = taskSubTime.getId(); + } else if (ObjectUtil.isNotNull(taskDetail)) { + Long now = System.currentTimeMillis(); + subTimeId = taskDetailDao.selectSubTimeByTaskIdAndTime(taskDetail.getId(), now); +// if(ObjectUtil.isNotNull(subTime)){ +// subTimeId = subTime.getId(); +// } + } + return subTimeId; + } + + + /** + * 获取任务下所有交付物的信息 + * + * @param currentUserId + * @param + * @return + * @throws Exception + */ + @Override + public List selectTaskDeliver(Long currentUserId, Long taskId) throws Exception { + Long subTimeId = isTaskOrSubTime(taskId); + if (ObjectUtil.isNull(subTimeId)) { + throw new BaseException(CodeEnum.NOT_TASK); + } + List deliverInfoList = new ArrayList<>(); + DeliverVo.DeliverInfo deliverInfo = null; + ProTaskSubTime subTime = taskSubTimeDao.selectByPrimaryKey(subTimeId); + if (ObjectUtil.isNotNull(subTimeId)) { + //获取角色负责人信息 + + //获取任务下所有交付物 + ProTaskDeliverExample deliverExample = new ProTaskDeliverExample(); + deliverExample.createCriteria().andTaskDetailIdEqualTo(subTime.getTaskDetailId()); + List taskDeliverList = taskDeliverDao.selectByExample(deliverExample); + if (CollectionUtil.isNotEmpty(taskDeliverList)) { + for (ProTaskDeliver deliver : taskDeliverList) { + if (deliver.getIsInput() == 0) { + deliverInfo = selectDeliverInfo(currentUserId, deliver.getId(), subTimeId); + deliverInfoList.add(deliverInfo); + } + } + } + } + return deliverInfoList; + +// //获取此用户在这个项目中的角色 +// ProTaskDetail task = taskDetailDao.selectByPrimaryKey(taskId); +// List roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, task.getProjectId()); +// //查找交付物的信息 +// List deliverInfoList = taskDeliverDao.selectBySubTimeId(subTimeId); +// if(CollectionUtil.isNotEmpty(deliverInfoList)){ +// for(DeliverVo.DeliverInfo deliverInfo:deliverInfoList){ +// if(CollectionUtil.isNotEmpty(deliverInfo.getFileList())) { +// for(DeliverVo.FilePath filePath:deliverInfo.getFileList()) { +// Boolean isChecker = false; +// //修改文件路径为可下载路径 +// filePath.setUrl(WebConstant.URL_BASE + filePath.getUrl()); +// if (ObjectUtil.isNotNull(filePath.getUploaderId())) { +// //添加上传人的姓名信息 +// ProMember member = proMemberService.selectByUserId(filePath.getUploaderId(),task.getProjectId()); +// if (ObjectUtil.isNotNull(member)) { +// filePath.setUploaderName(member.getNickname()); +// } +// //添加上传人所属的角色 +// List dRoleList = new ArrayList<>(); +// List uploaderRoleList = proMemberService.selectRolesByUserIdAndProjectId(filePath.getUploaderId(), task.getProjectId()); +// if (CollectionUtil.isNotEmpty(uploaderRoleList)) { +// for (ProRole role : uploaderRoleList) { +// DeliverVo.DRole dRole = new DeliverVo.DRole(); +// dRole.setId(role.getId()); +// dRole.setName(role.getName()); +// dRoleList.add(dRole); +// } +// } +// filePath.setRole(dRoleList); +// } +// //添加检查人的名称信息 +// if(CollectionUtil.isNotEmpty(filePath.getCheckerList())){ +// for (DeliverVo.Checker checker:filePath.getCheckerList()){ +// ProRole role = proRoleDao.selectByPrimaryKey(checker.getCheckerId()); +// checker.setCheckerName(role.getName()); +// //该用户是否是此交付物的检查人 +// isChecker = false; +// if (CollectionUtil.isNotEmpty(roleList)) { +// for (ProRole proRole : roleList) { +// if (proRole.getId().longValue() == checker.getCheckerId().longValue()) { +// isChecker = true; +// break; +// } +// } +// } +// } +// } +// filePath.setIsChecker(isChecker); +// } +// } +// } +// } +// return deliverInfoList; + } + + /** + * 查看单个交付物的信息 + * + * @param currentUserId + * @param deliverId + * @return + */ + @Override + public DeliverVo.DeliverInfo selectDeliverInfo(Long currentUserId, Long deliverId, Long taskId) throws Exception { + Long subTimeId = isTaskOrSubTime(taskId); + if (ObjectUtil.isNull(subTimeId)) { + throw new BaseException(CodeEnum.NOT_TASK); + } + + DeliverVo.DeliverInfo deliverInfo = new DeliverVo.DeliverInfo(); + ProTaskDeliver deliver = taskDeliverDao.selectByPrimaryKey(deliverId); + + //获取此用户在这个项目中的角色 + ProTaskDetail task = taskDetailDao.selectByPrimaryKey(deliver.getTaskDetailId()); + List roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, task.getProjectId()); + + if (ObjectUtil.isNotNull(deliver)) { + deliverInfo.setDeliverId(deliver.getId()); + deliverInfo.setDeliverName(deliver.getName()); + } + //负责人信息 + List executorRoleList = new ArrayList<>(); + DeliverVo.DRole executorRole = null; + ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(taskSubTimeDao.selectByPrimaryKey(subTimeId).getTaskDetailId()); + if (ObjectUtil.isNotNull(taskDetail)) { + ProRole role = proRoleDao.selectByPrimaryKey(taskDetail.getExecutorRole()); + if (ObjectUtil.isNotNull(role)) { + if (role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase)) { + List roleInfoList = proRoleDao.selectSecondRolesByProjectId(taskDetail.getProjectId()); + if (CollectionUtil.isNotEmpty(roleInfoList)) { + for (ProjectVo.RoleInfo roleInfo : roleInfoList) { + executorRole = new DeliverVo.DRole(); + executorRole.setId(roleInfo.getId()); + executorRole.setName(roleInfo.getName()); + executorRoleList.add(executorRole); + } + } + } else { + executorRole = new DeliverVo.DRole(); + executorRole.setId(role.getId()); + executorRole.setName(role.getName()); + executorRoleList.add(executorRole); + } + deliverInfo.setExecutorRoleList(executorRoleList); + } + } + + //检查人信息 + List checkerList = null; + Boolean isChecker = false; + DeliverVo.Checker checker = null; + //交付物文件的信息按时间排序 + List fileIds = taskDeliverDao.selectFileIdByDeliverId(deliver.getId(), subTimeId); + if (CollectionUtil.isNotEmpty(fileIds)) { + for (DeliverVo.FilePath filePath : fileIds) { + //修改文件路径为可下载路径 + filePath.setUrl(WebConstant.URL_BASE + filePath.getUrl()); + if (ObjectUtil.isNotNull(filePath.getUploaderId())) { + //添加上传人的姓名信息 + ProMember member = proMemberService.selectByUserId(filePath.getUploaderId(), task.getProjectId()); + if (ObjectUtil.isNotNull(member)) { + filePath.setUploaderName(member.getNickname()); + } + //添加上传人所属的角色 + List dRoleList = new ArrayList<>(); + List uploaderRoleList = proMemberService.selectRolesByUserIdAndProjectId(filePath.getUploaderId(), task.getProjectId()); + if (CollectionUtil.isNotEmpty(uploaderRoleList)) { + for (ProRole role : uploaderRoleList) { + DeliverVo.DRole dRole = new DeliverVo.DRole(); + dRole.setId(role.getId()); + dRole.setName(role.getName()); + dRoleList.add(dRole); + } + } + filePath.setRole(dRoleList); + } + + checkerList = new ArrayList<>(); + ProTaskDeliverPostLogCheckerExample checkerExample = new ProTaskDeliverPostLogCheckerExample(); + checkerExample.createCriteria().andDeliverPostLogIdEqualTo(filePath.getPostLogId()); + List postLogCheckerList = postLogCheckerDao.selectByExample(checkerExample); + if (CollectionUtil.isNotEmpty(postLogCheckerList)) { + for (ProTaskDeliverPostLogChecker postLogChecker : postLogCheckerList) { + ProRole role = proRoleDao.selectByPrimaryKey(postLogChecker.getCheckerId()); + checker = new DeliverVo.Checker(); + checker.setCheckerId(postLogChecker.getCheckerId()); + checker.setCheckerName(role.getName()); + checker.setRemark(postLogChecker.getRemark()); + checker.setCheckerStatus(postLogChecker.getCheckStatus()); + checkerList.add(checker); + if (CollectionUtil.isNotEmpty(roleList)) { + for (ProRole proRole : roleList) { + if (proRole.getId().longValue() == postLogChecker.getCheckerId().longValue()) { + isChecker = true; + break; + } + } + } + } + } + filePath.setCheckerList(checkerList); + filePath.setIsChecker(isChecker); + } + deliverInfo.setFileList(fileIds); + } + return deliverInfo; + } + + /** + * 检查人检查交付物 + */ + @Override + public DeliverVo.DeliverInfo checkDeliver(Long currentUserId, DeliverDto.CheckDeliver checkDeliver) throws Exception { + Long subTimeId = isTaskOrSubTime(checkDeliver.getTaskId()); + if (ObjectUtil.isNull(subTimeId)) { + throw new BaseException(CodeEnum.NOT_TASK); + } + List messageUserList = new ArrayList<>(); + BaseMessageDto.MessageUser messageUser = null; + ProRole checkRole = null; + + //查找该用户在此项目的角色 + ProTaskDeliver deliver = taskDeliverDao.selectByPrimaryKey(checkDeliver.getDeliverId()); + ProTaskDetail task = taskDetailDao.selectByPrimaryKey(deliver.getTaskDetailId()); + ProRole proRole = proRoleDao.selectByPrimaryKey(task.getExecutorRole()); + List roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, task.getProjectId()); + if (CollectionUtil.isNotEmpty(roleList)) { + for (ProRole role : roleList) { + ProTaskDeliverPostLogExample logExample = new ProTaskDeliverPostLogExample(); + logExample.createCriteria().andDeliverIdEqualTo(checkDeliver.getDeliverId()).andTaskSubTimeIdEqualTo(subTimeId); + logExample.setOrderByClause("time DESC"); + List deliverPostLogList = deliverPostLogDao.selectByExample(logExample); + if (CollectionUtil.isNotEmpty(deliverPostLogList)) { + ProTaskDeliverPostLog postLog = deliverPostLogList.get(0); +// for (ProTaskDeliverPostLog postLog : deliverPostLogList) { + ProTaskDeliverPostLogCheckerExample checkerExample = new ProTaskDeliverPostLogCheckerExample(); + checkerExample.createCriteria().andDeliverPostLogIdEqualTo(postLog.getId()).andCheckerIdEqualTo(role.getId()); + List postLogCheckerList = postLogCheckerDao.selectByExample(checkerExample); + if (CollectionUtil.isNotEmpty(postLogCheckerList)) { + for (ProTaskDeliverPostLogChecker postLogChecker : postLogCheckerList) { + if (role.getId().longValue() == postLogChecker.getCheckerId().longValue()) { + postLogChecker.setRemark(checkDeliver.getText()); + if (checkDeliver.getCheckStatus()) { + postLogChecker.setCheckStatus(1); + } else { + postLogChecker.setCheckStatus(-1); + returnTask(subTimeId); + } + postLogCheckerDao.updateByPrimaryKeySelective(postLogChecker); + } + } + } + messageUser = new BaseMessageDto.MessageUser(); + messageUser.setUserId(postLog.getUserId()); + messageUserList.add(messageUser); + checkRole = role; +// } + } + if (ObjectUtil.isNull(checkRole)) { + throw new BaseException(CodeEnum.IS_NOT_CHECKER); + } + } + } + //发送消息 + Long checkTime = System.currentTimeMillis(); + DeliverMessageWithCheckerDto checkerDto = new DeliverMessageWithCheckerDto(); + DeliverMessageWithCheckerDto.Data checkerDtoData = new DeliverMessageWithCheckerDto.Data(); + checkerDtoData.setProjectId(task.getProjectId()); + if (proRole.getName().equals(WebConstant.ROLE_NAME.AllMember.phase)) { + checkerDtoData.setRoleId(roleList.get(0).getId()); + } else { + checkerDtoData.setRoleId(task.getExecutorRole()); + } + checkerDtoData.setTaskId(task.getId()); + checkerDtoData.setDeliverId(deliver.getId()); + checkerDtoData.setDeliverName(deliver.getName()); + if(ObjectUtil.isNotNull(checkRole)) { + checkerDtoData.setCheckRoleId(checkRole.getId()); + checkerDtoData.setCheckRoleName(checkRole.getName()); + } + checkerDtoData.setCheckTime(checkTime); + checkerDtoData.setIsChecker(checkDeliver.getCheckStatus()); + checkerDto.setData(checkerDtoData); + + checkerDto.setReceivers(messageUserList); + messageService.sendDeliverMessageWithChecker(checkerDto); + + //检查完，返回数据 + DeliverVo.DeliverInfo deliverInfo = selectDeliverInfo(currentUserId, deliver.getId(), checkDeliver.getTaskId()); + return deliverInfo; + } + /** + * 检查未通过，将任务设为未完成 + */ + private void returnTask(Long subTimeId){ + ProSubTimeMemberExample subTimeMemberExample = new ProSubTimeMemberExample(); + subTimeMemberExample.createCriteria().andTaskSubTimeIdEqualTo(subTimeId); + List subTimeMemberList = proSubTimeMemberDao.selectByExample(subTimeMemberExample); + if(CollectionUtil.isNotEmpty(subTimeMemberList)){ + for(ProSubTimeMember proSubTimeMember:subTimeMemberList){ + proSubTimeMember.setComplatedStatus(0); + proSubTimeMember.setRealFinishTime(0L); + proSubTimeMemberDao.updateByPrimaryKeySelective(proSubTimeMember); + } + } + } + + /** + * 交付物清单 + * + * @param currentUserId + * @param page + * @param pageSize + * @param key + * @param start + * @param end + * @return + * @throws Exception + */ + @Override + public DeliverVo.DeliverFileList selectDeliverList(Long currentUserId, Integer page, Integer pageSize, String + key, String start, String end) throws Exception { + DeliverVo.DeliverFileList deliver = new DeliverVo.DeliverFileList(); + DeliverVo.PageInfo pageInfo = new DeliverVo.PageInfo(); + List deliverFileList = taskDeliverDao.selectDeliverByUserId(currentUserId); + + //根据时间筛选 + if (StrUtil.isNotEmpty(start) && StrUtil.isNotEmpty(end)) { + //获取日期的开始结束时间 + Long startMillisTime = null; + Long endMillisTime = null; + Map timeMap = null; + if (StrUtil.isNotEmpty(start)) { + timeMap = DateUtil.projectFormatDateTime(start); + startMillisTime = timeMap.get("startMillisTime"); + } + if (StrUtil.isNotEmpty(end)) { + timeMap = DateUtil.projectFormatDateTime(start); + endMillisTime = timeMap.get("endMillisTime"); + } + if (CollectionUtil.isNotEmpty(deliverFileList)) { + if (ObjectUtil.isNotNull(startMillisTime) && ObjectUtil.isNotNull(endMillisTime)) { + Iterator it = deliverFileList.iterator(); + while (it.hasNext()) { + DeliverVo.DeliverFile deliverFile = it.next(); + if ((deliverFile.getTask().getBeginTime() < startMillisTime && deliverFile.getTask().getBeginTime() > endMillisTime) || + (deliverFile.getTask().getEndTime() < startMillisTime) || + (deliverFile.getTask().getBeginTime() > endMillisTime)) { + it.remove(); + } + } + } + } + } + + //根据关键词筛选 + if (StrUtil.isNotEmpty(key)) { + if (CollectionUtil.isNotEmpty(deliverFileList)) { + Iterator it = deliverFileList.iterator(); + while (it.hasNext()) { + DeliverVo.DeliverFile deliverFile = it.next(); + if (deliverFile.getName().indexOf(key) == -1) { + it.remove(); + } + } + } + } + + //分页 + List theDeliverFile = null; + int totalPages = 1; + if (CollectionUtil.isNotEmpty(deliverFileList)) { + //1.计算分页条件 + if (page > 0) { + int size = deliverFileList.size(); + int num = pageSize; + totalPages = size / pageSize + 1; + int startIndex = pageSize * (page - 1); + if (startIndex >= size) { + startIndex = -1; + } else { + if (startIndex + num > size) { + num = size - startIndex; + } + } + //拷贝分页数据 + if (startIndex >= 0) { + theDeliverFile = CollectionUtil.newArrayList(); + for (int i = startIndex; i < startIndex + num; i++) { + theDeliverFile.add(deliverFileList.get(i)); + } + } + } else { //不分页 + theDeliverFile = CollectionUtil.newArrayList(deliverFileList); + } + } + pageInfo.setCurrentPage(page); + pageInfo.setTotalPage(totalPages); + deliver.setPageInfo(pageInfo); + deliver.setDeliverFileList(theDeliverFile); + return deliver; + } + + /** + * 删除交付物（修改状态变成历史项目） + * + * @param currentUserId + * @param deliverId + * @param taskId + */ + @Override + public void deleteDeliver(Long currentUserId, Long deliverId, Long taskId) throws Exception { + ProTaskDeliver deliver = taskDeliverDao.selectByPrimaryKey(deliverId); + Long subTimeId = isTaskOrSubTime(taskId); + //接受消息的角色 + List messageUserList = new ArrayList<>(); + BaseMessageDto.MessageUser messageUser = null; + List userIdList = new ArrayList<>(); + + //同步锁,防止多个用户同时操作该数据 + synchronized (this) { + //查找此交付物与文件的中间表 + ProTaskDeliverPostLogExample deliverPostLogExample = new ProTaskDeliverPostLogExample(); + deliverPostLogExample.createCriteria().andDeliverIdEqualTo(deliverId).andTaskSubTimeIdEqualTo(subTimeId); + List deliverPostLogList = deliverPostLogDao.selectByExample(deliverPostLogExample); + + if (CollectionUtil.isNotEmpty(deliverPostLogList)) { + for (ProTaskDeliverPostLog deliverPostLog : deliverPostLogList) { + if (currentUserId.longValue() == deliverPostLog.getUserId().longValue()) { + if (deliverPostLog.getIsHistory() == 0) { + deliverPostLog.setIsHistory(1); + deliverPostLogDao.updateByPrimaryKeySelective(deliverPostLog); + } + ProTaskDeliverPostLogCheckerExample checkerExample = new ProTaskDeliverPostLogCheckerExample(); + checkerExample.createCriteria().andDeliverPostLogIdEqualTo(deliverPostLog.getId()); + List postCheckerList = postLogCheckerDao.selectByExample(checkerExample); + if (CollectionUtil.isNotEmpty(postCheckerList)) { + for (ProTaskDeliverPostLogChecker postLogChecker : postCheckerList) { + userIdList.addAll(userService.selectUserIdByRoleId(postLogChecker.getCheckerId())); + } + } + } else { + throw new BaseException("您无法删除别人上传的交付物"); + } + } + } + deliver.setIsUpload(0); + taskDeliverDao.updateByPrimaryKeySelective(deliver); + + ProTaskDetail task = taskDetailDao.selectByPrimaryKey(deliver.getTaskDetailId()); + ProRole role = proRoleDao.selectByPrimaryKey(task.getExecutorRole()); + //发送消息 + if (CollectionUtil.isNotEmpty(userIdList)) { + HashSet h = new HashSet<>(userIdList); + userIdList.clear(); + userIdList.addAll(h); + for (Long userId : userIdList) { + messageUser = new BaseMessageDto.MessageUser(); + messageUser.setUserId(userId); + messageUserList.add(messageUser); + } + } + + Long deleteTime = System.currentTimeMillis(); + DeliverMessageWithDeleteDto deleteMessage = new DeliverMessageWithDeleteDto(); + DeliverMessageWithDeleteDto.Data deleteMessageData = new DeliverMessageWithDeleteDto.Data(); + deleteMessageData.setProjectId(task.getProjectId()); +// if (role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase)) { +// List roleList = memberService.selectRolesByUserIdAndProjectId(currentUserId, task.getProjectId()); +// deleteMessageData.setRoleId(roleList.get(0).getId()); +// } else { +// +// } + deleteMessageData.setRoleId(task.getExecutorRole()); + deleteMessageData.setTaskId(task.getId()); + deleteMessageData.setDeliverId(deliverId); + deleteMessageData.setDeliverName(deliver.getName()); + deleteMessageData.setDeleteTime(deleteTime); + deleteMessageData.setUserId(currentUserId); + deleteMessage.setData(deleteMessageData); + + deleteMessage.setReceivers(messageUserList); + messageService.sendDeliverMessageWithDelete(deleteMessage); + } + } + + //========================================================= + @Override + public void deleteDeliverByTaskId(Long taskId) { + //查找已上传的文件 + + } + + //删除文件 + public void deleteFile(String path) { + File file = new File(path); + // 路径为文件且不为空则进行删除 + if (file.isFile() && file.exists()) { + file.delete(); + } + } +} diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java b/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java index 7119724c..0166957e 100644 --- a/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java +++ b/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java @@ -1,245 +1,294 @@ -package com.ccsens.tall.service; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.lang.Snowflake; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.ccsens.tall.bean.dto.TaskDto; -import com.ccsens.tall.bean.po.*; -import com.ccsens.tall.bean.vo.TaskVo; -import com.ccsens.tall.persist.dao.*; -import com.ccsens.util.CodeEnum; -import com.ccsens.util.WebConstant; -import com.ccsens.util.cron.CronConstant; -import com.ccsens.util.cron.NatureToDate; -import com.ccsens.util.exception.BaseException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; - -@Service -@Transactional(propagation = Propagation.REQUIRED) -public class TaskSubTimeService implements ITaskSubTimeService{ - @Autowired - private TaskSubTimeDao taskSubTimeDao; - @Autowired - private SysProjectDao sysProjectDao; - @Autowired - private TaskDeliverDao taskDeliverDao; - @Autowired - private TaskPluginDao taskPluginDao; - @Autowired - private ProTaskDeliverPostLogDao proTaskDeliverPostLogDao; - @Autowired - private TaskDetailDao taskDetailDao; - @Autowired - private ProRoleDao proRoleDao; - @Autowired - private IProMemberService proMemberService; - @Autowired - private IMessageService messageService; - @Autowired - private IProLogService proLogService; - @Autowired - private Snowflake snowflake; - - @Override - public void saveProTaskSubTask(ProTaskSubTime proTaskSubTime) { - taskSubTimeDao.insertSelective(proTaskSubTime); - } - - /** - * 完成任务 - * @param currentUserId - * @param subTimeId - * @throws Exception - */ - @Override - public void finishTask(Long currentUserId, TaskDto.TaskSubTimeId subTimeId) throws Exception { - //查找taskSubTime - ProTaskSubTime taskSubTime = taskSubTimeDao.selectByPrimaryKey(subTimeId.getId()); - if(ObjectUtil.isNull(taskSubTime)){ - throw new BaseException(CodeEnum.NOT_TASK); - } - //查找taskDetail - ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(taskSubTime.getTaskDetailId()); - if(ObjectUtil.isNull(taskDetail)){ - throw new BaseException(CodeEnum.NOT_TASK); - } - //该用户是否是任务的负责人 - ProRole role = proRoleDao.selectByPrimaryKey(taskDetail.getExecutorRole()); - Boolean isBelongRole = proMemberService.userIsBelongRole(currentUserId, role.getId()); - if (!role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase) && !isBelongRole) { - throw new BaseException(CodeEnum.IS_NOT_EXECUTOR); - } - //是否有分组 - if(taskDetail.getHasGroup()==1){ - //查找分组下的任务（taskSubTime） - List subTimeList = taskDetailDao.selectSubTaskByGroupId(taskDetail.getId(),taskSubTime.getBeginTime(),taskSubTime.getEndTime()); - if(CollectionUtil.isNotEmpty(subTimeList)){ - for(ProTaskSubTime subTime:subTimeList){ - //是否有未完成的任务 - if(subTime.getComplatedStatus()!=2){ - throw new BaseException(CodeEnum.SUB_TASK_IS_NOT_FINISH); - } - } - } - } - //查询任务下的交付物 - ProTaskDeliverExample deliverExample = new ProTaskDeliverExample(); - deliverExample.createCriteria().andTaskDetailIdEqualTo(taskSubTime.getTaskDetailId()); - List deliverList = taskDeliverDao.selectByExample(deliverExample); - if(CollectionUtil.isNotEmpty(deliverList)){ - for(ProTaskDeliver taskDeliver:deliverList){ - ProTaskDeliverPostLogExample postLogExample = new ProTaskDeliverPostLogExample(); - postLogExample.createCriteria().andTaskSubTimeIdEqualTo(subTimeId.getId()) - .andDeliverIdEqualTo(taskDeliver.getId()); - List postLogList = proTaskDeliverPostLogDao.selectByExample(postLogExample); - if(CollectionUtil.isEmpty(postLogList)){ - throw new BaseException(CodeEnum.TASK_NOT_UPLOAD_DELIVER); - } - } - } - taskSubTime.setComplatedStatus(2); - taskSubTime.setRealEndTime(System.currentTimeMillis()); - taskSubTimeDao.updateByPrimaryKeySelective(taskSubTime); - } - - /** - * 开始任务 - * @param currentUserId - * @param startTaskDto - * @throws Exception - */ - @Override - public void startTask(Long currentUserId, TaskDto.StartTask startTaskDto) throws Exception { - ProTaskSubTime taskSubTime = taskSubTimeDao.selectByPrimaryKey(startTaskDto.getId()); - Long now = System.currentTimeMillis(); - if(ObjectUtil.isNotNull(taskSubTime)){ - taskSubTime.setRealBeginTime(now); - taskSubTime.setComplatedStatus(1); - taskSubTimeDao.updateByPrimaryKeySelective(taskSubTime); - - //发送同步消息 - SysProject project = sysProjectDao.selectByPrimaryKey(startTaskDto.getProjectId()); - //已发布的项目才同步 - if (ObjectUtil.isNotNull(project.getPublished()) && project.getPublished() == 1) { - messageService.sendSyncMessageWithStart(currentUserId, startTaskDto.getProjectId(), startTaskDto.getRoleId(), taskSubTime.getTaskDetailId(), now, - taskSubTime.getEndTime() - taskSubTime.getBeginTime()); - } - //3.添加记录 - proLogService.addNewProLog(now, taskSubTime.getId(), - WebConstant.TASK_Execute_Type.Start.value, - WebConstant.TASK_Execute_Type.Start.phase, currentUserId); - }else { - throw new BaseException(CodeEnum.NOT_TASK); - } - } - - /** - * 添加清单（任务） - */ - @Override - public TaskVo.NormalTask addTask(Long currentUserId, TaskDto.AddTask addTask) { - ProTaskDetail detail = new ProTaskDetail(); - detail.setId(snowflake.nextId()); - detail.setName(addTask.getTaskName()); - detail.setDescription(addTask.getDescription()); - detail.setCycle(addTask.getCycle()); - detail.setParentId(addTask.getParentTaskId()); - detail.setExecutorRole(addTask.getExecutorId()); - - if(ObjectUtil.isNotNull(addTask.getProjectId())){ - SysProject project = sysProjectDao.selectByPrimaryKey(addTask.getProjectId()); - if (ObjectUtil.isNotNull(project)) { - detail.setProjectId(addTask.getProjectId()); - detail.setBeginTime(project.getBeginTime()); - detail.setEndTime(project.getEndTime()); - detail.setLevel((byte) 2); - }else { - throw new BaseException("项目信息不正确"); - } - } - if(ObjectUtil.isNotNull(addTask.getParentTaskId())){ -// ProTaskSubTime subTime = taskSubTimeDao.selectByPrimaryKey(addTask.getParentTaskId()); -// if(ObjectUtil.isNotNull(subTime)) { - ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(addTask.getParentTaskId()); - if (ObjectUtil.isNotNull(taskDetail)) { - detail.setParentId(taskDetail.getId()); - detail.setBeginTime(taskDetail.getBeginTime()); - detail.setEndTime(taskDetail.getEndTime()); - detail.setLevel((byte) (taskDetail.getLevel() + 1)); - if(taskDetail.getLevel() == 1){ - detail.setBeginTime(System.currentTimeMillis()); - detail.setEndTime(com.ccsens.util.DateUtil.getYMD(DateUtil.tomorrow()).getTime()); - } -// taskDetail.setHasGroup((byte) 1); -// taskDetailDao.updateByPrimaryKeySelective(taskDetail); - } else { - throw new BaseException("任务信息不正确"); - } -// } - } - if(ObjectUtil.isNotNull(addTask.getBeginTime())){ - detail.setBeginTime(addTask.getBeginTime()); - } - if(ObjectUtil.isNotNull(addTask.getEndTime())){ - detail.setEndTime(addTask.getEndTime()); - } - taskDetailDao.insertSelective(detail); - //TaskSubTime - if(ObjectUtil.isNotNull(detail.getProjectId())){ - //cycle为空，只加一条数据 - if (StrUtil.isEmpty(detail.getCycle())) { - ProTaskSubTime proTaskSubTime = new ProTaskSubTime(); - proTaskSubTime.setId(snowflake.nextId()); - proTaskSubTime.setTaskDetailId(detail.getId()); - proTaskSubTime.setBeginTime(detail.getBeginTime()); - proTaskSubTime.setEndTime(detail.getEndTime()); - taskSubTimeDao.insertSelective(proTaskSubTime); - } else { - Date startDate = new Date(detail.getBeginTime()); - Date endDate = new Date(detail.getEndTime()); - List taskDateList = - NatureToDate.generateDates(detail.getCycle(), startDate, endDate); - if (CollectionUtil.isNotEmpty(taskDateList)) { - for (CronConstant.TaskDate taskDate : taskDateList) { - ProTaskSubTime proTaskSubTime = new ProTaskSubTime(); - proTaskSubTime.setId(snowflake.nextId()); - proTaskSubTime.setTaskDetailId(detail.getId()); - proTaskSubTime.setBeginTime(taskDate.getStartDate().getTime()); - proTaskSubTime.setEndTime(taskDate.getEndDate().getTime()); - taskSubTimeDao.insertSelective(proTaskSubTime); - } - } - } - } - //交付物 - if(ObjectUtil.isNotNull(addTask.getTaskDeliver())){ - ProTaskDeliver deliver = new ProTaskDeliver(); - deliver.setId(snowflake.nextId()); - deliver.setTaskDetailId(detail.getId()); - deliver.setIsInput(0); - taskDeliverDao.insertSelective(deliver); - } - //插件 - if(CollectionUtil.isNotEmpty(addTask.getPluginList())){ - for(Long pluginId:addTask.getPluginList()){ - ProTaskPlugin plugin = new ProTaskPlugin(); - plugin.setId(snowflake.nextId()); - plugin.setTaskDetailId(detail.getId()); - plugin.setPluginId(pluginId); - plugin.setMemberRoleId(addTask.getExecutorId()); - taskPluginDao.insertSelective(plugin); - } - } - //返回 - TaskVo.NormalTask taskDetail = taskDetailDao.selectTaskByTaskId(addTask.getProjectId(), detail.getId()); - return taskDetail; - } -} +package com.ccsens.tall.service; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.ccsens.tall.bean.dto.TaskDto; +import com.ccsens.tall.bean.po.*; +import com.ccsens.tall.bean.vo.TaskVo; +import com.ccsens.tall.persist.dao.*; + +import com.ccsens.util.CodeEnum; +import com.ccsens.util.WebConstant; +import com.ccsens.util.cron.CronConstant; +import com.ccsens.util.cron.NatureToDate; +import com.ccsens.util.exception.BaseException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +@Transactional(propagation = Propagation.REQUIRED) +public class TaskSubTimeService implements ITaskSubTimeService { + @Autowired + private TaskSubTimeDao taskSubTimeDao; + @Autowired + private SysProjectDao sysProjectDao; + @Autowired + private TaskDeliverDao taskDeliverDao; + @Autowired + private TaskPluginDao taskPluginDao; + @Autowired + private ProSubTimeMemberDao proSubTimeMemberDao; + @Autowired + private ProTaskDeliverPostLogDao proTaskDeliverPostLogDao; + @Autowired + private TaskDetailDao taskDetailDao; + @Autowired + private ProRoleDao proRoleDao; + @Autowired + private IProMemberService proMemberService; + @Autowired + private IMessageService messageService; + @Autowired + private IProLogService proLogService; + @Autowired + private Snowflake snowflake; + + @Override + public void saveProTaskSubTask(ProTaskSubTime proTaskSubTime) { + taskSubTimeDao.insertSelective(proTaskSubTime); + } + + /** + * 完成任务 + * @param currentUserId + * @param subTimeId + * @throws Exception + */ + @Override + public void finishTask(Long currentUserId, TaskDto.TaskSubTimeId subTimeId) throws Exception { + //查找taskSubTime + ProTaskSubTime taskSubTime = taskSubTimeDao.selectByPrimaryKey(subTimeId.getId()); + if(ObjectUtil.isNull(taskSubTime)){ + throw new BaseException(CodeEnum.NOT_TASK); + } + //查找taskDetail + ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(taskSubTime.getTaskDetailId()); + if(ObjectUtil.isNull(taskDetail)){ + throw new BaseException(CodeEnum.NOT_TASK); + } + //该用户是否是任务的负责人 + ProRole role = proRoleDao.selectByPrimaryKey(taskDetail.getExecutorRole()); + Boolean isBelongRole = proMemberService.userIsBelongRole(currentUserId, role.getId()); + if (!role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase) && !isBelongRole) { + throw new BaseException(CodeEnum.IS_NOT_EXECUTOR); + } + //查找此用户在任务下的成员 + ProMember member = proMemberService.selectByUserId(currentUserId,taskDetail.getProjectId()); + //是否需要全部打卡完成 + if(taskDetail.getFinishNeedAll()==0) { + //是否有分组 + if (taskDetail.getHasGroup() == 1) { + //查找分组下的任务（taskSubTime） + List subTimeList = taskDetailDao.selectSubTaskByGroupId(taskDetail.getId(), taskSubTime.getBeginTime(), taskSubTime.getEndTime()); + if (CollectionUtil.isNotEmpty(subTimeList)) { + for (ProTaskSubTime subTime : subTimeList) { + //是否有未完成的任务 + if (subTime.getComplatedStatus() != 2) { + throw new BaseException(CodeEnum.SUB_TASK_IS_NOT_FINISH); + } + } + } + } + //查询任务下的交付物 + ProTaskDeliverExample deliverExample = new ProTaskDeliverExample(); + deliverExample.createCriteria().andTaskDetailIdEqualTo(taskSubTime.getTaskDetailId()) + .andIsInputEqualTo(0); + List deliverList = taskDeliverDao.selectByExample(deliverExample); + if (CollectionUtil.isNotEmpty(deliverList)) { + for (ProTaskDeliver taskDeliver : deliverList) { + ProTaskDeliverPostLogExample postLogExample = new ProTaskDeliverPostLogExample(); + postLogExample.createCriteria().andTaskSubTimeIdEqualTo(subTimeId.getId()) + .andDeliverIdEqualTo(taskDeliver.getId()); + List postLogList = proTaskDeliverPostLogDao.selectByExample(postLogExample); + if (CollectionUtil.isEmpty(postLogList)) { + throw new BaseException(CodeEnum.TASK_NOT_UPLOAD_DELIVER); + } + } + } + + ProSubTimeMember subTimeMember = isFinishTask(member.getId(),subTimeId.getId()); + if(ObjectUtil.isNull(subTimeMember)){ + subTimeMember = new ProSubTimeMember(); + subTimeMember.setId(snowflake.nextId()); + subTimeMember.setComplatedStatus(2); + subTimeMember.setMemberId(member.getId()); + subTimeMember.setTaskSubTimeId(subTimeId.getId()); + subTimeMember.setRealFinishTime(System.currentTimeMillis()); + proSubTimeMemberDao.insertSelective(subTimeMember); + }else { + subTimeMember.setComplatedStatus(2); + subTimeMember.setRealFinishTime(System.currentTimeMillis()); + proSubTimeMemberDao.updateByPrimaryKeySelective(subTimeMember); + } + }else { + ProSubTimeMember subTimeMember = isFinishTask(member.getId(),subTimeId.getId()); + if(ObjectUtil.isNotNull(subTimeMember)){ + subTimeMember.setComplatedStatus(2); + subTimeMember.setRealFinishTime(System.currentTimeMillis()); + proSubTimeMemberDao.updateByPrimaryKeySelective(subTimeMember); + }else { + subTimeMember = new ProSubTimeMember(); + subTimeMember.setId(snowflake.nextId()); + subTimeMember.setComplatedStatus(2); + subTimeMember.setTaskSubTimeId(subTimeId.getId()); + subTimeMember.setMemberId(member.getId()); + subTimeMember.setRealFinishTime(System.currentTimeMillis()); + proSubTimeMemberDao.insertSelective(subTimeMember); + } + } + } + /** + * 该成员是否完成了此任务 + */ + private ProSubTimeMember isFinishTask(Long memberId, Long subTimeId){ + ProSubTimeMember subTimeMember = null; + ProSubTimeMemberExample subTimeMemberExample = new ProSubTimeMemberExample(); + subTimeMemberExample.createCriteria().andMemberIdEqualTo(memberId) + .andTaskSubTimeIdEqualTo(subTimeId); + List subTimeMemberList = proSubTimeMemberDao.selectByExample(subTimeMemberExample); + if(CollectionUtil.isNotEmpty(subTimeMemberList)){ + subTimeMember = subTimeMemberList.get(0); + } + return subTimeMember; + } + /** + * 开始任务 + * @param currentUserId + * @param startTaskDto + * @throws Exception + */ + @Override + public void startTask(Long currentUserId, TaskDto.StartTask startTaskDto) throws Exception { + ProTaskSubTime taskSubTime = taskSubTimeDao.selectByPrimaryKey(startTaskDto.getId()); + Long now = System.currentTimeMillis(); + if(ObjectUtil.isNotNull(taskSubTime)){ + taskSubTime.setRealBeginTime(now); + taskSubTime.setComplatedStatus(1); + taskSubTimeDao.updateByPrimaryKeySelective(taskSubTime); + + //发送同步消息 + SysProject project = sysProjectDao.selectByPrimaryKey(startTaskDto.getProjectId()); + //已发布的项目才同步 + if (ObjectUtil.isNotNull(project.getPublished()) && project.getPublished() == 1) { + messageService.sendSyncMessageWithStart(currentUserId, startTaskDto.getProjectId(), startTaskDto.getRoleId(), taskSubTime.getTaskDetailId(), now, + taskSubTime.getEndTime() - taskSubTime.getBeginTime()); + } + //3.添加记录 + proLogService.addNewProLog(now, taskSubTime.getId(), + WebConstant.TASK_Execute_Type.Start.value, + WebConstant.TASK_Execute_Type.Start.phase, currentUserId); + }else { + throw new BaseException(CodeEnum.NOT_TASK); + } + } + + /** + * 添加清单（任务） + */ + @Override + public TaskVo.NormalTask addTask(Long currentUserId, TaskDto.AddTask addTask) { + ProTaskDetail detail = new ProTaskDetail(); + detail.setId(snowflake.nextId()); + detail.setName(addTask.getTaskName()); + detail.setDescription(addTask.getDescription()); + detail.setCycle(addTask.getCycle()); + detail.setParentId(addTask.getParentTaskId()); + detail.setExecutorRole(addTask.getExecutorId()); + + if(ObjectUtil.isNotNull(addTask.getProjectId())){ + SysProject project = sysProjectDao.selectByPrimaryKey(addTask.getProjectId()); + if (ObjectUtil.isNotNull(project)) { + detail.setProjectId(addTask.getProjectId()); + detail.setBeginTime(project.getBeginTime()); + detail.setEndTime(project.getEndTime()); + detail.setLevel((byte) 2); + }else { + throw new BaseException("项目信息不正确"); + } + } + if(ObjectUtil.isNotNull(addTask.getParentTaskId())){ +// ProTaskSubTime subTime = taskSubTimeDao.selectByPrimaryKey(addTask.getParentTaskId()); +// if(ObjectUtil.isNotNull(subTime)) { + ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(addTask.getParentTaskId()); + if (ObjectUtil.isNotNull(taskDetail)) { + detail.setParentId(taskDetail.getId()); + detail.setBeginTime(taskDetail.getBeginTime()); + detail.setEndTime(taskDetail.getEndTime()); + detail.setLevel((byte) (taskDetail.getLevel() + 1)); + if(taskDetail.getLevel() == 1){ + detail.setBeginTime(System.currentTimeMillis()); + detail.setEndTime(com.ccsens.util.DateUtil.getYMD(DateUtil.tomorrow()).getTime()); + } +// taskDetail.setHasGroup((byte) 1); +// taskDetailDao.updateByPrimaryKeySelective(taskDetail); + } else { + throw new BaseException("任务信息不正确"); + } +// } + } + if(ObjectUtil.isNotNull(addTask.getBeginTime())){ + detail.setBeginTime(addTask.getBeginTime()); + } + if(ObjectUtil.isNotNull(addTask.getEndTime())){ + detail.setEndTime(addTask.getEndTime()); + } + taskDetailDao.insertSelective(detail); + //TaskSubTime + if(ObjectUtil.isNotNull(detail.getProjectId())){ + //cycle为空，只加一条数据 + if (StrUtil.isEmpty(detail.getCycle())) { + ProTaskSubTime proTaskSubTime = new ProTaskSubTime(); + proTaskSubTime.setId(snowflake.nextId()); + proTaskSubTime.setTaskDetailId(detail.getId()); + proTaskSubTime.setBeginTime(detail.getBeginTime()); + proTaskSubTime.setEndTime(detail.getEndTime()); + taskSubTimeDao.insertSelective(proTaskSubTime); + } else { + Date startDate = new Date(detail.getBeginTime()); + Date endDate = new Date(detail.getEndTime()); + List taskDateList = + NatureToDate.generateDates(detail.getCycle(), startDate, endDate); + if (CollectionUtil.isNotEmpty(taskDateList)) { + for (CronConstant.TaskDate taskDate : taskDateList) { + ProTaskSubTime proTaskSubTime = new ProTaskSubTime(); + proTaskSubTime.setId(snowflake.nextId()); + proTaskSubTime.setTaskDetailId(detail.getId()); + proTaskSubTime.setBeginTime(taskDate.getStartDate().getTime()); + proTaskSubTime.setEndTime(taskDate.getEndDate().getTime()); + taskSubTimeDao.insertSelective(proTaskSubTime); + } + } + } + } + //交付物 + if(ObjectUtil.isNotNull(addTask.getTaskDeliver())){ + ProTaskDeliver deliver = new ProTaskDeliver(); + deliver.setId(snowflake.nextId()); + deliver.setTaskDetailId(detail.getId()); + deliver.setIsInput(0); + taskDeliverDao.insertSelective(deliver); + } + //插件 + if(CollectionUtil.isNotEmpty(addTask.getPluginList())){ + for(Long pluginId:addTask.getPluginList()){ + ProTaskPlugin plugin = new ProTaskPlugin(); + plugin.setId(snowflake.nextId()); + plugin.setTaskDetailId(detail.getId()); + plugin.setPluginId(pluginId); + plugin.setMemberRoleId(addTask.getExecutorId()); + taskPluginDao.insertSelective(plugin); + } + } + //返回 + TaskVo.NormalTask taskDetail = taskDetailDao.selectTaskByTaskId(addTask.getProjectId(), detail.getId()); + return taskDetail; + } +} diff --git a/tall/src/main/resources/mapper_dao/ProRoleDao.xml b/tall/src/main/resources/mapper_dao/ProRoleDao.xml index 21542d57..84f49d7f 100644 --- a/tall/src/main/resources/mapper_dao/ProRoleDao.xml +++ b/tall/src/main/resources/mapper_dao/ProRoleDao.xml @@ -1,129 +1,129 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_dao/SysProjectDao.xml b/tall/src/main/resources/mapper_dao/SysProjectDao.xml index c8cb894f..f428c205 100644 --- a/tall/src/main/resources/mapper_dao/SysProjectDao.xml +++ b/tall/src/main/resources/mapper_dao/SysProjectDao.xml @@ -1,80 +1,82 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_dao/TaskDetailDao.xml b/tall/src/main/resources/mapper_dao/TaskDetailDao.xml index 214ba00c..102df3e1 100644 --- a/tall/src/main/resources/mapper_dao/TaskDetailDao.xml +++ b/tall/src/main/resources/mapper_dao/TaskDetailDao.xml @@ -1,251 +1,253 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_raw/ProSubTimeMemberMapper.xml b/tall/src/main/resources/mapper_raw/ProSubTimeMemberMapper.xml new file mode 100644 index 00000000..be861de8 --- /dev/null +++ b/tall/src/main/resources/mapper_raw/ProSubTimeMemberMapper.xml @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, task_sub_time_id, member_id, complated_status, real_finish_time, created_at, + updated_at, rec_status + + + + + delete from t_pro_sub_time_member + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_sub_time_member + + + + + + insert into t_pro_sub_time_member (id, task_sub_time_id, member_id, + complated_status, real_finish_time, created_at, + updated_at, rec_status) + values (#{id,jdbcType=BIGINT}, #{taskSubTimeId,jdbcType=BIGINT}, #{memberId,jdbcType=BIGINT}, + #{complatedStatus,jdbcType=INTEGER}, #{realFinishTime,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) + + + insert into t_pro_sub_time_member + + + id, + + + task_sub_time_id, + + + member_id, + + + complated_status, + + + real_finish_time, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{taskSubTimeId,jdbcType=BIGINT}, + + + #{memberId,jdbcType=BIGINT}, + + + #{complatedStatus,jdbcType=INTEGER}, + + + #{realFinishTime,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_sub_time_member + + + id = #{record.id,jdbcType=BIGINT}, + + + task_sub_time_id = #{record.taskSubTimeId,jdbcType=BIGINT}, + + + member_id = #{record.memberId,jdbcType=BIGINT}, + + + complated_status = #{record.complatedStatus,jdbcType=INTEGER}, + + + real_finish_time = #{record.realFinishTime,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_sub_time_member + set id = #{record.id,jdbcType=BIGINT}, + task_sub_time_id = #{record.taskSubTimeId,jdbcType=BIGINT}, + member_id = #{record.memberId,jdbcType=BIGINT}, + complated_status = #{record.complatedStatus,jdbcType=INTEGER}, + real_finish_time = #{record.realFinishTime,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_sub_time_member + + + task_sub_time_id = #{taskSubTimeId,jdbcType=BIGINT}, + + + member_id = #{memberId,jdbcType=BIGINT}, + + + complated_status = #{complatedStatus,jdbcType=INTEGER}, + + + real_finish_time = #{realFinishTime,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_sub_time_member + set task_sub_time_id = #{taskSubTimeId,jdbcType=BIGINT}, + member_id = #{memberId,jdbcType=BIGINT}, + complated_status = #{complatedStatus,jdbcType=INTEGER}, + real_finish_time = #{realFinishTime,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_raw/ProTaskDetailMapper.xml b/tall/src/main/resources/mapper_raw/ProTaskDetailMapper.xml index 04c66aa1..93660639 100644 --- a/tall/src/main/resources/mapper_raw/ProTaskDetailMapper.xml +++ b/tall/src/main/resources/mapper_raw/ProTaskDetailMapper.xml @@ -1,528 +1,543 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, project_id, name, description, begin_time, end_time, cycle, parent_id, sub_task, - sub_project_id, sub_project, executor_role, checker_role, money, delay, delay_time, - loop_to, loop_times, virtual, level, has_group, all_member, created_at, updated_at, - rec_status - - - - - delete from t_pro_task_detail - where id = #{id,jdbcType=BIGINT} - - - delete from t_pro_task_detail - - - - - - insert into t_pro_task_detail (id, project_id, name, - description, begin_time, end_time, - cycle, parent_id, sub_task, - sub_project_id, sub_project, executor_role, - checker_role, money, delay, - delay_time, loop_to, loop_times, - virtual, level, has_group, - all_member, created_at, updated_at, - rec_status) - values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, - #{description,jdbcType=VARCHAR}, #{beginTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, - #{cycle,jdbcType=VARCHAR}, #{parentId,jdbcType=BIGINT}, #{subTask,jdbcType=VARCHAR}, - #{subProjectId,jdbcType=BIGINT}, #{subProject,jdbcType=VARCHAR}, #{executorRole,jdbcType=BIGINT}, - #{checkerRole,jdbcType=BIGINT}, #{money,jdbcType=BIGINT}, #{delay,jdbcType=TINYINT}, - #{delayTime,jdbcType=BIGINT}, #{loopTo,jdbcType=BIGINT}, #{loopTimes,jdbcType=INTEGER}, - #{virtual,jdbcType=TINYINT}, #{level,jdbcType=TINYINT}, #{hasGroup,jdbcType=TINYINT}, - #{allMember,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, - #{recStatus,jdbcType=TINYINT}) - - - insert into t_pro_task_detail - - - id, - - - project_id, - - - name, - - - description, - - - begin_time, - - - end_time, - - - cycle, - - - parent_id, - - - sub_task, - - - sub_project_id, - - - sub_project, - - - executor_role, - - - checker_role, - - - money, - - - delay, - - - delay_time, - - - loop_to, - - - loop_times, - - - virtual, - - - level, - - - has_group, - - - all_member, - - - created_at, - - - updated_at, - - - rec_status, - - - - - #{id,jdbcType=BIGINT}, - - - #{projectId,jdbcType=BIGINT}, - - - #{name,jdbcType=VARCHAR}, - - - #{description,jdbcType=VARCHAR}, - - - #{beginTime,jdbcType=BIGINT}, - - - #{endTime,jdbcType=BIGINT}, - - - #{cycle,jdbcType=VARCHAR}, - - - #{parentId,jdbcType=BIGINT}, - - - #{subTask,jdbcType=VARCHAR}, - - - #{subProjectId,jdbcType=BIGINT}, - - - #{subProject,jdbcType=VARCHAR}, - - - #{executorRole,jdbcType=BIGINT}, - - - #{checkerRole,jdbcType=BIGINT}, - - - #{money,jdbcType=BIGINT}, - - - #{delay,jdbcType=TINYINT}, - - - #{delayTime,jdbcType=BIGINT}, - - - #{loopTo,jdbcType=BIGINT}, - - - #{loopTimes,jdbcType=INTEGER}, - - - #{virtual,jdbcType=TINYINT}, - - - #{level,jdbcType=TINYINT}, - - - #{hasGroup,jdbcType=TINYINT}, - - - #{allMember,jdbcType=TINYINT}, - - - #{createdAt,jdbcType=TIMESTAMP}, - - - #{updatedAt,jdbcType=TIMESTAMP}, - - - #{recStatus,jdbcType=TINYINT}, - - - - - - update t_pro_task_detail - - - id = #{record.id,jdbcType=BIGINT}, - - - project_id = #{record.projectId,jdbcType=BIGINT}, - - - name = #{record.name,jdbcType=VARCHAR}, - - - description = #{record.description,jdbcType=VARCHAR}, - - - begin_time = #{record.beginTime,jdbcType=BIGINT}, - - - end_time = #{record.endTime,jdbcType=BIGINT}, - - - cycle = #{record.cycle,jdbcType=VARCHAR}, - - - parent_id = #{record.parentId,jdbcType=BIGINT}, - - - sub_task = #{record.subTask,jdbcType=VARCHAR}, - - - sub_project_id = #{record.subProjectId,jdbcType=BIGINT}, - - - sub_project = #{record.subProject,jdbcType=VARCHAR}, - - - executor_role = #{record.executorRole,jdbcType=BIGINT}, - - - checker_role = #{record.checkerRole,jdbcType=BIGINT}, - - - money = #{record.money,jdbcType=BIGINT}, - - - delay = #{record.delay,jdbcType=TINYINT}, - - - delay_time = #{record.delayTime,jdbcType=BIGINT}, - - - loop_to = #{record.loopTo,jdbcType=BIGINT}, - - - loop_times = #{record.loopTimes,jdbcType=INTEGER}, - - - virtual = #{record.virtual,jdbcType=TINYINT}, - - - level = #{record.level,jdbcType=TINYINT}, - - - has_group = #{record.hasGroup,jdbcType=TINYINT}, - - - all_member = #{record.allMember,jdbcType=TINYINT}, - - - created_at = #{record.createdAt,jdbcType=TIMESTAMP}, - - - updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, - - - rec_status = #{record.recStatus,jdbcType=TINYINT}, - - - - - - - - update t_pro_task_detail - set id = #{record.id,jdbcType=BIGINT}, - project_id = #{record.projectId,jdbcType=BIGINT}, - name = #{record.name,jdbcType=VARCHAR}, - description = #{record.description,jdbcType=VARCHAR}, - begin_time = #{record.beginTime,jdbcType=BIGINT}, - end_time = #{record.endTime,jdbcType=BIGINT}, - cycle = #{record.cycle,jdbcType=VARCHAR}, - parent_id = #{record.parentId,jdbcType=BIGINT}, - sub_task = #{record.subTask,jdbcType=VARCHAR}, - sub_project_id = #{record.subProjectId,jdbcType=BIGINT}, - sub_project = #{record.subProject,jdbcType=VARCHAR}, - executor_role = #{record.executorRole,jdbcType=BIGINT}, - checker_role = #{record.checkerRole,jdbcType=BIGINT}, - money = #{record.money,jdbcType=BIGINT}, - delay = #{record.delay,jdbcType=TINYINT}, - delay_time = #{record.delayTime,jdbcType=BIGINT}, - loop_to = #{record.loopTo,jdbcType=BIGINT}, - loop_times = #{record.loopTimes,jdbcType=INTEGER}, - virtual = #{record.virtual,jdbcType=TINYINT}, - level = #{record.level,jdbcType=TINYINT}, - has_group = #{record.hasGroup,jdbcType=TINYINT}, - all_member = #{record.allMember,jdbcType=TINYINT}, - created_at = #{record.createdAt,jdbcType=TIMESTAMP}, - updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{record.recStatus,jdbcType=TINYINT} - - - - - - update t_pro_task_detail - - - project_id = #{projectId,jdbcType=BIGINT}, - - - name = #{name,jdbcType=VARCHAR}, - - - description = #{description,jdbcType=VARCHAR}, - - - begin_time = #{beginTime,jdbcType=BIGINT}, - - - end_time = #{endTime,jdbcType=BIGINT}, - - - cycle = #{cycle,jdbcType=VARCHAR}, - - - parent_id = #{parentId,jdbcType=BIGINT}, - - - sub_task = #{subTask,jdbcType=VARCHAR}, - - - sub_project_id = #{subProjectId,jdbcType=BIGINT}, - - - sub_project = #{subProject,jdbcType=VARCHAR}, - - - executor_role = #{executorRole,jdbcType=BIGINT}, - - - checker_role = #{checkerRole,jdbcType=BIGINT}, - - - money = #{money,jdbcType=BIGINT}, - - - delay = #{delay,jdbcType=TINYINT}, - - - delay_time = #{delayTime,jdbcType=BIGINT}, - - - loop_to = #{loopTo,jdbcType=BIGINT}, - - - loop_times = #{loopTimes,jdbcType=INTEGER}, - - - virtual = #{virtual,jdbcType=TINYINT}, - - - level = #{level,jdbcType=TINYINT}, - - - has_group = #{hasGroup,jdbcType=TINYINT}, - - - all_member = #{allMember,jdbcType=TINYINT}, - - - created_at = #{createdAt,jdbcType=TIMESTAMP}, - - - updated_at = #{updatedAt,jdbcType=TIMESTAMP}, - - - rec_status = #{recStatus,jdbcType=TINYINT}, - - - where id = #{id,jdbcType=BIGINT} - - - update t_pro_task_detail - set project_id = #{projectId,jdbcType=BIGINT}, - name = #{name,jdbcType=VARCHAR}, - description = #{description,jdbcType=VARCHAR}, - begin_time = #{beginTime,jdbcType=BIGINT}, - end_time = #{endTime,jdbcType=BIGINT}, - cycle = #{cycle,jdbcType=VARCHAR}, - parent_id = #{parentId,jdbcType=BIGINT}, - sub_task = #{subTask,jdbcType=VARCHAR}, - sub_project_id = #{subProjectId,jdbcType=BIGINT}, - sub_project = #{subProject,jdbcType=VARCHAR}, - executor_role = #{executorRole,jdbcType=BIGINT}, - checker_role = #{checkerRole,jdbcType=BIGINT}, - money = #{money,jdbcType=BIGINT}, - delay = #{delay,jdbcType=TINYINT}, - delay_time = #{delayTime,jdbcType=BIGINT}, - loop_to = #{loopTo,jdbcType=BIGINT}, - loop_times = #{loopTimes,jdbcType=INTEGER}, - virtual = #{virtual,jdbcType=TINYINT}, - level = #{level,jdbcType=TINYINT}, - has_group = #{hasGroup,jdbcType=TINYINT}, - all_member = #{allMember,jdbcType=TINYINT}, - created_at = #{createdAt,jdbcType=TIMESTAMP}, - updated_at = #{updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{recStatus,jdbcType=TINYINT} - where id = #{id,jdbcType=BIGINT} - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, project_id, name, description, begin_time, end_time, cycle, parent_id, sub_task, + sub_project_id, sub_project, executor_role, checker_role, money, delay, delay_time, + loop_to, loop_times, virtual, level, has_group, finish_need_all, all_member, created_at, + updated_at, rec_status + + + + + delete from t_pro_task_detail + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_task_detail + + + + + + insert into t_pro_task_detail (id, project_id, name, + description, begin_time, end_time, + cycle, parent_id, sub_task, + sub_project_id, sub_project, executor_role, + checker_role, money, delay, + delay_time, loop_to, loop_times, + virtual, level, has_group, + finish_need_all, all_member, created_at, + updated_at, rec_status) + values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, + #{description,jdbcType=VARCHAR}, #{beginTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, + #{cycle,jdbcType=VARCHAR}, #{parentId,jdbcType=BIGINT}, #{subTask,jdbcType=VARCHAR}, + #{subProjectId,jdbcType=BIGINT}, #{subProject,jdbcType=VARCHAR}, #{executorRole,jdbcType=BIGINT}, + #{checkerRole,jdbcType=BIGINT}, #{money,jdbcType=BIGINT}, #{delay,jdbcType=TINYINT}, + #{delayTime,jdbcType=BIGINT}, #{loopTo,jdbcType=BIGINT}, #{loopTimes,jdbcType=INTEGER}, + #{virtual,jdbcType=TINYINT}, #{level,jdbcType=TINYINT}, #{hasGroup,jdbcType=TINYINT}, + #{finishNeedAll,jdbcType=TINYINT}, #{allMember,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) + + + insert into t_pro_task_detail + + + id, + + + project_id, + + + name, + + + description, + + + begin_time, + + + end_time, + + + cycle, + + + parent_id, + + + sub_task, + + + sub_project_id, + + + sub_project, + + + executor_role, + + + checker_role, + + + money, + + + delay, + + + delay_time, + + + loop_to, + + + loop_times, + + + virtual, + + + level, + + + has_group, + + + finish_need_all, + + + all_member, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{projectId,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{beginTime,jdbcType=BIGINT}, + + + #{endTime,jdbcType=BIGINT}, + + + #{cycle,jdbcType=VARCHAR}, + + + #{parentId,jdbcType=BIGINT}, + + + #{subTask,jdbcType=VARCHAR}, + + + #{subProjectId,jdbcType=BIGINT}, + + + #{subProject,jdbcType=VARCHAR}, + + + #{executorRole,jdbcType=BIGINT}, + + + #{checkerRole,jdbcType=BIGINT}, + + + #{money,jdbcType=BIGINT}, + + + #{delay,jdbcType=TINYINT}, + + + #{delayTime,jdbcType=BIGINT}, + + + #{loopTo,jdbcType=BIGINT}, + + + #{loopTimes,jdbcType=INTEGER}, + + + #{virtual,jdbcType=TINYINT}, + + + #{level,jdbcType=TINYINT}, + + + #{hasGroup,jdbcType=TINYINT}, + + + #{finishNeedAll,jdbcType=TINYINT}, + + + #{allMember,jdbcType=TINYINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_task_detail + + + id = #{record.id,jdbcType=BIGINT}, + + + project_id = #{record.projectId,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + begin_time = #{record.beginTime,jdbcType=BIGINT}, + + + end_time = #{record.endTime,jdbcType=BIGINT}, + + + cycle = #{record.cycle,jdbcType=VARCHAR}, + + + parent_id = #{record.parentId,jdbcType=BIGINT}, + + + sub_task = #{record.subTask,jdbcType=VARCHAR}, + + + sub_project_id = #{record.subProjectId,jdbcType=BIGINT}, + + + sub_project = #{record.subProject,jdbcType=VARCHAR}, + + + executor_role = #{record.executorRole,jdbcType=BIGINT}, + + + checker_role = #{record.checkerRole,jdbcType=BIGINT}, + + + money = #{record.money,jdbcType=BIGINT}, + + + delay = #{record.delay,jdbcType=TINYINT}, + + + delay_time = #{record.delayTime,jdbcType=BIGINT}, + + + loop_to = #{record.loopTo,jdbcType=BIGINT}, + + + loop_times = #{record.loopTimes,jdbcType=INTEGER}, + + + virtual = #{record.virtual,jdbcType=TINYINT}, + + + level = #{record.level,jdbcType=TINYINT}, + + + has_group = #{record.hasGroup,jdbcType=TINYINT}, + + + finish_need_all = #{record.finishNeedAll,jdbcType=TINYINT}, + + + all_member = #{record.allMember,jdbcType=TINYINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_task_detail + set id = #{record.id,jdbcType=BIGINT}, + project_id = #{record.projectId,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + begin_time = #{record.beginTime,jdbcType=BIGINT}, + end_time = #{record.endTime,jdbcType=BIGINT}, + cycle = #{record.cycle,jdbcType=VARCHAR}, + parent_id = #{record.parentId,jdbcType=BIGINT}, + sub_task = #{record.subTask,jdbcType=VARCHAR}, + sub_project_id = #{record.subProjectId,jdbcType=BIGINT}, + sub_project = #{record.subProject,jdbcType=VARCHAR}, + executor_role = #{record.executorRole,jdbcType=BIGINT}, + checker_role = #{record.checkerRole,jdbcType=BIGINT}, + money = #{record.money,jdbcType=BIGINT}, + delay = #{record.delay,jdbcType=TINYINT}, + delay_time = #{record.delayTime,jdbcType=BIGINT}, + loop_to = #{record.loopTo,jdbcType=BIGINT}, + loop_times = #{record.loopTimes,jdbcType=INTEGER}, + virtual = #{record.virtual,jdbcType=TINYINT}, + level = #{record.level,jdbcType=TINYINT}, + has_group = #{record.hasGroup,jdbcType=TINYINT}, + finish_need_all = #{record.finishNeedAll,jdbcType=TINYINT}, + all_member = #{record.allMember,jdbcType=TINYINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_task_detail + + + project_id = #{projectId,jdbcType=BIGINT}, + + + name = #{name,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + begin_time = #{beginTime,jdbcType=BIGINT}, + + + end_time = #{endTime,jdbcType=BIGINT}, + + + cycle = #{cycle,jdbcType=VARCHAR}, + + + parent_id = #{parentId,jdbcType=BIGINT}, + + + sub_task = #{subTask,jdbcType=VARCHAR}, + + + sub_project_id = #{subProjectId,jdbcType=BIGINT}, + + + sub_project = #{subProject,jdbcType=VARCHAR}, + + + executor_role = #{executorRole,jdbcType=BIGINT}, + + + checker_role = #{checkerRole,jdbcType=BIGINT}, + + + money = #{money,jdbcType=BIGINT}, + + + delay = #{delay,jdbcType=TINYINT}, + + + delay_time = #{delayTime,jdbcType=BIGINT}, + + + loop_to = #{loopTo,jdbcType=BIGINT}, + + + loop_times = #{loopTimes,jdbcType=INTEGER}, + + + virtual = #{virtual,jdbcType=TINYINT}, + + + level = #{level,jdbcType=TINYINT}, + + + has_group = #{hasGroup,jdbcType=TINYINT}, + + + finish_need_all = #{finishNeedAll,jdbcType=TINYINT}, + + + all_member = #{allMember,jdbcType=TINYINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_task_detail + set project_id = #{projectId,jdbcType=BIGINT}, + name = #{name,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + begin_time = #{beginTime,jdbcType=BIGINT}, + end_time = #{endTime,jdbcType=BIGINT}, + cycle = #{cycle,jdbcType=VARCHAR}, + parent_id = #{parentId,jdbcType=BIGINT}, + sub_task = #{subTask,jdbcType=VARCHAR}, + sub_project_id = #{subProjectId,jdbcType=BIGINT}, + sub_project = #{subProject,jdbcType=VARCHAR}, + executor_role = #{executorRole,jdbcType=BIGINT}, + checker_role = #{checkerRole,jdbcType=BIGINT}, + money = #{money,jdbcType=BIGINT}, + delay = #{delay,jdbcType=TINYINT}, + delay_time = #{delayTime,jdbcType=BIGINT}, + loop_to = #{loopTo,jdbcType=BIGINT}, + loop_times = #{loopTimes,jdbcType=INTEGER}, + virtual = #{virtual,jdbcType=TINYINT}, + level = #{level,jdbcType=TINYINT}, + has_group = #{hasGroup,jdbcType=TINYINT}, + finish_need_all = #{finishNeedAll,jdbcType=TINYINT}, + all_member = #{allMember,jdbcType=TINYINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + \ No newline at end of file diff --git a/tall/tall.iml b/tall/tall.iml index 23ea2faa..ff211489 100644 --- a/tall/tall.iml +++ b/tall/tall.iml @@ -4,15 +4,6 @@ - - - - - - - - - @@ -20,7 +11,6 @@ - @@ -127,6 +117,7 @@ + @@ -207,7 +198,6 @@ - @@ -219,8 +209,6 @@ - - diff --git a/tall/target/classes/application-common.yml b/tall/target/classes/application-common.yml new file mode 100644 index 00000000..32d3f3e1 --- /dev/null +++ b/tall/target/classes/application-common.yml @@ -0,0 +1,30 @@ +logging: + level: + com: + favorites: DEBUG + org: + hibernate: ERROR + springframework: + web: DEBUG +mybatis: + config-location: classpath:mybatis/mybatis-config.xml + mapper-locations: classpath*:mapper_*/*.xml + type-aliases-package: com.ccsens.ht.bean +server: + tomcat: + uri-encoding: UTF-8 +spring: + http: + encoding: + charset: UTF-8 + enabled: true + force: true + log-request-details: true + servlet: + multipart: + max-file-size: 10MB + max-request-size: 100MB + snowflake: + datacenterId: 1 + workerId: 1 + diff --git a/tall/target/classes/application-dev.yml b/tall/target/classes/application-dev.yml new file mode 100644 index 00000000..b60791d4 --- /dev/null +++ b/tall/target/classes/application-dev.yml @@ -0,0 +1,28 @@ +server: + port: 8080 + servlet: + context-path: /v1.0 +spring: + application: + name: tall + datasource: + type: com.alibaba.druid.pool.DruidDataSource + rabbitmq: + host: api.ccsens.com + password: 111111 + port: 5672 + username: admin + redis: + database: 0 + host: 127.0.0.1 + jedis: + pool: + max-active: 200 + max-idle: 10 + max-wait: -1ms + min-idle: 0 + password: '' + port: 6379 + timeout: 1000ms +swagger: + enable: true diff --git a/tall/target/classes/application-test.yml b/tall/target/classes/application-test.yml new file mode 100644 index 00000000..46ba7501 --- /dev/null +++ b/tall/target/classes/application-test.yml @@ -0,0 +1,26 @@ +server: + port: 8081 +spring: + application: + name: tall + datasource: + type: com.alibaba.druid.pool.DruidDataSource + rabbitmq: + host: api.ccsens.com + password: 111111 + port: 5672 + username: admin + redis: + database: 0 + host: 127.0.0.1 + jedis: + pool: + max-active: 200 + max-idle: 10 + max-wait: -1ms + min-idle: 0 + password: '' + port: 6379 + timeout: 1000ms +swagger: + enable: true diff --git a/tall/target/classes/application.yml b/tall/target/classes/application.yml new file mode 100644 index 00000000..1d881c2f --- /dev/null +++ b/tall/target/classes/application.yml @@ -0,0 +1,4 @@ +spring: + profiles: + active: dev + include: util-dev,common \ No newline at end of file diff --git a/tall/target/classes/business.yml b/tall/target/classes/business.yml new file mode 100644 index 00000000..eb60c4ba --- /dev/null +++ b/tall/target/classes/business.yml @@ -0,0 +1,9 @@ +business: + packet: + ## 红包默认过期时间(ms) + expiretime: 7*24*3600*1000 + ## 发红包手续费率 + rate: 0.01 + ## 发红包手续费率 + toplimit: 500.0 +name: zs \ No newline at end of file diff --git a/tall/target/classes/com/ccsens/tall/TallApplication.class b/tall/target/classes/com/ccsens/tall/TallApplication.class new file mode 100644 index 00000000..90c2c858 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/TallApplication.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/DeliverDto$CheckDeliver.class b/tall/target/classes/com/ccsens/tall/bean/dto/DeliverDto$CheckDeliver.class new file mode 100644 index 00000000..8d623b25 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/DeliverDto$CheckDeliver.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/DeliverDto$UploadDeliver.class b/tall/target/classes/com/ccsens/tall/bean/dto/DeliverDto$UploadDeliver.class new file mode 100644 index 00000000..13515f58 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/DeliverDto$UploadDeliver.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/DeliverDto$fileInfo.class b/tall/target/classes/com/ccsens/tall/bean/dto/DeliverDto$fileInfo.class new file mode 100644 index 00000000..035b0d8a Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/DeliverDto$fileInfo.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/DeliverDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/DeliverDto.class new file mode 100644 index 00000000..b3283ad1 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/DeliverDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/HardwareDto$HardwareInfo.class b/tall/target/classes/com/ccsens/tall/bean/dto/HardwareDto$HardwareInfo.class new file mode 100644 index 00000000..2b2a5779 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/HardwareDto$HardwareInfo.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/HardwareDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/HardwareDto.class new file mode 100644 index 00000000..bc91a52c Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/HardwareDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/MemberRoleDto$ProMemberRoleDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/MemberRoleDto$ProMemberRoleDto.class new file mode 100644 index 00000000..fcf051f2 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/MemberRoleDto$ProMemberRoleDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/MemberRoleDto$RoleId.class b/tall/target/classes/com/ccsens/tall/bean/dto/MemberRoleDto$RoleId.class new file mode 100644 index 00000000..8f57086c Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/MemberRoleDto$RoleId.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/MemberRoleDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/MemberRoleDto.class new file mode 100644 index 00000000..30d14a8b Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/MemberRoleDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/MessageDto$AckMessage.class b/tall/target/classes/com/ccsens/tall/bean/dto/MessageDto$AckMessage.class new file mode 100644 index 00000000..609ccbbc Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/MessageDto$AckMessage.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/MessageDto$AuthMessage.class b/tall/target/classes/com/ccsens/tall/bean/dto/MessageDto$AuthMessage.class new file mode 100644 index 00000000..0c1c6f63 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/MessageDto$AuthMessage.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/MessageDto$HasReadMessage.class b/tall/target/classes/com/ccsens/tall/bean/dto/MessageDto$HasReadMessage.class new file mode 100644 index 00000000..555f2344 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/MessageDto$HasReadMessage.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/MessageDto$NodeMessage.class b/tall/target/classes/com/ccsens/tall/bean/dto/MessageDto$NodeMessage.class new file mode 100644 index 00000000..c7cd2868 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/MessageDto$NodeMessage.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/MessageDto$UserMessage.class b/tall/target/classes/com/ccsens/tall/bean/dto/MessageDto$UserMessage.class new file mode 100644 index 00000000..472e7118 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/MessageDto$UserMessage.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/MessageDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/MessageDto.class new file mode 100644 index 00000000..756f3ffc Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/MessageDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/PluginDto$BatchDevice.class b/tall/target/classes/com/ccsens/tall/bean/dto/PluginDto$BatchDevice.class new file mode 100644 index 00000000..ac9f81f4 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/PluginDto$BatchDevice.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/PluginDto$BatchSetting.class b/tall/target/classes/com/ccsens/tall/bean/dto/PluginDto$BatchSetting.class new file mode 100644 index 00000000..f8104fb4 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/PluginDto$BatchSetting.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/PluginDto$TaskSetting.class b/tall/target/classes/com/ccsens/tall/bean/dto/PluginDto$TaskSetting.class new file mode 100644 index 00000000..cafb12d8 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/PluginDto$TaskSetting.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/PluginDto$__BatchSetting.class b/tall/target/classes/com/ccsens/tall/bean/dto/PluginDto$__BatchSetting.class new file mode 100644 index 00000000..494f6339 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/PluginDto$__BatchSetting.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/PluginDto$__TaskSetting.class b/tall/target/classes/com/ccsens/tall/bean/dto/PluginDto$__TaskSetting.class new file mode 100644 index 00000000..7e62ee6a Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/PluginDto$__TaskSetting.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/PluginDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/PluginDto.class new file mode 100644 index 00000000..f8d47574 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/PluginDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/ProTaskDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/ProTaskDto.class new file mode 100644 index 00000000..801bf71e Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/ProTaskDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/ProjectDto$ProjectIdDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/ProjectDto$ProjectIdDto.class new file mode 100644 index 00000000..f48dd404 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/ProjectDto$ProjectIdDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/ProjectDto$ProjectInfoDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/ProjectDto$ProjectInfoDto.class new file mode 100644 index 00000000..3ce41488 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/ProjectDto$ProjectInfoDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/ProjectDto$RoleInfoDto$__RoleInfo.class b/tall/target/classes/com/ccsens/tall/bean/dto/ProjectDto$RoleInfoDto$__RoleInfo.class new file mode 100644 index 00000000..5bdc112f Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/ProjectDto$RoleInfoDto$__RoleInfo.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/ProjectDto$RoleInfoDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/ProjectDto$RoleInfoDto.class new file mode 100644 index 00000000..eb265d89 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/ProjectDto$RoleInfoDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/ProjectDto$TaskInfoDto$__TaskInfo.class b/tall/target/classes/com/ccsens/tall/bean/dto/ProjectDto$TaskInfoDto$__TaskInfo.class new file mode 100644 index 00000000..b766f61a Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/ProjectDto$TaskInfoDto$__TaskInfo.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/ProjectDto$TaskInfoDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/ProjectDto$TaskInfoDto.class new file mode 100644 index 00000000..de1d93f4 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/ProjectDto$TaskInfoDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/ProjectDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/ProjectDto.class new file mode 100644 index 00000000..4f9b9c6e Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/ProjectDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/Spider/ChuangYeFuWuXuQiu.class b/tall/target/classes/com/ccsens/tall/bean/dto/Spider/ChuangYeFuWuXuQiu.class new file mode 100644 index 00000000..9f6743ef Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/Spider/ChuangYeFuWuXuQiu.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/Spider/GuDongXinXi$guQuanRongZi.class b/tall/target/classes/com/ccsens/tall/bean/dto/Spider/GuDongXinXi$guQuanRongZi.class new file mode 100644 index 00000000..d6f024ff Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/Spider/GuDongXinXi$guQuanRongZi.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/Spider/GuDongXinXi$zhaiQuanRongZi.class b/tall/target/classes/com/ccsens/tall/bean/dto/Spider/GuDongXinXi$zhaiQuanRongZi.class new file mode 100644 index 00000000..29ec78f5 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/Spider/GuDongXinXi$zhaiQuanRongZi.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/Spider/GuDongXinXi.class b/tall/target/classes/com/ccsens/tall/bean/dto/Spider/GuDongXinXi.class new file mode 100644 index 00000000..3a8961c0 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/Spider/GuDongXinXi.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/Spider/HeXinTuanDui.class b/tall/target/classes/com/ccsens/tall/bean/dto/Spider/HeXinTuanDui.class new file mode 100644 index 00000000..070bc497 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/Spider/HeXinTuanDui.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/Spider/JiBenXinXi$info.class b/tall/target/classes/com/ccsens/tall/bean/dto/Spider/JiBenXinXi$info.class new file mode 100644 index 00000000..b5d025bf Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/Spider/JiBenXinXi$info.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/Spider/JiBenXinXi$zhuanLi.class b/tall/target/classes/com/ccsens/tall/bean/dto/Spider/JiBenXinXi$zhuanLi.class new file mode 100644 index 00000000..cb3f26b4 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/Spider/JiBenXinXi$zhuanLi.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/Spider/JiBenXinXi.class b/tall/target/classes/com/ccsens/tall/bean/dto/Spider/JiBenXinXi.class new file mode 100644 index 00000000..ef208c43 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/Spider/JiBenXinXi.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/Spider/ShangYeJiHuaShu.class b/tall/target/classes/com/ccsens/tall/bean/dto/Spider/ShangYeJiHuaShu.class new file mode 100644 index 00000000..8c4e3bb8 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/Spider/ShangYeJiHuaShu.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/SpiderDto$Recommend.class b/tall/target/classes/com/ccsens/tall/bean/dto/SpiderDto$Recommend.class new file mode 100644 index 00000000..a55f46ae Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/SpiderDto$Recommend.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/SpiderDto$RecommendList.class b/tall/target/classes/com/ccsens/tall/bean/dto/SpiderDto$RecommendList.class new file mode 100644 index 00000000..2ff6a508 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/SpiderDto$RecommendList.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/SpiderDto$Spider.class b/tall/target/classes/com/ccsens/tall/bean/dto/SpiderDto$Spider.class new file mode 100644 index 00000000..95a9716a Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/SpiderDto$Spider.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/SpiderDto$SpiderHtml.class b/tall/target/classes/com/ccsens/tall/bean/dto/SpiderDto$SpiderHtml.class new file mode 100644 index 00000000..d0e15924 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/SpiderDto$SpiderHtml.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/SpiderDto$SpiderHtmlList.class b/tall/target/classes/com/ccsens/tall/bean/dto/SpiderDto$SpiderHtmlList.class new file mode 100644 index 00000000..f25d1821 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/SpiderDto$SpiderHtmlList.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/SpiderDto$SpiderList.class b/tall/target/classes/com/ccsens/tall/bean/dto/SpiderDto$SpiderList.class new file mode 100644 index 00000000..0956c225 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/SpiderDto$SpiderList.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/SpiderDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/SpiderDto.class new file mode 100644 index 00000000..e3023b25 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/SpiderDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$AddTask.class b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$AddTask.class new file mode 100644 index 00000000..5a3918b1 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$AddTask.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$ChangeBeginTime.class b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$ChangeBeginTime.class new file mode 100644 index 00000000..d563c3f1 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$ChangeBeginTime.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$ChangeTaskDuration.class b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$ChangeTaskDuration.class new file mode 100644 index 00000000..f58e03c3 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$ChangeTaskDuration.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$ChangeTaskInfo.class b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$ChangeTaskInfo.class new file mode 100644 index 00000000..a4d02bae Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$ChangeTaskInfo.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$CompleteTask.class b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$CompleteTask.class new file mode 100644 index 00000000..0266b273 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$CompleteTask.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$DeleteTask.class b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$DeleteTask.class new file mode 100644 index 00000000..ea2397b9 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$DeleteTask.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$InsertTask.class b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$InsertTask.class new file mode 100644 index 00000000..336a1276 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$InsertTask.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$MoveTask.class b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$MoveTask.class new file mode 100644 index 00000000..97c4b157 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$MoveTask.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$StartTask.class b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$StartTask.class new file mode 100644 index 00000000..7f8cd74e Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$StartTask.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$TaskSubTimeId.class b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$TaskSubTimeId.class new file mode 100644 index 00000000..02255e74 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$TaskSubTimeId.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$UpdateTask.class b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$UpdateTask.class new file mode 100644 index 00000000..b2c4a498 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$UpdateTask.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$__TaskDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$__TaskDto.class new file mode 100644 index 00000000..6ebed3ea Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto$__TaskDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto.class new file mode 100644 index 00000000..1305c0c5 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/TaskDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/TaskTcp$__Plugin.class b/tall/target/classes/com/ccsens/tall/bean/dto/TaskTcp$__Plugin.class new file mode 100644 index 00000000..73b46888 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/TaskTcp$__Plugin.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/TaskTcp.class b/tall/target/classes/com/ccsens/tall/bean/dto/TaskTcp.class new file mode 100644 index 00000000..c45e0bb8 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/TaskTcp.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/UserDto$Account.class b/tall/target/classes/com/ccsens/tall/bean/dto/UserDto$Account.class new file mode 100644 index 00000000..ebd0b4d3 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/UserDto$Account.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/UserDto$UpdatePassword.class b/tall/target/classes/com/ccsens/tall/bean/dto/UserDto$UpdatePassword.class new file mode 100644 index 00000000..efe15283 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/UserDto$UpdatePassword.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/UserDto$UpdatePhone.class b/tall/target/classes/com/ccsens/tall/bean/dto/UserDto$UpdatePhone.class new file mode 100644 index 00000000..a135f041 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/UserDto$UpdatePhone.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/UserDto$UserSginin$Data.class b/tall/target/classes/com/ccsens/tall/bean/dto/UserDto$UserSginin$Data.class new file mode 100644 index 00000000..7bf0b05e Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/UserDto$UserSginin$Data.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/UserDto$UserSginin.class b/tall/target/classes/com/ccsens/tall/bean/dto/UserDto$UserSginin.class new file mode 100644 index 00000000..4486f44c Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/UserDto$UserSginin.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/UserDto$UserSignup.class b/tall/target/classes/com/ccsens/tall/bean/dto/UserDto$UserSignup.class new file mode 100644 index 00000000..0e3eb74e Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/UserDto$UserSignup.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/UserDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/UserDto.class new file mode 100644 index 00000000..69ba208e Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/UserDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/AckMessageDto$Data.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/AckMessageDto$Data.class new file mode 100644 index 00000000..165199a3 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/AckMessageDto$Data.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/AckMessageDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/AckMessageDto.class new file mode 100644 index 00000000..14f343f2 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/AckMessageDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/AuthMessageDto$Data.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/AuthMessageDto$Data.class new file mode 100644 index 00000000..f1e08b14 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/AuthMessageDto$Data.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/AuthMessageDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/AuthMessageDto.class new file mode 100644 index 00000000..f26a54fc Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/AuthMessageDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/BaseMessageDto$MessageUser.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/BaseMessageDto$MessageUser.class new file mode 100644 index 00000000..4aa660fa Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/BaseMessageDto$MessageUser.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/BaseMessageDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/BaseMessageDto.class new file mode 100644 index 00000000..421dcf9f Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/BaseMessageDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/BatchSettingMessageWithAnswerDto$Data.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/BatchSettingMessageWithAnswerDto$Data.class new file mode 100644 index 00000000..715263e8 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/BatchSettingMessageWithAnswerDto$Data.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/BatchSettingMessageWithAnswerDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/BatchSettingMessageWithAnswerDto.class new file mode 100644 index 00000000..1e8c13be Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/BatchSettingMessageWithAnswerDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/DeliverMessageWithCheckerDto$Data.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/DeliverMessageWithCheckerDto$Data.class new file mode 100644 index 00000000..f6e225b1 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/DeliverMessageWithCheckerDto$Data.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/DeliverMessageWithCheckerDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/DeliverMessageWithCheckerDto.class new file mode 100644 index 00000000..758c24ba Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/DeliverMessageWithCheckerDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/DeliverMessageWithDeleteDto$Data.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/DeliverMessageWithDeleteDto$Data.class new file mode 100644 index 00000000..ee445b03 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/DeliverMessageWithDeleteDto$Data.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/DeliverMessageWithDeleteDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/DeliverMessageWithDeleteDto.class new file mode 100644 index 00000000..a15bc27a Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/DeliverMessageWithDeleteDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/DeliverMessageWithUploadDto$Data.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/DeliverMessageWithUploadDto$Data.class new file mode 100644 index 00000000..0e51d03b Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/DeliverMessageWithUploadDto$Data.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/DeliverMessageWithUploadDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/DeliverMessageWithUploadDto.class new file mode 100644 index 00000000..4e008a1e Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/DeliverMessageWithUploadDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/MasterStatusMessageWithQueryDto$Data.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/MasterStatusMessageWithQueryDto$Data.class new file mode 100644 index 00000000..1c5cdc81 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/MasterStatusMessageWithQueryDto$Data.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/MasterStatusMessageWithQueryDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/MasterStatusMessageWithQueryDto.class new file mode 100644 index 00000000..5ee6c6d3 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/MasterStatusMessageWithQueryDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/NodeMessageWithChangeStatusDto$Data.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/NodeMessageWithChangeStatusDto$Data.class new file mode 100644 index 00000000..ddda011a Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/NodeMessageWithChangeStatusDto$Data.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/NodeMessageWithChangeStatusDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/NodeMessageWithChangeStatusDto.class new file mode 100644 index 00000000..021e6edd Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/NodeMessageWithChangeStatusDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/NodeMessageWithPostCommentDto$Data.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/NodeMessageWithPostCommentDto$Data.class new file mode 100644 index 00000000..5de1654b Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/NodeMessageWithPostCommentDto$Data.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/NodeMessageWithPostCommentDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/NodeMessageWithPostCommentDto.class new file mode 100644 index 00000000..96cbb221 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/NodeMessageWithPostCommentDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/NodeMessageWithUploadDeliverDto$Data$Deliver.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/NodeMessageWithUploadDeliverDto$Data$Deliver.class new file mode 100644 index 00000000..a8841d5f Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/NodeMessageWithUploadDeliverDto$Data$Deliver.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/NodeMessageWithUploadDeliverDto$Data.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/NodeMessageWithUploadDeliverDto$Data.class new file mode 100644 index 00000000..9c6f1450 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/NodeMessageWithUploadDeliverDto$Data.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/NodeMessageWithUploadDeliverDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/NodeMessageWithUploadDeliverDto.class new file mode 100644 index 00000000..2c7f2b2a Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/NodeMessageWithUploadDeliverDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/RingMessageWithReadDto$Data.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/RingMessageWithReadDto$Data.class new file mode 100644 index 00000000..ac2e0b53 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/RingMessageWithReadDto$Data.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/RingMessageWithReadDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/RingMessageWithReadDto.class new file mode 100644 index 00000000..3cf6f93a Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/RingMessageWithReadDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/RingMessageWithSendDto$Data.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/RingMessageWithSendDto$Data.class new file mode 100644 index 00000000..86adc537 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/RingMessageWithSendDto$Data.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/RingMessageWithSendDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/RingMessageWithSendDto.class new file mode 100644 index 00000000..b7968dc1 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/RingMessageWithSendDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithAddDto$Data.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithAddDto$Data.class new file mode 100644 index 00000000..043251d6 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithAddDto$Data.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithAddDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithAddDto.class new file mode 100644 index 00000000..a0f992e4 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithAddDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithChangeBeginTimeDto$Data.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithChangeBeginTimeDto$Data.class new file mode 100644 index 00000000..ea820087 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithChangeBeginTimeDto$Data.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithChangeBeginTimeDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithChangeBeginTimeDto.class new file mode 100644 index 00000000..514a3a6a Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithChangeBeginTimeDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithChangeDurationDto$Data.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithChangeDurationDto$Data.class new file mode 100644 index 00000000..651e8a1d Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithChangeDurationDto$Data.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithChangeDurationDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithChangeDurationDto.class new file mode 100644 index 00000000..a4dc6893 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithChangeDurationDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithMoveDto$Data.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithMoveDto$Data.class new file mode 100644 index 00000000..ad4b6502 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithMoveDto$Data.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithMoveDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithMoveDto.class new file mode 100644 index 00000000..d7ad7005 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithMoveDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithReMoveDto$Data.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithReMoveDto$Data.class new file mode 100644 index 00000000..e7a84107 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithReMoveDto$Data.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithReMoveDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithReMoveDto.class new file mode 100644 index 00000000..128b6f85 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithReMoveDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithStartDto$Data.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithStartDto$Data.class new file mode 100644 index 00000000..882938dc Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithStartDto$Data.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithStartDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithStartDto.class new file mode 100644 index 00000000..de05741c Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/SyncMessageWithStartDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/UserMessageWithHasReadDto$Data.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/UserMessageWithHasReadDto$Data.class new file mode 100644 index 00000000..d1bd6103 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/UserMessageWithHasReadDto$Data.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/UserMessageWithHasReadDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/UserMessageWithHasReadDto.class new file mode 100644 index 00000000..be58b66a Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/UserMessageWithHasReadDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/UserMessageWithUserDto$Data.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/UserMessageWithUserDto$Data.class new file mode 100644 index 00000000..14b1fc59 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/UserMessageWithUserDto$Data.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/dto/message/UserMessageWithUserDto.class b/tall/target/classes/com/ccsens/tall/bean/dto/message/UserMessageWithUserDto.class new file mode 100644 index 00000000..5d0a40ba Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/dto/message/UserMessageWithUserDto.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProLog.class b/tall/target/classes/com/ccsens/tall/bean/po/ProLog.class new file mode 100644 index 00000000..584e5413 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProLog.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProLogExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProLogExample$Criteria.class new file mode 100644 index 00000000..51534e98 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProLogExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProLogExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/ProLogExample$Criterion.class new file mode 100644 index 00000000..9154ec52 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProLogExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProLogExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProLogExample$GeneratedCriteria.class new file mode 100644 index 00000000..a3748fa0 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProLogExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProLogExample.class b/tall/target/classes/com/ccsens/tall/bean/po/ProLogExample.class new file mode 100644 index 00000000..6266e965 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProLogExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProMember.class b/tall/target/classes/com/ccsens/tall/bean/po/ProMember.class new file mode 100644 index 00000000..6e662399 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProMember.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProMemberExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProMemberExample$Criteria.class new file mode 100644 index 00000000..3c6bde73 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProMemberExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProMemberExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/ProMemberExample$Criterion.class new file mode 100644 index 00000000..1be2d5a6 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProMemberExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProMemberExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProMemberExample$GeneratedCriteria.class new file mode 100644 index 00000000..1288ae2b Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProMemberExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProMemberExample.class b/tall/target/classes/com/ccsens/tall/bean/po/ProMemberExample.class new file mode 100644 index 00000000..a23542ac Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProMemberExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProMemberRole.class b/tall/target/classes/com/ccsens/tall/bean/po/ProMemberRole.class new file mode 100644 index 00000000..2cc80cbb Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProMemberRole.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProMemberRoleExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProMemberRoleExample$Criteria.class new file mode 100644 index 00000000..1eb67a1f Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProMemberRoleExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProMemberRoleExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/ProMemberRoleExample$Criterion.class new file mode 100644 index 00000000..d03cf000 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProMemberRoleExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProMemberRoleExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProMemberRoleExample$GeneratedCriteria.class new file mode 100644 index 00000000..abe7069e Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProMemberRoleExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProMemberRoleExample.class b/tall/target/classes/com/ccsens/tall/bean/po/ProMemberRoleExample.class new file mode 100644 index 00000000..42d05ecc Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProMemberRoleExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProRole.class b/tall/target/classes/com/ccsens/tall/bean/po/ProRole.class new file mode 100644 index 00000000..2d0bf65f Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProRole.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExample$Criteria.class new file mode 100644 index 00000000..1ab0cf97 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExample$Criterion.class new file mode 100644 index 00000000..bccce497 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExample$GeneratedCriteria.class new file mode 100644 index 00000000..33f44442 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExample.class b/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExample.class new file mode 100644 index 00000000..d52c08ee Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExeclude.class b/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExeclude.class new file mode 100644 index 00000000..4497820e Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExeclude.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExecludeExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExecludeExample$Criteria.class new file mode 100644 index 00000000..bc7783f7 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExecludeExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExecludeExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExecludeExample$Criterion.class new file mode 100644 index 00000000..383349e7 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExecludeExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExecludeExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExecludeExample$GeneratedCriteria.class new file mode 100644 index 00000000..5fbf2126 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExecludeExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExecludeExample.class b/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExecludeExample.class new file mode 100644 index 00000000..d33486f6 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProRoleExecludeExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProRolePower.class b/tall/target/classes/com/ccsens/tall/bean/po/ProRolePower.class new file mode 100644 index 00000000..8f75777b Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProRolePower.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProRolePowerExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProRolePowerExample$Criteria.class new file mode 100644 index 00000000..49ea692d Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProRolePowerExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProRolePowerExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/ProRolePowerExample$Criterion.class new file mode 100644 index 00000000..79645060 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProRolePowerExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProRolePowerExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProRolePowerExample$GeneratedCriteria.class new file mode 100644 index 00000000..92801ee4 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProRolePowerExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProRolePowerExample.class b/tall/target/classes/com/ccsens/tall/bean/po/ProRolePowerExample.class new file mode 100644 index 00000000..ae31381b Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProRolePowerExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProSubTimeMember.class b/tall/target/classes/com/ccsens/tall/bean/po/ProSubTimeMember.class new file mode 100644 index 00000000..43416d96 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProSubTimeMember.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProSubTimeMemberExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProSubTimeMemberExample$Criteria.class new file mode 100644 index 00000000..c941369c Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProSubTimeMemberExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProSubTimeMemberExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/ProSubTimeMemberExample$Criterion.class new file mode 100644 index 00000000..9a859b0b Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProSubTimeMemberExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProSubTimeMemberExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProSubTimeMemberExample$GeneratedCriteria.class new file mode 100644 index 00000000..9c37b6aa Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProSubTimeMemberExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProSubTimeMemberExample.class b/tall/target/classes/com/ccsens/tall/bean/po/ProSubTimeMemberExample.class new file mode 100644 index 00000000..24482cd3 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProSubTimeMemberExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliver.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliver.class new file mode 100644 index 00000000..be164697 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliver.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverExample$Criteria.class new file mode 100644 index 00000000..01788d77 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverExample$Criterion.class new file mode 100644 index 00000000..afa4e5de Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverExample$GeneratedCriteria.class new file mode 100644 index 00000000..af34c18c Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverExample.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverExample.class new file mode 100644 index 00000000..bb205b1e Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLog.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLog.class new file mode 100644 index 00000000..d00b9f9a Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLog.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogChecker.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogChecker.class new file mode 100644 index 00000000..28ea8262 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogChecker.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogCheckerExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogCheckerExample$Criteria.class new file mode 100644 index 00000000..d2eb998c Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogCheckerExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogCheckerExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogCheckerExample$Criterion.class new file mode 100644 index 00000000..8d422ada Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogCheckerExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogCheckerExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogCheckerExample$GeneratedCriteria.class new file mode 100644 index 00000000..c4170d77 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogCheckerExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogCheckerExample.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogCheckerExample.class new file mode 100644 index 00000000..32ed150d Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogCheckerExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogExample$Criteria.class new file mode 100644 index 00000000..6865aae8 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogExample$Criterion.class new file mode 100644 index 00000000..785f9780 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogExample$GeneratedCriteria.class new file mode 100644 index 00000000..f0405760 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogExample.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogExample.class new file mode 100644 index 00000000..4c08a412 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDeliverPostLogExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDetail.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDetail.class new file mode 100644 index 00000000..8f7d2273 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDetail.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDetailExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDetailExample$Criteria.class new file mode 100644 index 00000000..4696a6c4 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDetailExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDetailExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDetailExample$Criterion.class new file mode 100644 index 00000000..45667652 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDetailExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDetailExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDetailExample$GeneratedCriteria.class new file mode 100644 index 00000000..70669671 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDetailExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDetailExample.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDetailExample.class new file mode 100644 index 00000000..fc559042 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskDetailExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskHardware.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskHardware.class new file mode 100644 index 00000000..acc7a153 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskHardware.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskHardwareExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskHardwareExample$Criteria.class new file mode 100644 index 00000000..17a5f4a9 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskHardwareExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskHardwareExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskHardwareExample$Criterion.class new file mode 100644 index 00000000..195390c3 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskHardwareExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskHardwareExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskHardwareExample$GeneratedCriteria.class new file mode 100644 index 00000000..0d917b01 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskHardwareExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskHardwareExample.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskHardwareExample.class new file mode 100644 index 00000000..fb2bc8ef Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskHardwareExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskMember.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskMember.class new file mode 100644 index 00000000..7ee53af0 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskMember.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskMemberExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskMemberExample$Criteria.class new file mode 100644 index 00000000..6566a38c Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskMemberExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskMemberExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskMemberExample$Criterion.class new file mode 100644 index 00000000..64b5cf6f Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskMemberExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskMemberExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskMemberExample$GeneratedCriteria.class new file mode 100644 index 00000000..4fe2a9c8 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskMemberExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskMemberExample.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskMemberExample.class new file mode 100644 index 00000000..d04fd5f8 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskMemberExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskPlugin.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskPlugin.class new file mode 100644 index 00000000..937bb803 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskPlugin.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskPluginExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskPluginExample$Criteria.class new file mode 100644 index 00000000..67c7ca8d Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskPluginExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskPluginExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskPluginExample$Criterion.class new file mode 100644 index 00000000..af3dd44a Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskPluginExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskPluginExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskPluginExample$GeneratedCriteria.class new file mode 100644 index 00000000..611c3c97 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskPluginExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskPluginExample.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskPluginExample.class new file mode 100644 index 00000000..a77f59a4 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskPluginExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskSubTime.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskSubTime.class new file mode 100644 index 00000000..34eaba07 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskSubTime.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskSubTimeExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskSubTimeExample$Criteria.class new file mode 100644 index 00000000..6ada0753 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskSubTimeExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskSubTimeExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskSubTimeExample$Criterion.class new file mode 100644 index 00000000..2fbbd0fb Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskSubTimeExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskSubTimeExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskSubTimeExample$GeneratedCriteria.class new file mode 100644 index 00000000..8360885e Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskSubTimeExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTaskSubTimeExample.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskSubTimeExample.class new file mode 100644 index 00000000..a5e8e0a9 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTaskSubTimeExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTodo.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTodo.class new file mode 100644 index 00000000..412c8afe Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTodo.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTodoExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTodoExample$Criteria.class new file mode 100644 index 00000000..d6dd48b3 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTodoExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTodoExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTodoExample$Criterion.class new file mode 100644 index 00000000..8624b74a Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTodoExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTodoExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTodoExample$GeneratedCriteria.class new file mode 100644 index 00000000..0893f208 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTodoExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/ProTodoExample.class b/tall/target/classes/com/ccsens/tall/bean/po/ProTodoExample.class new file mode 100644 index 00000000..85e77670 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/ProTodoExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysAuth.class b/tall/target/classes/com/ccsens/tall/bean/po/SysAuth.class new file mode 100644 index 00000000..0c91d6cb Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysAuth.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysAuthExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/SysAuthExample$Criteria.class new file mode 100644 index 00000000..d8a2939a Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysAuthExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysAuthExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/SysAuthExample$Criterion.class new file mode 100644 index 00000000..5ec47be6 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysAuthExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysAuthExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/SysAuthExample$GeneratedCriteria.class new file mode 100644 index 00000000..c069d060 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysAuthExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysAuthExample.class b/tall/target/classes/com/ccsens/tall/bean/po/SysAuthExample.class new file mode 100644 index 00000000..9339e958 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysAuthExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysBalanceLog.class b/tall/target/classes/com/ccsens/tall/bean/po/SysBalanceLog.class new file mode 100644 index 00000000..ff389ebd Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysBalanceLog.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysBalanceLogExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/SysBalanceLogExample$Criteria.class new file mode 100644 index 00000000..9f0eb240 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysBalanceLogExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysBalanceLogExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/SysBalanceLogExample$Criterion.class new file mode 100644 index 00000000..a543f401 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysBalanceLogExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysBalanceLogExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/SysBalanceLogExample$GeneratedCriteria.class new file mode 100644 index 00000000..a78711dd Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysBalanceLogExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysBalanceLogExample.class b/tall/target/classes/com/ccsens/tall/bean/po/SysBalanceLogExample.class new file mode 100644 index 00000000..4f1433f0 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysBalanceLogExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysCommitedFile.class b/tall/target/classes/com/ccsens/tall/bean/po/SysCommitedFile.class new file mode 100644 index 00000000..36ef2cf3 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysCommitedFile.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysCommitedFileExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/SysCommitedFileExample$Criteria.class new file mode 100644 index 00000000..feb60d09 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysCommitedFileExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysCommitedFileExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/SysCommitedFileExample$Criterion.class new file mode 100644 index 00000000..e6e2dedd Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysCommitedFileExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysCommitedFileExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/SysCommitedFileExample$GeneratedCriteria.class new file mode 100644 index 00000000..e690f773 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysCommitedFileExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysCommitedFileExample.class b/tall/target/classes/com/ccsens/tall/bean/po/SysCommitedFileExample.class new file mode 100644 index 00000000..918148fd Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysCommitedFileExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysGrade.class b/tall/target/classes/com/ccsens/tall/bean/po/SysGrade.class new file mode 100644 index 00000000..70386a14 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysGrade.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysGradeExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/SysGradeExample$Criteria.class new file mode 100644 index 00000000..a34e9ff3 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysGradeExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysGradeExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/SysGradeExample$Criterion.class new file mode 100644 index 00000000..96c1dd63 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysGradeExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysGradeExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/SysGradeExample$GeneratedCriteria.class new file mode 100644 index 00000000..09e6b741 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysGradeExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysGradeExample.class b/tall/target/classes/com/ccsens/tall/bean/po/SysGradeExample.class new file mode 100644 index 00000000..d50f6f0b Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysGradeExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysPlugin.class b/tall/target/classes/com/ccsens/tall/bean/po/SysPlugin.class new file mode 100644 index 00000000..84fc273b Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysPlugin.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysPluginExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/SysPluginExample$Criteria.class new file mode 100644 index 00000000..c5204140 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysPluginExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysPluginExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/SysPluginExample$Criterion.class new file mode 100644 index 00000000..76f986ff Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysPluginExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysPluginExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/SysPluginExample$GeneratedCriteria.class new file mode 100644 index 00000000..c3a5f099 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysPluginExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysPluginExample.class b/tall/target/classes/com/ccsens/tall/bean/po/SysPluginExample.class new file mode 100644 index 00000000..343e91aa Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysPluginExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysProject.class b/tall/target/classes/com/ccsens/tall/bean/po/SysProject.class new file mode 100644 index 00000000..601278f5 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysProject.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysProjectExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/SysProjectExample$Criteria.class new file mode 100644 index 00000000..71b2e7e2 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysProjectExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysProjectExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/SysProjectExample$Criterion.class new file mode 100644 index 00000000..957d708a Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysProjectExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysProjectExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/SysProjectExample$GeneratedCriteria.class new file mode 100644 index 00000000..e6dd7dfd Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysProjectExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysProjectExample.class b/tall/target/classes/com/ccsens/tall/bean/po/SysProjectExample.class new file mode 100644 index 00000000..5756dd34 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysProjectExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysScene.class b/tall/target/classes/com/ccsens/tall/bean/po/SysScene.class new file mode 100644 index 00000000..e2e09c06 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysScene.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysSceneExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/SysSceneExample$Criteria.class new file mode 100644 index 00000000..9be37d77 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysSceneExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysSceneExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/SysSceneExample$Criterion.class new file mode 100644 index 00000000..f4840c1f Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysSceneExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysSceneExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/SysSceneExample$GeneratedCriteria.class new file mode 100644 index 00000000..ad22012b Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysSceneExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysSceneExample.class b/tall/target/classes/com/ccsens/tall/bean/po/SysSceneExample.class new file mode 100644 index 00000000..f164d436 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysSceneExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysUser.class b/tall/target/classes/com/ccsens/tall/bean/po/SysUser.class new file mode 100644 index 00000000..a1955cf1 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysUser.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysUserExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/SysUserExample$Criteria.class new file mode 100644 index 00000000..60c764da Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysUserExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysUserExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/SysUserExample$Criterion.class new file mode 100644 index 00000000..1964ff52 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysUserExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysUserExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/SysUserExample$GeneratedCriteria.class new file mode 100644 index 00000000..069e53ba Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysUserExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/SysUserExample.class b/tall/target/classes/com/ccsens/tall/bean/po/SysUserExample.class new file mode 100644 index 00000000..b3aba9d3 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/SysUserExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/UserAttention.class b/tall/target/classes/com/ccsens/tall/bean/po/UserAttention.class new file mode 100644 index 00000000..c1869c5c Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/UserAttention.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/UserAttentionExample$Criteria.class b/tall/target/classes/com/ccsens/tall/bean/po/UserAttentionExample$Criteria.class new file mode 100644 index 00000000..48e4ca6c Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/UserAttentionExample$Criteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/UserAttentionExample$Criterion.class b/tall/target/classes/com/ccsens/tall/bean/po/UserAttentionExample$Criterion.class new file mode 100644 index 00000000..d1b23f53 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/UserAttentionExample$Criterion.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/UserAttentionExample$GeneratedCriteria.class b/tall/target/classes/com/ccsens/tall/bean/po/UserAttentionExample$GeneratedCriteria.class new file mode 100644 index 00000000..c2aa38af Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/UserAttentionExample$GeneratedCriteria.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/po/UserAttentionExample.class b/tall/target/classes/com/ccsens/tall/bean/po/UserAttentionExample.class new file mode 100644 index 00000000..e587ed56 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/po/UserAttentionExample.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$Checker.class b/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$Checker.class new file mode 100644 index 00000000..28bbc926 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$Checker.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$DFile.class b/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$DFile.class new file mode 100644 index 00000000..17a2f234 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$DFile.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$DProject.class b/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$DProject.class new file mode 100644 index 00000000..be0fe14c Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$DProject.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$DRole.class b/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$DRole.class new file mode 100644 index 00000000..353ece5a Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$DRole.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$DTask.class b/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$DTask.class new file mode 100644 index 00000000..27b0768d Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$DTask.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$DeliverFile.class b/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$DeliverFile.class new file mode 100644 index 00000000..d52fe7fc Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$DeliverFile.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$DeliverFileList.class b/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$DeliverFileList.class new file mode 100644 index 00000000..de6fe9b1 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$DeliverFileList.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$DeliverInfo.class b/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$DeliverInfo.class new file mode 100644 index 00000000..7f620f1b Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$DeliverInfo.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$FilePath.class b/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$FilePath.class new file mode 100644 index 00000000..98f520b2 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$FilePath.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$PageInfo.class b/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$PageInfo.class new file mode 100644 index 00000000..09df21d4 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo$PageInfo.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo.class b/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo.class new file mode 100644 index 00000000..2d1712b5 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/DeliverVo.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/MemberVo$MemberInfo.class b/tall/target/classes/com/ccsens/tall/bean/vo/MemberVo$MemberInfo.class new file mode 100644 index 00000000..eccbba81 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/MemberVo$MemberInfo.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/MemberVo.class b/tall/target/classes/com/ccsens/tall/bean/vo/MemberVo.class new file mode 100644 index 00000000..15d1051e Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/MemberVo.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/PluginVo$PluginInfo.class b/tall/target/classes/com/ccsens/tall/bean/vo/PluginVo$PluginInfo.class new file mode 100644 index 00000000..eb9ef3d2 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/PluginVo$PluginInfo.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/PluginVo.class b/tall/target/classes/com/ccsens/tall/bean/vo/PluginVo.class new file mode 100644 index 00000000..8a97065b Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/PluginVo.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$DeliverInfo.class b/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$DeliverInfo.class new file mode 100644 index 00000000..44027a49 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$DeliverInfo.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$MembersByProject$BelongRole.class b/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$MembersByProject$BelongRole.class new file mode 100644 index 00000000..b2f142f6 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$MembersByProject$BelongRole.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$MembersByProject.class b/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$MembersByProject.class new file mode 100644 index 00000000..fa088fdb Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$MembersByProject.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$PageInfo.class b/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$PageInfo.class new file mode 100644 index 00000000..59d8efa9 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$PageInfo.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$ProMemberVo.class b/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$ProMemberVo.class new file mode 100644 index 00000000..43ef1996 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$ProMemberVo.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$ProjectAllDetailed.class b/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$ProjectAllDetailed.class new file mode 100644 index 00000000..3515c102 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$ProjectAllDetailed.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$ProjectByKey.class b/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$ProjectByKey.class new file mode 100644 index 00000000..4a67b0fc Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$ProjectByKey.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$ProjectInfo.class b/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$ProjectInfo.class new file mode 100644 index 00000000..a9671cdd Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$ProjectInfo.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$RoleInfo.class b/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$RoleInfo.class new file mode 100644 index 00000000..b8457458 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$RoleInfo.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$TemplateStatus.class b/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$TemplateStatus.class new file mode 100644 index 00000000..b2bb1baf Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo$TemplateStatus.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo.class b/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo.class new file mode 100644 index 00000000..899feccf Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/ProjectVo.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$FirstTask.class b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$FirstTask.class new file mode 100644 index 00000000..77e59c4c Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$FirstTask.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$GlobalTask.class b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$GlobalTask.class new file mode 100644 index 00000000..f287fcfc Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$GlobalTask.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$NormalTask.class b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$NormalTask.class new file mode 100644 index 00000000..47bc71de Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$NormalTask.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$PageInfo.class b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$PageInfo.class new file mode 100644 index 00000000..9c1638bd Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$PageInfo.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$PluginVo.class b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$PluginVo.class new file mode 100644 index 00000000..b2cbd0d9 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$PluginVo.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$ProTaskInfo.class b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$ProTaskInfo.class new file mode 100644 index 00000000..23d66803 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$ProTaskInfo.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$ProTaskInfoByMVP.class b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$ProTaskInfoByMVP.class new file mode 100644 index 00000000..22d74bf7 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$ProTaskInfoByMVP.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$ProjectCheckList.class b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$ProjectCheckList.class new file mode 100644 index 00000000..e7399e32 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$ProjectCheckList.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$RoleCheckList.class b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$RoleCheckList.class new file mode 100644 index 00000000..c2fe9a7a Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$RoleCheckList.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$TaskCheckList.class b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$TaskCheckList.class new file mode 100644 index 00000000..b58305dd Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$TaskCheckList.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$TaskDeliverByMVP$DeliverInfoByMVP.class b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$TaskDeliverByMVP$DeliverInfoByMVP.class new file mode 100644 index 00000000..65a5f1aa Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$TaskDeliverByMVP$DeliverInfoByMVP.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$TaskDeliverByMVP.class b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$TaskDeliverByMVP.class new file mode 100644 index 00000000..00f3763a Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$TaskDeliverByMVP.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$TaskDetailByKey.class b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$TaskDetailByKey.class new file mode 100644 index 00000000..7618f350 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo$TaskDetailByKey.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo.class b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo.class new file mode 100644 index 00000000..50826728 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/TaskVo.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/UserVo$Account.class b/tall/target/classes/com/ccsens/tall/bean/vo/UserVo$Account.class new file mode 100644 index 00000000..617625a2 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/UserVo$Account.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/UserVo$SmsCode.class b/tall/target/classes/com/ccsens/tall/bean/vo/UserVo$SmsCode.class new file mode 100644 index 00000000..137f1b40 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/UserVo$SmsCode.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/UserVo$TokenBean.class b/tall/target/classes/com/ccsens/tall/bean/vo/UserVo$TokenBean.class new file mode 100644 index 00000000..c6572932 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/UserVo$TokenBean.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/UserVo$UserSign.class b/tall/target/classes/com/ccsens/tall/bean/vo/UserVo$UserSign.class new file mode 100644 index 00000000..4e263ea9 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/UserVo$UserSign.class differ diff --git a/tall/target/classes/com/ccsens/tall/bean/vo/UserVo.class b/tall/target/classes/com/ccsens/tall/bean/vo/UserVo.class new file mode 100644 index 00000000..49c422af Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/bean/vo/UserVo.class differ diff --git a/tall/target/classes/com/ccsens/tall/config/BeanConfig.class b/tall/target/classes/com/ccsens/tall/config/BeanConfig.class new file mode 100644 index 00000000..9b179b1a Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/config/BeanConfig.class differ diff --git a/tall/target/classes/com/ccsens/tall/config/BusinessProps.class b/tall/target/classes/com/ccsens/tall/config/BusinessProps.class new file mode 100644 index 00000000..d5fa8942 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/config/BusinessProps.class differ diff --git a/tall/target/classes/com/ccsens/tall/exception/GetCurrentPartiException.class b/tall/target/classes/com/ccsens/tall/exception/GetCurrentPartiException.class new file mode 100644 index 00000000..f44151ba Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/exception/GetCurrentPartiException.class differ diff --git a/tall/target/classes/com/ccsens/tall/exception/GetCurrentUserException.class b/tall/target/classes/com/ccsens/tall/exception/GetCurrentUserException.class new file mode 100644 index 00000000..5b15092d Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/exception/GetCurrentUserException.class differ diff --git a/tall/target/classes/com/ccsens/tall/exception/GetTaskException.class b/tall/target/classes/com/ccsens/tall/exception/GetTaskException.class new file mode 100644 index 00000000..cd578f04 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/exception/GetTaskException.class differ diff --git a/tall/target/classes/com/ccsens/tall/exception/PartiLoginException.class b/tall/target/classes/com/ccsens/tall/exception/PartiLoginException.class new file mode 100644 index 00000000..a64b2d94 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/exception/PartiLoginException.class differ diff --git a/tall/target/classes/com/ccsens/tall/exception/SmsException.class b/tall/target/classes/com/ccsens/tall/exception/SmsException.class new file mode 100644 index 00000000..c357e583 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/exception/SmsException.class differ diff --git a/tall/target/classes/com/ccsens/tall/exception/TaskValidateException.class b/tall/target/classes/com/ccsens/tall/exception/TaskValidateException.class new file mode 100644 index 00000000..d8f85467 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/exception/TaskValidateException.class differ diff --git a/tall/target/classes/com/ccsens/tall/exception/UnAuthenticationException.class b/tall/target/classes/com/ccsens/tall/exception/UnAuthenticationException.class new file mode 100644 index 00000000..c6419701 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/exception/UnAuthenticationException.class differ diff --git a/tall/target/classes/com/ccsens/tall/exception/UnAuthorizationException.class b/tall/target/classes/com/ccsens/tall/exception/UnAuthorizationException.class new file mode 100644 index 00000000..d798bb6e Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/exception/UnAuthorizationException.class differ diff --git a/tall/target/classes/com/ccsens/tall/exception/UserLoginException.class b/tall/target/classes/com/ccsens/tall/exception/UserLoginException.class new file mode 100644 index 00000000..d68ca0e9 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/exception/UserLoginException.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/dao/PostLogCheckerDao.class b/tall/target/classes/com/ccsens/tall/persist/dao/PostLogCheckerDao.class new file mode 100644 index 00000000..dc72c69c Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/dao/PostLogCheckerDao.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/dao/ProLogDao.class b/tall/target/classes/com/ccsens/tall/persist/dao/ProLogDao.class new file mode 100644 index 00000000..dfa74c61 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/dao/ProLogDao.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/dao/ProMemberDao.class b/tall/target/classes/com/ccsens/tall/persist/dao/ProMemberDao.class new file mode 100644 index 00000000..f7c81093 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/dao/ProMemberDao.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/dao/ProMemberRoleDao.class b/tall/target/classes/com/ccsens/tall/persist/dao/ProMemberRoleDao.class new file mode 100644 index 00000000..fb8bc722 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/dao/ProMemberRoleDao.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/dao/ProRoleDao.class b/tall/target/classes/com/ccsens/tall/persist/dao/ProRoleDao.class new file mode 100644 index 00000000..26927966 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/dao/ProRoleDao.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/dao/ProRoleExecludeDao.class b/tall/target/classes/com/ccsens/tall/persist/dao/ProRoleExecludeDao.class new file mode 100644 index 00000000..7948d743 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/dao/ProRoleExecludeDao.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/dao/ProSubTimeMemberDao.class b/tall/target/classes/com/ccsens/tall/persist/dao/ProSubTimeMemberDao.class new file mode 100644 index 00000000..599242f4 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/dao/ProSubTimeMemberDao.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/dao/ProTaskDeliverPostLogDao.class b/tall/target/classes/com/ccsens/tall/persist/dao/ProTaskDeliverPostLogDao.class new file mode 100644 index 00000000..fb979103 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/dao/ProTaskDeliverPostLogDao.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/dao/SysAuthDao.class b/tall/target/classes/com/ccsens/tall/persist/dao/SysAuthDao.class new file mode 100644 index 00000000..4c485561 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/dao/SysAuthDao.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/dao/SysCommitedFileDao.class b/tall/target/classes/com/ccsens/tall/persist/dao/SysCommitedFileDao.class new file mode 100644 index 00000000..69949e8c Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/dao/SysCommitedFileDao.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/dao/SysPluginDao.class b/tall/target/classes/com/ccsens/tall/persist/dao/SysPluginDao.class new file mode 100644 index 00000000..47e6259a Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/dao/SysPluginDao.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/dao/SysProjectDao.class b/tall/target/classes/com/ccsens/tall/persist/dao/SysProjectDao.class new file mode 100644 index 00000000..d534c505 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/dao/SysProjectDao.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/dao/SysUserDao.class b/tall/target/classes/com/ccsens/tall/persist/dao/SysUserDao.class new file mode 100644 index 00000000..908377a2 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/dao/SysUserDao.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/dao/TaskDeliverDao.class b/tall/target/classes/com/ccsens/tall/persist/dao/TaskDeliverDao.class new file mode 100644 index 00000000..c92e41d0 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/dao/TaskDeliverDao.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/dao/TaskDetailDao.class b/tall/target/classes/com/ccsens/tall/persist/dao/TaskDetailDao.class new file mode 100644 index 00000000..f59f94c1 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/dao/TaskDetailDao.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/dao/TaskMemberDao.class b/tall/target/classes/com/ccsens/tall/persist/dao/TaskMemberDao.class new file mode 100644 index 00000000..19a04400 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/dao/TaskMemberDao.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/dao/TaskPluginDao.class b/tall/target/classes/com/ccsens/tall/persist/dao/TaskPluginDao.class new file mode 100644 index 00000000..60cb7849 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/dao/TaskPluginDao.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/dao/TaskSubTimeDao.class b/tall/target/classes/com/ccsens/tall/persist/dao/TaskSubTimeDao.class new file mode 100644 index 00000000..ef9fbf0c Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/dao/TaskSubTimeDao.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/dao/UserAttentionDao.class b/tall/target/classes/com/ccsens/tall/persist/dao/UserAttentionDao.class new file mode 100644 index 00000000..2caf6fcb Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/dao/UserAttentionDao.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/ProLogMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/ProLogMapper.class new file mode 100644 index 00000000..d5c80328 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/ProLogMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/ProMemberMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/ProMemberMapper.class new file mode 100644 index 00000000..da90a368 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/ProMemberMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/ProMemberRoleMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/ProMemberRoleMapper.class new file mode 100644 index 00000000..e508beeb Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/ProMemberRoleMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/ProRoleExecludeMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/ProRoleExecludeMapper.class new file mode 100644 index 00000000..1253b42e Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/ProRoleExecludeMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/ProRoleMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/ProRoleMapper.class new file mode 100644 index 00000000..60e5cec2 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/ProRoleMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/ProRolePowerMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/ProRolePowerMapper.class new file mode 100644 index 00000000..2a5e752e Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/ProRolePowerMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/ProSubTimeMemberMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/ProSubTimeMemberMapper.class new file mode 100644 index 00000000..c6c9dca5 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/ProSubTimeMemberMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/ProTaskDeliverMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/ProTaskDeliverMapper.class new file mode 100644 index 00000000..f97288a9 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/ProTaskDeliverMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/ProTaskDeliverPostLogCheckerMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/ProTaskDeliverPostLogCheckerMapper.class new file mode 100644 index 00000000..5214cd13 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/ProTaskDeliverPostLogCheckerMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/ProTaskDeliverPostLogMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/ProTaskDeliverPostLogMapper.class new file mode 100644 index 00000000..9a80ee7d Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/ProTaskDeliverPostLogMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/ProTaskDetailMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/ProTaskDetailMapper.class new file mode 100644 index 00000000..e7506103 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/ProTaskDetailMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/ProTaskHardwareMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/ProTaskHardwareMapper.class new file mode 100644 index 00000000..54c4afaf Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/ProTaskHardwareMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/ProTaskMemberMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/ProTaskMemberMapper.class new file mode 100644 index 00000000..3ca37915 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/ProTaskMemberMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/ProTaskPluginMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/ProTaskPluginMapper.class new file mode 100644 index 00000000..27cffe9b Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/ProTaskPluginMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/ProTaskSubTimeMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/ProTaskSubTimeMapper.class new file mode 100644 index 00000000..6cb1e855 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/ProTaskSubTimeMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/ProTodoMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/ProTodoMapper.class new file mode 100644 index 00000000..9689a5e3 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/ProTodoMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/SysAuthMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/SysAuthMapper.class new file mode 100644 index 00000000..73d790d1 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/SysAuthMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/SysBalanceLogMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/SysBalanceLogMapper.class new file mode 100644 index 00000000..185285ef Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/SysBalanceLogMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/SysCommitedFileMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/SysCommitedFileMapper.class new file mode 100644 index 00000000..24bd88bc Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/SysCommitedFileMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/SysGradeMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/SysGradeMapper.class new file mode 100644 index 00000000..cb0fbaff Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/SysGradeMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/SysPluginMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/SysPluginMapper.class new file mode 100644 index 00000000..b2d14470 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/SysPluginMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/SysProjectMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/SysProjectMapper.class new file mode 100644 index 00000000..f9acf84d Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/SysProjectMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/SysSceneMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/SysSceneMapper.class new file mode 100644 index 00000000..c9365594 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/SysSceneMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/SysUserMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/SysUserMapper.class new file mode 100644 index 00000000..5a800577 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/SysUserMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/persist/mapper/UserAttentionMapper.class b/tall/target/classes/com/ccsens/tall/persist/mapper/UserAttentionMapper.class new file mode 100644 index 00000000..31adcaa0 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/persist/mapper/UserAttentionMapper.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/ExcelService.class b/tall/target/classes/com/ccsens/tall/service/ExcelService.class new file mode 100644 index 00000000..2297a9a9 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/ExcelService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/ExcludeRoleService.class b/tall/target/classes/com/ccsens/tall/service/ExcludeRoleService.class new file mode 100644 index 00000000..0548b46c Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/ExcludeRoleService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/IExcelService.class b/tall/target/classes/com/ccsens/tall/service/IExcelService.class new file mode 100644 index 00000000..94dc0896 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/IExcelService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/IExcludeRoleService.class b/tall/target/classes/com/ccsens/tall/service/IExcludeRoleService.class new file mode 100644 index 00000000..469082c0 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/IExcludeRoleService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/IMessageService.class b/tall/target/classes/com/ccsens/tall/service/IMessageService.class new file mode 100644 index 00000000..98674059 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/IMessageService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/IProLogService.class b/tall/target/classes/com/ccsens/tall/service/IProLogService.class new file mode 100644 index 00000000..86a19ff0 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/IProLogService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/IProMemberRoleService.class b/tall/target/classes/com/ccsens/tall/service/IProMemberRoleService.class new file mode 100644 index 00000000..10ff0dc9 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/IProMemberRoleService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/IProMemberService.class b/tall/target/classes/com/ccsens/tall/service/IProMemberService.class new file mode 100644 index 00000000..60acf590 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/IProMemberService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/IProRoleService.class b/tall/target/classes/com/ccsens/tall/service/IProRoleService.class new file mode 100644 index 00000000..a8ae3c28 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/IProRoleService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/IProTaskDetailService.class b/tall/target/classes/com/ccsens/tall/service/IProTaskDetailService.class new file mode 100644 index 00000000..de12dae0 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/IProTaskDetailService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/IProjectService.class b/tall/target/classes/com/ccsens/tall/service/IProjectService.class new file mode 100644 index 00000000..164564eb Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/IProjectService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/ISysPluginService.class b/tall/target/classes/com/ccsens/tall/service/ISysPluginService.class new file mode 100644 index 00000000..eb3f0b91 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/ISysPluginService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/ITaskDeliverService.class b/tall/target/classes/com/ccsens/tall/service/ITaskDeliverService.class new file mode 100644 index 00000000..660fd46a Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/ITaskDeliverService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/ITaskMemberService.class b/tall/target/classes/com/ccsens/tall/service/ITaskMemberService.class new file mode 100644 index 00000000..c4c9856a Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/ITaskMemberService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/ITaskPluginService.class b/tall/target/classes/com/ccsens/tall/service/ITaskPluginService.class new file mode 100644 index 00000000..705ecb9b Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/ITaskPluginService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/ITaskSubTimeService.class b/tall/target/classes/com/ccsens/tall/service/ITaskSubTimeService.class new file mode 100644 index 00000000..2f09bccc Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/ITaskSubTimeService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/IUserAttentionService.class b/tall/target/classes/com/ccsens/tall/service/IUserAttentionService.class new file mode 100644 index 00000000..f89e295e Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/IUserAttentionService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/IUserService.class b/tall/target/classes/com/ccsens/tall/service/IUserService.class new file mode 100644 index 00000000..fa817b66 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/IUserService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/MessageService.class b/tall/target/classes/com/ccsens/tall/service/MessageService.class new file mode 100644 index 00000000..a1eec176 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/MessageService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/ProMemberRoleService.class b/tall/target/classes/com/ccsens/tall/service/ProMemberRoleService.class new file mode 100644 index 00000000..0906fc51 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/ProMemberRoleService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/ProMemberService.class b/tall/target/classes/com/ccsens/tall/service/ProMemberService.class new file mode 100644 index 00000000..7dbeeeeb Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/ProMemberService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/ProRoleService.class b/tall/target/classes/com/ccsens/tall/service/ProRoleService.class new file mode 100644 index 00000000..d8ebbdad Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/ProRoleService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/ProTaskDetailService.class b/tall/target/classes/com/ccsens/tall/service/ProTaskDetailService.class new file mode 100644 index 00000000..e2f6be5f Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/ProTaskDetailService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/ProjectService.class b/tall/target/classes/com/ccsens/tall/service/ProjectService.class new file mode 100644 index 00000000..71d8560c Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/ProjectService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/SysPluginService.class b/tall/target/classes/com/ccsens/tall/service/SysPluginService.class new file mode 100644 index 00000000..f2153eac Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/SysPluginService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/TaskDeliverService.class b/tall/target/classes/com/ccsens/tall/service/TaskDeliverService.class new file mode 100644 index 00000000..183f7ae3 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/TaskDeliverService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/TaskMemberService.class b/tall/target/classes/com/ccsens/tall/service/TaskMemberService.class new file mode 100644 index 00000000..3f7995b3 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/TaskMemberService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/TaskPluginService.class b/tall/target/classes/com/ccsens/tall/service/TaskPluginService.class new file mode 100644 index 00000000..0e953b72 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/TaskPluginService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/TaskSubTimeService.class b/tall/target/classes/com/ccsens/tall/service/TaskSubTimeService.class new file mode 100644 index 00000000..ca1787d8 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/TaskSubTimeService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/UserAttentionService.class b/tall/target/classes/com/ccsens/tall/service/UserAttentionService.class new file mode 100644 index 00000000..0e3ef771 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/UserAttentionService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/UserService$1.class b/tall/target/classes/com/ccsens/tall/service/UserService$1.class new file mode 100644 index 00000000..59c1f9f2 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/UserService$1.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/UserService.class b/tall/target/classes/com/ccsens/tall/service/UserService.class new file mode 100644 index 00000000..4ffa2a4c Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/UserService.class differ diff --git a/tall/target/classes/com/ccsens/tall/service/proLogService.class b/tall/target/classes/com/ccsens/tall/service/proLogService.class new file mode 100644 index 00000000..f8d01375 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/service/proLogService.class differ diff --git a/tall/target/classes/com/ccsens/tall/util/TaskUtil$Task.class b/tall/target/classes/com/ccsens/tall/util/TaskUtil$Task.class new file mode 100644 index 00000000..9f82ab8e Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/util/TaskUtil$Task.class differ diff --git a/tall/target/classes/com/ccsens/tall/util/TaskUtil.class b/tall/target/classes/com/ccsens/tall/util/TaskUtil.class new file mode 100644 index 00000000..7b49495f Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/util/TaskUtil.class differ diff --git a/tall/target/classes/com/ccsens/tall/web/DeliverController.class b/tall/target/classes/com/ccsens/tall/web/DeliverController.class new file mode 100644 index 00000000..833707b2 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/web/DeliverController.class differ diff --git a/tall/target/classes/com/ccsens/tall/web/ExcelController.class b/tall/target/classes/com/ccsens/tall/web/ExcelController.class new file mode 100644 index 00000000..aff82000 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/web/ExcelController.class differ diff --git a/tall/target/classes/com/ccsens/tall/web/IndexController.class b/tall/target/classes/com/ccsens/tall/web/IndexController.class new file mode 100644 index 00000000..3e957c6f Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/web/IndexController.class differ diff --git a/tall/target/classes/com/ccsens/tall/web/PluginController.class b/tall/target/classes/com/ccsens/tall/web/PluginController.class new file mode 100644 index 00000000..bd7320af Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/web/PluginController.class differ diff --git a/tall/target/classes/com/ccsens/tall/web/ProjectController.class b/tall/target/classes/com/ccsens/tall/web/ProjectController.class new file mode 100644 index 00000000..00fb208b Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/web/ProjectController.class differ diff --git a/tall/target/classes/com/ccsens/tall/web/TaskController.class b/tall/target/classes/com/ccsens/tall/web/TaskController.class new file mode 100644 index 00000000..79b2d4cd Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/web/TaskController.class differ diff --git a/tall/target/classes/com/ccsens/tall/web/UserController$1.class b/tall/target/classes/com/ccsens/tall/web/UserController$1.class new file mode 100644 index 00000000..5984de44 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/web/UserController$1.class differ diff --git a/tall/target/classes/com/ccsens/tall/web/UserController.class b/tall/target/classes/com/ccsens/tall/web/UserController.class new file mode 100644 index 00000000..0c985788 Binary files /dev/null and b/tall/target/classes/com/ccsens/tall/web/UserController.class differ diff --git a/tall/target/classes/druid-dev.yml b/tall/target/classes/druid-dev.yml new file mode 100644 index 00000000..f0057db9 --- /dev/null +++ b/tall/target/classes/druid-dev.yml @@ -0,0 +1,32 @@ +spring: + datasource: + druid: + connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 + driverClassName: com.mysql.jdbc.Driver + dynamicUrl: jdbc:mysql://localhost:3306/${schema} + filterExclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*' + filterName: druidFilter + filterProfileEnable: true + filterUrlPattern: /* + filters: stat,wall + initialSize: 5 + maxActive: 20 + maxPoolPreparedStatementPerConnectionSize: 20 + maxWait: 60000 + minEvictableIdleTimeMillis: 300000 + minIdle: 5 + password: po3OynBO[M3579p6L7)o + poolPreparedStatements: true + servletLogSlowSql: true + servletLoginPassword: 111111 + servletLoginUsername: druid + servletName: druidServlet + servletResetEnable: true + servletUrlMapping: /druid/* + testOnBorrow: false + testOnReturn: false + testWhileIdle: true + timeBetweenEvictionRunsMillis: 60000 + url: jdbc:mysql://49.233.89.188:3306/tall?useUnicode=true&characterEncoding=UTF-8 + username: root + validationQuery: SELECT 1 FROM DUAL diff --git a/tall/target/classes/druid-prod.yml b/tall/target/classes/druid-prod.yml new file mode 100644 index 00000000..ae2d2720 --- /dev/null +++ b/tall/target/classes/druid-prod.yml @@ -0,0 +1,32 @@ +spring: + datasource: + druid: + connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 + driverClassName: com.mysql.jdbc.Driver + dynamicUrl: jdbc:mysql://localhost:3306/${schema} + filterExclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*' + filterName: druidFilter + filterProfileEnable: true + filterUrlPattern: /* + filters: stat,wall + initialSize: 5 + maxActive: 20 + maxPoolPreparedStatementPerConnectionSize: 20 + maxWait: 60000 + minEvictableIdleTimeMillis: 300000 + minIdle: 5 + password: po3OynBO[M3579p6L7)o + poolPreparedStatements: true + servletLogSlowSql: true + servletLoginPassword: 111111 + servletLoginUsername: druid + servletName: druidServlet + servletResetEnable: true + servletUrlMapping: /druid/* + testOnBorrow: false + testOnReturn: false + testWhileIdle: true + timeBetweenEvictionRunsMillis: 60000 + url: jdbc:mysql://api.ccsens.com/pt_pro?useUnicode=true&characterEncoding=UTF-8 + username: root + validationQuery: SELECT 1 FROM DUAL diff --git a/tall/target/classes/druid-test.yml b/tall/target/classes/druid-test.yml new file mode 100644 index 00000000..f0057db9 --- /dev/null +++ b/tall/target/classes/druid-test.yml @@ -0,0 +1,32 @@ +spring: + datasource: + druid: + connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 + driverClassName: com.mysql.jdbc.Driver + dynamicUrl: jdbc:mysql://localhost:3306/${schema} + filterExclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*' + filterName: druidFilter + filterProfileEnable: true + filterUrlPattern: /* + filters: stat,wall + initialSize: 5 + maxActive: 20 + maxPoolPreparedStatementPerConnectionSize: 20 + maxWait: 60000 + minEvictableIdleTimeMillis: 300000 + minIdle: 5 + password: po3OynBO[M3579p6L7)o + poolPreparedStatements: true + servletLogSlowSql: true + servletLoginPassword: 111111 + servletLoginUsername: druid + servletName: druidServlet + servletResetEnable: true + servletUrlMapping: /druid/* + testOnBorrow: false + testOnReturn: false + testWhileIdle: true + timeBetweenEvictionRunsMillis: 60000 + url: jdbc:mysql://49.233.89.188:3306/tall?useUnicode=true&characterEncoding=UTF-8 + username: root + validationQuery: SELECT 1 FROM DUAL diff --git a/tall/target/classes/logback-spring.xml b/tall/target/classes/logback-spring.xml new file mode 100644 index 00000000..24a4ffa0 --- /dev/null +++ b/tall/target/classes/logback-spring.xml @@ -0,0 +1,196 @@ + + + + + + + + + + logback + + + + + + + + + + + + + + + + + info + + + ${CONSOLE_LOG_PATTERN} + + UTF-8 + + + + + + + + + + ${log.path}/log_debug.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/debug/log-debug-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + debug + ACCEPT + DENY + + + + + + + ${log.path}/log_info.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/info/log-info-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + info + ACCEPT + DENY + + + + + + + ${log.path}/log_warn.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/warn/log-warn-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + warn + ACCEPT + DENY + + + + + + + + ${log.path}/log_error.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/error/log-error-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + ERROR + ACCEPT + DENY + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tall/target/classes/mapper_dao/DeliverDao.xml b/tall/target/classes/mapper_dao/DeliverDao.xml new file mode 100644 index 00000000..33312cef --- /dev/null +++ b/tall/target/classes/mapper_dao/DeliverDao.xml @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tall/target/classes/mapper_dao/ProMemberDao.xml b/tall/target/classes/mapper_dao/ProMemberDao.xml new file mode 100644 index 00000000..d37cfd66 --- /dev/null +++ b/tall/target/classes/mapper_dao/ProMemberDao.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tall/target/classes/mapper_dao/ProRoleDao.xml b/tall/target/classes/mapper_dao/ProRoleDao.xml new file mode 100644 index 00000000..84f49d7f --- /dev/null +++ b/tall/target/classes/mapper_dao/ProRoleDao.xml @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tall/target/classes/mapper_dao/SysPluginDao.xml b/tall/target/classes/mapper_dao/SysPluginDao.xml new file mode 100644 index 00000000..9cda208a --- /dev/null +++ b/tall/target/classes/mapper_dao/SysPluginDao.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tall/target/classes/mapper_dao/SysProjectDao.xml b/tall/target/classes/mapper_dao/SysProjectDao.xml new file mode 100644 index 00000000..f428c205 --- /dev/null +++ b/tall/target/classes/mapper_dao/SysProjectDao.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tall/target/classes/mapper_dao/TaskDetailDao.xml b/tall/target/classes/mapper_dao/TaskDetailDao.xml new file mode 100644 index 00000000..102df3e1 --- /dev/null +++ b/tall/target/classes/mapper_dao/TaskDetailDao.xml @@ -0,0 +1,253 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/ProLogMapper.xml b/tall/target/classes/mapper_raw/ProLogMapper.xml new file mode 100644 index 00000000..8c34a360 --- /dev/null +++ b/tall/target/classes/mapper_raw/ProLogMapper.xml @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, task_detail_id, time, type, description, user_id, created_at, updated_at, rec_status + + + + + delete from t_pro_log + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_log + + + + + + insert into t_pro_log (id, task_detail_id, time, + type, description, user_id, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{taskDetailId,jdbcType=BIGINT}, #{time,jdbcType=BIGINT}, + #{type,jdbcType=TINYINT}, #{description,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_pro_log + + + id, + + + task_detail_id, + + + time, + + + type, + + + description, + + + user_id, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{taskDetailId,jdbcType=BIGINT}, + + + #{time,jdbcType=BIGINT}, + + + #{type,jdbcType=TINYINT}, + + + #{description,jdbcType=VARCHAR}, + + + #{userId,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_log + + + id = #{record.id,jdbcType=BIGINT}, + + + task_detail_id = #{record.taskDetailId,jdbcType=BIGINT}, + + + time = #{record.time,jdbcType=BIGINT}, + + + type = #{record.type,jdbcType=TINYINT}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_log + set id = #{record.id,jdbcType=BIGINT}, + task_detail_id = #{record.taskDetailId,jdbcType=BIGINT}, + time = #{record.time,jdbcType=BIGINT}, + type = #{record.type,jdbcType=TINYINT}, + description = #{record.description,jdbcType=VARCHAR}, + user_id = #{record.userId,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_log + + + task_detail_id = #{taskDetailId,jdbcType=BIGINT}, + + + time = #{time,jdbcType=BIGINT}, + + + type = #{type,jdbcType=TINYINT}, + + + description = #{description,jdbcType=VARCHAR}, + + + user_id = #{userId,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_log + set task_detail_id = #{taskDetailId,jdbcType=BIGINT}, + time = #{time,jdbcType=BIGINT}, + type = #{type,jdbcType=TINYINT}, + description = #{description,jdbcType=VARCHAR}, + user_id = #{userId,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/ProMemberMapper.xml b/tall/target/classes/mapper_raw/ProMemberMapper.xml new file mode 100644 index 00000000..5f263902 --- /dev/null +++ b/tall/target/classes/mapper_raw/ProMemberMapper.xml @@ -0,0 +1,338 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, project_id, user_id, nickname, avatar_url, no, phone, description, join_time, + stakeholder_id, created_at, updated_at, rec_status + + + + + delete from t_pro_member + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_member + + + + + + insert into t_pro_member (id, project_id, user_id, + nickname, avatar_url, no, + phone, description, join_time, + stakeholder_id, created_at, updated_at, + rec_status) + values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, + #{nickname,jdbcType=VARCHAR}, #{avatarUrl,jdbcType=VARCHAR}, #{no,jdbcType=INTEGER}, + #{phone,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{joinTime,jdbcType=BIGINT}, + #{stakeholderId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, + #{recStatus,jdbcType=TINYINT}) + + + insert into t_pro_member + + + id, + + + project_id, + + + user_id, + + + nickname, + + + avatar_url, + + + no, + + + phone, + + + description, + + + join_time, + + + stakeholder_id, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{projectId,jdbcType=BIGINT}, + + + #{userId,jdbcType=BIGINT}, + + + #{nickname,jdbcType=VARCHAR}, + + + #{avatarUrl,jdbcType=VARCHAR}, + + + #{no,jdbcType=INTEGER}, + + + #{phone,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{joinTime,jdbcType=BIGINT}, + + + #{stakeholderId,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_member + + + id = #{record.id,jdbcType=BIGINT}, + + + project_id = #{record.projectId,jdbcType=BIGINT}, + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + nickname = #{record.nickname,jdbcType=VARCHAR}, + + + avatar_url = #{record.avatarUrl,jdbcType=VARCHAR}, + + + no = #{record.no,jdbcType=INTEGER}, + + + phone = #{record.phone,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + join_time = #{record.joinTime,jdbcType=BIGINT}, + + + stakeholder_id = #{record.stakeholderId,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_member + set id = #{record.id,jdbcType=BIGINT}, + project_id = #{record.projectId,jdbcType=BIGINT}, + user_id = #{record.userId,jdbcType=BIGINT}, + nickname = #{record.nickname,jdbcType=VARCHAR}, + avatar_url = #{record.avatarUrl,jdbcType=VARCHAR}, + no = #{record.no,jdbcType=INTEGER}, + phone = #{record.phone,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + join_time = #{record.joinTime,jdbcType=BIGINT}, + stakeholder_id = #{record.stakeholderId,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_member + + + project_id = #{projectId,jdbcType=BIGINT}, + + + user_id = #{userId,jdbcType=BIGINT}, + + + nickname = #{nickname,jdbcType=VARCHAR}, + + + avatar_url = #{avatarUrl,jdbcType=VARCHAR}, + + + no = #{no,jdbcType=INTEGER}, + + + phone = #{phone,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + join_time = #{joinTime,jdbcType=BIGINT}, + + + stakeholder_id = #{stakeholderId,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_member + set project_id = #{projectId,jdbcType=BIGINT}, + user_id = #{userId,jdbcType=BIGINT}, + nickname = #{nickname,jdbcType=VARCHAR}, + avatar_url = #{avatarUrl,jdbcType=VARCHAR}, + no = #{no,jdbcType=INTEGER}, + phone = #{phone,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + join_time = #{joinTime,jdbcType=BIGINT}, + stakeholder_id = #{stakeholderId,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/ProMemberRoleMapper.xml b/tall/target/classes/mapper_raw/ProMemberRoleMapper.xml new file mode 100644 index 00000000..a0c0e768 --- /dev/null +++ b/tall/target/classes/mapper_raw/ProMemberRoleMapper.xml @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, member_id, role_id, created_at, updated_at, rec_status + + + + + delete from t_pro_member_role + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_member_role + + + + + + insert into t_pro_member_role (id, member_id, role_id, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{memberId,jdbcType=BIGINT}, #{roleId,jdbcType=BIGINT}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_pro_member_role + + + id, + + + member_id, + + + role_id, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{memberId,jdbcType=BIGINT}, + + + #{roleId,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_member_role + + + id = #{record.id,jdbcType=BIGINT}, + + + member_id = #{record.memberId,jdbcType=BIGINT}, + + + role_id = #{record.roleId,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_member_role + set id = #{record.id,jdbcType=BIGINT}, + member_id = #{record.memberId,jdbcType=BIGINT}, + role_id = #{record.roleId,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_member_role + + + member_id = #{memberId,jdbcType=BIGINT}, + + + role_id = #{roleId,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_member_role + set member_id = #{memberId,jdbcType=BIGINT}, + role_id = #{roleId,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/ProRoleExecludeMapper.xml b/tall/target/classes/mapper_raw/ProRoleExecludeMapper.xml new file mode 100644 index 00000000..30f73cfe --- /dev/null +++ b/tall/target/classes/mapper_raw/ProRoleExecludeMapper.xml @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, role_id, other_role_id, created_at, updated_at, rec_status + + + + + delete from t_pro_role_execlude + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_role_execlude + + + + + + insert into t_pro_role_execlude (id, role_id, other_role_id, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{roleId,jdbcType=BIGINT}, #{otherRoleId,jdbcType=BIGINT}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_pro_role_execlude + + + id, + + + role_id, + + + other_role_id, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{roleId,jdbcType=BIGINT}, + + + #{otherRoleId,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_role_execlude + + + id = #{record.id,jdbcType=BIGINT}, + + + role_id = #{record.roleId,jdbcType=BIGINT}, + + + other_role_id = #{record.otherRoleId,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_role_execlude + set id = #{record.id,jdbcType=BIGINT}, + role_id = #{record.roleId,jdbcType=BIGINT}, + other_role_id = #{record.otherRoleId,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_role_execlude + + + role_id = #{roleId,jdbcType=BIGINT}, + + + other_role_id = #{otherRoleId,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_role_execlude + set role_id = #{roleId,jdbcType=BIGINT}, + other_role_id = #{otherRoleId,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/ProRoleMapper.xml b/tall/target/classes/mapper_raw/ProRoleMapper.xml new file mode 100644 index 00000000..c1903e02 --- /dev/null +++ b/tall/target/classes/mapper_raw/ProRoleMapper.xml @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, project_id, parent_id, name, description, sequence, created_at, updated_at, rec_status + + + + + delete from t_pro_role + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_role + + + + + + insert into t_pro_role (id, project_id, parent_id, + name, description, sequence, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{parentId,jdbcType=BIGINT}, + #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{sequence,jdbcType=INTEGER}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_pro_role + + + id, + + + project_id, + + + parent_id, + + + name, + + + description, + + + sequence, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{projectId,jdbcType=BIGINT}, + + + #{parentId,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{sequence,jdbcType=INTEGER}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_role + + + id = #{record.id,jdbcType=BIGINT}, + + + project_id = #{record.projectId,jdbcType=BIGINT}, + + + parent_id = #{record.parentId,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + sequence = #{record.sequence,jdbcType=INTEGER}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_role + set id = #{record.id,jdbcType=BIGINT}, + project_id = #{record.projectId,jdbcType=BIGINT}, + parent_id = #{record.parentId,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + sequence = #{record.sequence,jdbcType=INTEGER}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_role + + + project_id = #{projectId,jdbcType=BIGINT}, + + + parent_id = #{parentId,jdbcType=BIGINT}, + + + name = #{name,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + sequence = #{sequence,jdbcType=INTEGER}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_role + set project_id = #{projectId,jdbcType=BIGINT}, + parent_id = #{parentId,jdbcType=BIGINT}, + name = #{name,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + sequence = #{sequence,jdbcType=INTEGER}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/ProRolePowerMapper.xml b/tall/target/classes/mapper_raw/ProRolePowerMapper.xml new file mode 100644 index 00000000..acfac2d6 --- /dev/null +++ b/tall/target/classes/mapper_raw/ProRolePowerMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, name, description, power, created_at, updated_at, rec_status + + + + + delete from t_pro_role_power + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_role_power + + + + + + insert into t_pro_role_power (id, name, description, + power, created_at, updated_at, + rec_status) + values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, + #{power,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, + #{recStatus,jdbcType=TINYINT}) + + + insert into t_pro_role_power + + + id, + + + name, + + + description, + + + power, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{power,jdbcType=TINYINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_role_power + + + id = #{record.id,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + power = #{record.power,jdbcType=TINYINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_role_power + set id = #{record.id,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + power = #{record.power,jdbcType=TINYINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_role_power + + + name = #{name,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + power = #{power,jdbcType=TINYINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_role_power + set name = #{name,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + power = #{power,jdbcType=TINYINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/ProSubTimeMemberMapper.xml b/tall/target/classes/mapper_raw/ProSubTimeMemberMapper.xml new file mode 100644 index 00000000..be861de8 --- /dev/null +++ b/tall/target/classes/mapper_raw/ProSubTimeMemberMapper.xml @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, task_sub_time_id, member_id, complated_status, real_finish_time, created_at, + updated_at, rec_status + + + + + delete from t_pro_sub_time_member + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_sub_time_member + + + + + + insert into t_pro_sub_time_member (id, task_sub_time_id, member_id, + complated_status, real_finish_time, created_at, + updated_at, rec_status) + values (#{id,jdbcType=BIGINT}, #{taskSubTimeId,jdbcType=BIGINT}, #{memberId,jdbcType=BIGINT}, + #{complatedStatus,jdbcType=INTEGER}, #{realFinishTime,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) + + + insert into t_pro_sub_time_member + + + id, + + + task_sub_time_id, + + + member_id, + + + complated_status, + + + real_finish_time, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{taskSubTimeId,jdbcType=BIGINT}, + + + #{memberId,jdbcType=BIGINT}, + + + #{complatedStatus,jdbcType=INTEGER}, + + + #{realFinishTime,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_sub_time_member + + + id = #{record.id,jdbcType=BIGINT}, + + + task_sub_time_id = #{record.taskSubTimeId,jdbcType=BIGINT}, + + + member_id = #{record.memberId,jdbcType=BIGINT}, + + + complated_status = #{record.complatedStatus,jdbcType=INTEGER}, + + + real_finish_time = #{record.realFinishTime,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_sub_time_member + set id = #{record.id,jdbcType=BIGINT}, + task_sub_time_id = #{record.taskSubTimeId,jdbcType=BIGINT}, + member_id = #{record.memberId,jdbcType=BIGINT}, + complated_status = #{record.complatedStatus,jdbcType=INTEGER}, + real_finish_time = #{record.realFinishTime,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_sub_time_member + + + task_sub_time_id = #{taskSubTimeId,jdbcType=BIGINT}, + + + member_id = #{memberId,jdbcType=BIGINT}, + + + complated_status = #{complatedStatus,jdbcType=INTEGER}, + + + real_finish_time = #{realFinishTime,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_sub_time_member + set task_sub_time_id = #{taskSubTimeId,jdbcType=BIGINT}, + member_id = #{memberId,jdbcType=BIGINT}, + complated_status = #{complatedStatus,jdbcType=INTEGER}, + real_finish_time = #{realFinishTime,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/ProTaskDeliverMapper.xml b/tall/target/classes/mapper_raw/ProTaskDeliverMapper.xml new file mode 100644 index 00000000..99518093 --- /dev/null +++ b/tall/target/classes/mapper_raw/ProTaskDeliverMapper.xml @@ -0,0 +1,323 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, task_detail_id, is_final, name, description, sequence, check_status, is_upload, + is_input, created_at, updated_at, rec_status + + + + + delete from t_pro_task_deliver + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_task_deliver + + + + + + insert into t_pro_task_deliver (id, task_detail_id, is_final, + name, description, sequence, + check_status, is_upload, is_input, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{taskDetailId,jdbcType=BIGINT}, #{isFinal,jdbcType=INTEGER}, + #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{sequence,jdbcType=INTEGER}, + #{checkStatus,jdbcType=INTEGER}, #{isUpload,jdbcType=INTEGER}, #{isInput,jdbcType=INTEGER}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_pro_task_deliver + + + id, + + + task_detail_id, + + + is_final, + + + name, + + + description, + + + sequence, + + + check_status, + + + is_upload, + + + is_input, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{taskDetailId,jdbcType=BIGINT}, + + + #{isFinal,jdbcType=INTEGER}, + + + #{name,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{sequence,jdbcType=INTEGER}, + + + #{checkStatus,jdbcType=INTEGER}, + + + #{isUpload,jdbcType=INTEGER}, + + + #{isInput,jdbcType=INTEGER}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_task_deliver + + + id = #{record.id,jdbcType=BIGINT}, + + + task_detail_id = #{record.taskDetailId,jdbcType=BIGINT}, + + + is_final = #{record.isFinal,jdbcType=INTEGER}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + sequence = #{record.sequence,jdbcType=INTEGER}, + + + check_status = #{record.checkStatus,jdbcType=INTEGER}, + + + is_upload = #{record.isUpload,jdbcType=INTEGER}, + + + is_input = #{record.isInput,jdbcType=INTEGER}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_task_deliver + set id = #{record.id,jdbcType=BIGINT}, + task_detail_id = #{record.taskDetailId,jdbcType=BIGINT}, + is_final = #{record.isFinal,jdbcType=INTEGER}, + name = #{record.name,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + sequence = #{record.sequence,jdbcType=INTEGER}, + check_status = #{record.checkStatus,jdbcType=INTEGER}, + is_upload = #{record.isUpload,jdbcType=INTEGER}, + is_input = #{record.isInput,jdbcType=INTEGER}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_task_deliver + + + task_detail_id = #{taskDetailId,jdbcType=BIGINT}, + + + is_final = #{isFinal,jdbcType=INTEGER}, + + + name = #{name,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + sequence = #{sequence,jdbcType=INTEGER}, + + + check_status = #{checkStatus,jdbcType=INTEGER}, + + + is_upload = #{isUpload,jdbcType=INTEGER}, + + + is_input = #{isInput,jdbcType=INTEGER}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_task_deliver + set task_detail_id = #{taskDetailId,jdbcType=BIGINT}, + is_final = #{isFinal,jdbcType=INTEGER}, + name = #{name,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + sequence = #{sequence,jdbcType=INTEGER}, + check_status = #{checkStatus,jdbcType=INTEGER}, + is_upload = #{isUpload,jdbcType=INTEGER}, + is_input = #{isInput,jdbcType=INTEGER}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/ProTaskDeliverPostLogCheckerMapper.xml b/tall/target/classes/mapper_raw/ProTaskDeliverPostLogCheckerMapper.xml new file mode 100644 index 00000000..cb2f12a7 --- /dev/null +++ b/tall/target/classes/mapper_raw/ProTaskDeliverPostLogCheckerMapper.xml @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, deliver_post_log_id, checker_id, remark, check_status, created_at, updated_at, + rec_status + + + + + delete from t_pro_task_deliver_post_log_checker + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_task_deliver_post_log_checker + + + + + + insert into t_pro_task_deliver_post_log_checker (id, deliver_post_log_id, checker_id, + remark, check_status, created_at, + updated_at, rec_status) + values (#{id,jdbcType=BIGINT}, #{deliverPostLogId,jdbcType=BIGINT}, #{checkerId,jdbcType=BIGINT}, + #{remark,jdbcType=VARCHAR}, #{checkStatus,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) + + + insert into t_pro_task_deliver_post_log_checker + + + id, + + + deliver_post_log_id, + + + checker_id, + + + remark, + + + check_status, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{deliverPostLogId,jdbcType=BIGINT}, + + + #{checkerId,jdbcType=BIGINT}, + + + #{remark,jdbcType=VARCHAR}, + + + #{checkStatus,jdbcType=INTEGER}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_task_deliver_post_log_checker + + + id = #{record.id,jdbcType=BIGINT}, + + + deliver_post_log_id = #{record.deliverPostLogId,jdbcType=BIGINT}, + + + checker_id = #{record.checkerId,jdbcType=BIGINT}, + + + remark = #{record.remark,jdbcType=VARCHAR}, + + + check_status = #{record.checkStatus,jdbcType=INTEGER}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_task_deliver_post_log_checker + set id = #{record.id,jdbcType=BIGINT}, + deliver_post_log_id = #{record.deliverPostLogId,jdbcType=BIGINT}, + checker_id = #{record.checkerId,jdbcType=BIGINT}, + remark = #{record.remark,jdbcType=VARCHAR}, + check_status = #{record.checkStatus,jdbcType=INTEGER}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_task_deliver_post_log_checker + + + deliver_post_log_id = #{deliverPostLogId,jdbcType=BIGINT}, + + + checker_id = #{checkerId,jdbcType=BIGINT}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + check_status = #{checkStatus,jdbcType=INTEGER}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_task_deliver_post_log_checker + set deliver_post_log_id = #{deliverPostLogId,jdbcType=BIGINT}, + checker_id = #{checkerId,jdbcType=BIGINT}, + remark = #{remark,jdbcType=VARCHAR}, + check_status = #{checkStatus,jdbcType=INTEGER}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/ProTaskDeliverPostLogMapper.xml b/tall/target/classes/mapper_raw/ProTaskDeliverPostLogMapper.xml new file mode 100644 index 00000000..c24773bc --- /dev/null +++ b/tall/target/classes/mapper_raw/ProTaskDeliverPostLogMapper.xml @@ -0,0 +1,323 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, deliver_id, task_sub_time_id, file_id, user_id, version, description, time, is_history, + created_at, updated_at, rec_status + + + + + delete from t_pro_task_deliver_post_log + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_task_deliver_post_log + + + + + + insert into t_pro_task_deliver_post_log (id, deliver_id, task_sub_time_id, + file_id, user_id, version, + description, time, is_history, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{deliverId,jdbcType=BIGINT}, #{taskSubTimeId,jdbcType=BIGINT}, + #{fileId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{version,jdbcType=VARCHAR}, + #{description,jdbcType=VARCHAR}, #{time,jdbcType=BIGINT}, #{isHistory,jdbcType=INTEGER}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_pro_task_deliver_post_log + + + id, + + + deliver_id, + + + task_sub_time_id, + + + file_id, + + + user_id, + + + version, + + + description, + + + time, + + + is_history, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{deliverId,jdbcType=BIGINT}, + + + #{taskSubTimeId,jdbcType=BIGINT}, + + + #{fileId,jdbcType=BIGINT}, + + + #{userId,jdbcType=BIGINT}, + + + #{version,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{time,jdbcType=BIGINT}, + + + #{isHistory,jdbcType=INTEGER}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_task_deliver_post_log + + + id = #{record.id,jdbcType=BIGINT}, + + + deliver_id = #{record.deliverId,jdbcType=BIGINT}, + + + task_sub_time_id = #{record.taskSubTimeId,jdbcType=BIGINT}, + + + file_id = #{record.fileId,jdbcType=BIGINT}, + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + version = #{record.version,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + time = #{record.time,jdbcType=BIGINT}, + + + is_history = #{record.isHistory,jdbcType=INTEGER}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_task_deliver_post_log + set id = #{record.id,jdbcType=BIGINT}, + deliver_id = #{record.deliverId,jdbcType=BIGINT}, + task_sub_time_id = #{record.taskSubTimeId,jdbcType=BIGINT}, + file_id = #{record.fileId,jdbcType=BIGINT}, + user_id = #{record.userId,jdbcType=BIGINT}, + version = #{record.version,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + time = #{record.time,jdbcType=BIGINT}, + is_history = #{record.isHistory,jdbcType=INTEGER}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_task_deliver_post_log + + + deliver_id = #{deliverId,jdbcType=BIGINT}, + + + task_sub_time_id = #{taskSubTimeId,jdbcType=BIGINT}, + + + file_id = #{fileId,jdbcType=BIGINT}, + + + user_id = #{userId,jdbcType=BIGINT}, + + + version = #{version,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + time = #{time,jdbcType=BIGINT}, + + + is_history = #{isHistory,jdbcType=INTEGER}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_task_deliver_post_log + set deliver_id = #{deliverId,jdbcType=BIGINT}, + task_sub_time_id = #{taskSubTimeId,jdbcType=BIGINT}, + file_id = #{fileId,jdbcType=BIGINT}, + user_id = #{userId,jdbcType=BIGINT}, + version = #{version,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + time = #{time,jdbcType=BIGINT}, + is_history = #{isHistory,jdbcType=INTEGER}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/ProTaskDetailMapper.xml b/tall/target/classes/mapper_raw/ProTaskDetailMapper.xml new file mode 100644 index 00000000..93660639 --- /dev/null +++ b/tall/target/classes/mapper_raw/ProTaskDetailMapper.xml @@ -0,0 +1,543 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, project_id, name, description, begin_time, end_time, cycle, parent_id, sub_task, + sub_project_id, sub_project, executor_role, checker_role, money, delay, delay_time, + loop_to, loop_times, virtual, level, has_group, finish_need_all, all_member, created_at, + updated_at, rec_status + + + + + delete from t_pro_task_detail + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_task_detail + + + + + + insert into t_pro_task_detail (id, project_id, name, + description, begin_time, end_time, + cycle, parent_id, sub_task, + sub_project_id, sub_project, executor_role, + checker_role, money, delay, + delay_time, loop_to, loop_times, + virtual, level, has_group, + finish_need_all, all_member, created_at, + updated_at, rec_status) + values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, + #{description,jdbcType=VARCHAR}, #{beginTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, + #{cycle,jdbcType=VARCHAR}, #{parentId,jdbcType=BIGINT}, #{subTask,jdbcType=VARCHAR}, + #{subProjectId,jdbcType=BIGINT}, #{subProject,jdbcType=VARCHAR}, #{executorRole,jdbcType=BIGINT}, + #{checkerRole,jdbcType=BIGINT}, #{money,jdbcType=BIGINT}, #{delay,jdbcType=TINYINT}, + #{delayTime,jdbcType=BIGINT}, #{loopTo,jdbcType=BIGINT}, #{loopTimes,jdbcType=INTEGER}, + #{virtual,jdbcType=TINYINT}, #{level,jdbcType=TINYINT}, #{hasGroup,jdbcType=TINYINT}, + #{finishNeedAll,jdbcType=TINYINT}, #{allMember,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) + + + insert into t_pro_task_detail + + + id, + + + project_id, + + + name, + + + description, + + + begin_time, + + + end_time, + + + cycle, + + + parent_id, + + + sub_task, + + + sub_project_id, + + + sub_project, + + + executor_role, + + + checker_role, + + + money, + + + delay, + + + delay_time, + + + loop_to, + + + loop_times, + + + virtual, + + + level, + + + has_group, + + + finish_need_all, + + + all_member, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{projectId,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{beginTime,jdbcType=BIGINT}, + + + #{endTime,jdbcType=BIGINT}, + + + #{cycle,jdbcType=VARCHAR}, + + + #{parentId,jdbcType=BIGINT}, + + + #{subTask,jdbcType=VARCHAR}, + + + #{subProjectId,jdbcType=BIGINT}, + + + #{subProject,jdbcType=VARCHAR}, + + + #{executorRole,jdbcType=BIGINT}, + + + #{checkerRole,jdbcType=BIGINT}, + + + #{money,jdbcType=BIGINT}, + + + #{delay,jdbcType=TINYINT}, + + + #{delayTime,jdbcType=BIGINT}, + + + #{loopTo,jdbcType=BIGINT}, + + + #{loopTimes,jdbcType=INTEGER}, + + + #{virtual,jdbcType=TINYINT}, + + + #{level,jdbcType=TINYINT}, + + + #{hasGroup,jdbcType=TINYINT}, + + + #{finishNeedAll,jdbcType=TINYINT}, + + + #{allMember,jdbcType=TINYINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_task_detail + + + id = #{record.id,jdbcType=BIGINT}, + + + project_id = #{record.projectId,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + begin_time = #{record.beginTime,jdbcType=BIGINT}, + + + end_time = #{record.endTime,jdbcType=BIGINT}, + + + cycle = #{record.cycle,jdbcType=VARCHAR}, + + + parent_id = #{record.parentId,jdbcType=BIGINT}, + + + sub_task = #{record.subTask,jdbcType=VARCHAR}, + + + sub_project_id = #{record.subProjectId,jdbcType=BIGINT}, + + + sub_project = #{record.subProject,jdbcType=VARCHAR}, + + + executor_role = #{record.executorRole,jdbcType=BIGINT}, + + + checker_role = #{record.checkerRole,jdbcType=BIGINT}, + + + money = #{record.money,jdbcType=BIGINT}, + + + delay = #{record.delay,jdbcType=TINYINT}, + + + delay_time = #{record.delayTime,jdbcType=BIGINT}, + + + loop_to = #{record.loopTo,jdbcType=BIGINT}, + + + loop_times = #{record.loopTimes,jdbcType=INTEGER}, + + + virtual = #{record.virtual,jdbcType=TINYINT}, + + + level = #{record.level,jdbcType=TINYINT}, + + + has_group = #{record.hasGroup,jdbcType=TINYINT}, + + + finish_need_all = #{record.finishNeedAll,jdbcType=TINYINT}, + + + all_member = #{record.allMember,jdbcType=TINYINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_task_detail + set id = #{record.id,jdbcType=BIGINT}, + project_id = #{record.projectId,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + begin_time = #{record.beginTime,jdbcType=BIGINT}, + end_time = #{record.endTime,jdbcType=BIGINT}, + cycle = #{record.cycle,jdbcType=VARCHAR}, + parent_id = #{record.parentId,jdbcType=BIGINT}, + sub_task = #{record.subTask,jdbcType=VARCHAR}, + sub_project_id = #{record.subProjectId,jdbcType=BIGINT}, + sub_project = #{record.subProject,jdbcType=VARCHAR}, + executor_role = #{record.executorRole,jdbcType=BIGINT}, + checker_role = #{record.checkerRole,jdbcType=BIGINT}, + money = #{record.money,jdbcType=BIGINT}, + delay = #{record.delay,jdbcType=TINYINT}, + delay_time = #{record.delayTime,jdbcType=BIGINT}, + loop_to = #{record.loopTo,jdbcType=BIGINT}, + loop_times = #{record.loopTimes,jdbcType=INTEGER}, + virtual = #{record.virtual,jdbcType=TINYINT}, + level = #{record.level,jdbcType=TINYINT}, + has_group = #{record.hasGroup,jdbcType=TINYINT}, + finish_need_all = #{record.finishNeedAll,jdbcType=TINYINT}, + all_member = #{record.allMember,jdbcType=TINYINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_task_detail + + + project_id = #{projectId,jdbcType=BIGINT}, + + + name = #{name,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + begin_time = #{beginTime,jdbcType=BIGINT}, + + + end_time = #{endTime,jdbcType=BIGINT}, + + + cycle = #{cycle,jdbcType=VARCHAR}, + + + parent_id = #{parentId,jdbcType=BIGINT}, + + + sub_task = #{subTask,jdbcType=VARCHAR}, + + + sub_project_id = #{subProjectId,jdbcType=BIGINT}, + + + sub_project = #{subProject,jdbcType=VARCHAR}, + + + executor_role = #{executorRole,jdbcType=BIGINT}, + + + checker_role = #{checkerRole,jdbcType=BIGINT}, + + + money = #{money,jdbcType=BIGINT}, + + + delay = #{delay,jdbcType=TINYINT}, + + + delay_time = #{delayTime,jdbcType=BIGINT}, + + + loop_to = #{loopTo,jdbcType=BIGINT}, + + + loop_times = #{loopTimes,jdbcType=INTEGER}, + + + virtual = #{virtual,jdbcType=TINYINT}, + + + level = #{level,jdbcType=TINYINT}, + + + has_group = #{hasGroup,jdbcType=TINYINT}, + + + finish_need_all = #{finishNeedAll,jdbcType=TINYINT}, + + + all_member = #{allMember,jdbcType=TINYINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_task_detail + set project_id = #{projectId,jdbcType=BIGINT}, + name = #{name,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + begin_time = #{beginTime,jdbcType=BIGINT}, + end_time = #{endTime,jdbcType=BIGINT}, + cycle = #{cycle,jdbcType=VARCHAR}, + parent_id = #{parentId,jdbcType=BIGINT}, + sub_task = #{subTask,jdbcType=VARCHAR}, + sub_project_id = #{subProjectId,jdbcType=BIGINT}, + sub_project = #{subProject,jdbcType=VARCHAR}, + executor_role = #{executorRole,jdbcType=BIGINT}, + checker_role = #{checkerRole,jdbcType=BIGINT}, + money = #{money,jdbcType=BIGINT}, + delay = #{delay,jdbcType=TINYINT}, + delay_time = #{delayTime,jdbcType=BIGINT}, + loop_to = #{loopTo,jdbcType=BIGINT}, + loop_times = #{loopTimes,jdbcType=INTEGER}, + virtual = #{virtual,jdbcType=TINYINT}, + level = #{level,jdbcType=TINYINT}, + has_group = #{hasGroup,jdbcType=TINYINT}, + finish_need_all = #{finishNeedAll,jdbcType=TINYINT}, + all_member = #{allMember,jdbcType=TINYINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/ProTaskHardwareMapper.xml b/tall/target/classes/mapper_raw/ProTaskHardwareMapper.xml new file mode 100644 index 00000000..2720c7c3 --- /dev/null +++ b/tall/target/classes/mapper_raw/ProTaskHardwareMapper.xml @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, name, type, nickname, task_detail_id, user_id, mount_time, created_at, updated_at, + rec_status + + + + + delete from t_pro_task_hardware + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_task_hardware + + + + + + insert into t_pro_task_hardware (id, name, type, + nickname, task_detail_id, user_id, + mount_time, created_at, updated_at, + rec_status) + values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, + #{nickname,jdbcType=VARCHAR}, #{taskDetailId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, + #{mountTime,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, + #{recStatus,jdbcType=TINYINT}) + + + insert into t_pro_task_hardware + + + id, + + + name, + + + type, + + + nickname, + + + task_detail_id, + + + user_id, + + + mount_time, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{type,jdbcType=INTEGER}, + + + #{nickname,jdbcType=VARCHAR}, + + + #{taskDetailId,jdbcType=BIGINT}, + + + #{userId,jdbcType=BIGINT}, + + + #{mountTime,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_task_hardware + + + id = #{record.id,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + type = #{record.type,jdbcType=INTEGER}, + + + nickname = #{record.nickname,jdbcType=VARCHAR}, + + + task_detail_id = #{record.taskDetailId,jdbcType=BIGINT}, + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + mount_time = #{record.mountTime,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_task_hardware + set id = #{record.id,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + type = #{record.type,jdbcType=INTEGER}, + nickname = #{record.nickname,jdbcType=VARCHAR}, + task_detail_id = #{record.taskDetailId,jdbcType=BIGINT}, + user_id = #{record.userId,jdbcType=BIGINT}, + mount_time = #{record.mountTime,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_task_hardware + + + name = #{name,jdbcType=VARCHAR}, + + + type = #{type,jdbcType=INTEGER}, + + + nickname = #{nickname,jdbcType=VARCHAR}, + + + task_detail_id = #{taskDetailId,jdbcType=BIGINT}, + + + user_id = #{userId,jdbcType=BIGINT}, + + + mount_time = #{mountTime,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_task_hardware + set name = #{name,jdbcType=VARCHAR}, + type = #{type,jdbcType=INTEGER}, + nickname = #{nickname,jdbcType=VARCHAR}, + task_detail_id = #{taskDetailId,jdbcType=BIGINT}, + user_id = #{userId,jdbcType=BIGINT}, + mount_time = #{mountTime,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/ProTaskMemberMapper.xml b/tall/target/classes/mapper_raw/ProTaskMemberMapper.xml new file mode 100644 index 00000000..964184f3 --- /dev/null +++ b/tall/target/classes/mapper_raw/ProTaskMemberMapper.xml @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, task_detail_id, member_id, created_at, updated_at, rec_status + + + + + delete from t_pro_task_member + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_task_member + + + + + + insert into t_pro_task_member (id, task_detail_id, member_id, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{taskDetailId,jdbcType=BIGINT}, #{memberId,jdbcType=BIGINT}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_pro_task_member + + + id, + + + task_detail_id, + + + member_id, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{taskDetailId,jdbcType=BIGINT}, + + + #{memberId,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_task_member + + + id = #{record.id,jdbcType=BIGINT}, + + + task_detail_id = #{record.taskDetailId,jdbcType=BIGINT}, + + + member_id = #{record.memberId,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_task_member + set id = #{record.id,jdbcType=BIGINT}, + task_detail_id = #{record.taskDetailId,jdbcType=BIGINT}, + member_id = #{record.memberId,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_task_member + + + task_detail_id = #{taskDetailId,jdbcType=BIGINT}, + + + member_id = #{memberId,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_task_member + set task_detail_id = #{taskDetailId,jdbcType=BIGINT}, + member_id = #{memberId,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/ProTaskPluginMapper.xml b/tall/target/classes/mapper_raw/ProTaskPluginMapper.xml new file mode 100644 index 00000000..2eb3143a --- /dev/null +++ b/tall/target/classes/mapper_raw/ProTaskPluginMapper.xml @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, plugin_id, task_detail_id, member_role_id, name, description, sequence, created_at, + updated_at, rec_status + + + + + delete from t_pro_task_plugin + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_task_plugin + + + + + + insert into t_pro_task_plugin (id, plugin_id, task_detail_id, + member_role_id, name, description, + sequence, created_at, updated_at, + rec_status) + values (#{id,jdbcType=BIGINT}, #{pluginId,jdbcType=BIGINT}, #{taskDetailId,jdbcType=BIGINT}, + #{memberRoleId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, + #{sequence,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, + #{recStatus,jdbcType=TINYINT}) + + + insert into t_pro_task_plugin + + + id, + + + plugin_id, + + + task_detail_id, + + + member_role_id, + + + name, + + + description, + + + sequence, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{pluginId,jdbcType=BIGINT}, + + + #{taskDetailId,jdbcType=BIGINT}, + + + #{memberRoleId,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{sequence,jdbcType=INTEGER}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_task_plugin + + + id = #{record.id,jdbcType=BIGINT}, + + + plugin_id = #{record.pluginId,jdbcType=BIGINT}, + + + task_detail_id = #{record.taskDetailId,jdbcType=BIGINT}, + + + member_role_id = #{record.memberRoleId,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + sequence = #{record.sequence,jdbcType=INTEGER}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_task_plugin + set id = #{record.id,jdbcType=BIGINT}, + plugin_id = #{record.pluginId,jdbcType=BIGINT}, + task_detail_id = #{record.taskDetailId,jdbcType=BIGINT}, + member_role_id = #{record.memberRoleId,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + sequence = #{record.sequence,jdbcType=INTEGER}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_task_plugin + + + plugin_id = #{pluginId,jdbcType=BIGINT}, + + + task_detail_id = #{taskDetailId,jdbcType=BIGINT}, + + + member_role_id = #{memberRoleId,jdbcType=BIGINT}, + + + name = #{name,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + sequence = #{sequence,jdbcType=INTEGER}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_task_plugin + set plugin_id = #{pluginId,jdbcType=BIGINT}, + task_detail_id = #{taskDetailId,jdbcType=BIGINT}, + member_role_id = #{memberRoleId,jdbcType=BIGINT}, + name = #{name,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + sequence = #{sequence,jdbcType=INTEGER}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/ProTaskSubTimeMapper.xml b/tall/target/classes/mapper_raw/ProTaskSubTimeMapper.xml new file mode 100644 index 00000000..ebbfb5c4 --- /dev/null +++ b/tall/target/classes/mapper_raw/ProTaskSubTimeMapper.xml @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, task_detail_id, begin_time, end_time, real_begin_time, real_end_time, complated_status, + created_at, updated_at, rec_status + + + + + delete from t_pro_task_sub_time + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_task_sub_time + + + + + + insert into t_pro_task_sub_time (id, task_detail_id, begin_time, + end_time, real_begin_time, real_end_time, + complated_status, created_at, updated_at, + rec_status) + values (#{id,jdbcType=BIGINT}, #{taskDetailId,jdbcType=BIGINT}, #{beginTime,jdbcType=BIGINT}, + #{endTime,jdbcType=BIGINT}, #{realBeginTime,jdbcType=BIGINT}, #{realEndTime,jdbcType=BIGINT}, + #{complatedStatus,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, + #{recStatus,jdbcType=TINYINT}) + + + insert into t_pro_task_sub_time + + + id, + + + task_detail_id, + + + begin_time, + + + end_time, + + + real_begin_time, + + + real_end_time, + + + complated_status, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{taskDetailId,jdbcType=BIGINT}, + + + #{beginTime,jdbcType=BIGINT}, + + + #{endTime,jdbcType=BIGINT}, + + + #{realBeginTime,jdbcType=BIGINT}, + + + #{realEndTime,jdbcType=BIGINT}, + + + #{complatedStatus,jdbcType=INTEGER}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_task_sub_time + + + id = #{record.id,jdbcType=BIGINT}, + + + task_detail_id = #{record.taskDetailId,jdbcType=BIGINT}, + + + begin_time = #{record.beginTime,jdbcType=BIGINT}, + + + end_time = #{record.endTime,jdbcType=BIGINT}, + + + real_begin_time = #{record.realBeginTime,jdbcType=BIGINT}, + + + real_end_time = #{record.realEndTime,jdbcType=BIGINT}, + + + complated_status = #{record.complatedStatus,jdbcType=INTEGER}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_task_sub_time + set id = #{record.id,jdbcType=BIGINT}, + task_detail_id = #{record.taskDetailId,jdbcType=BIGINT}, + begin_time = #{record.beginTime,jdbcType=BIGINT}, + end_time = #{record.endTime,jdbcType=BIGINT}, + real_begin_time = #{record.realBeginTime,jdbcType=BIGINT}, + real_end_time = #{record.realEndTime,jdbcType=BIGINT}, + complated_status = #{record.complatedStatus,jdbcType=INTEGER}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_task_sub_time + + + task_detail_id = #{taskDetailId,jdbcType=BIGINT}, + + + begin_time = #{beginTime,jdbcType=BIGINT}, + + + end_time = #{endTime,jdbcType=BIGINT}, + + + real_begin_time = #{realBeginTime,jdbcType=BIGINT}, + + + real_end_time = #{realEndTime,jdbcType=BIGINT}, + + + complated_status = #{complatedStatus,jdbcType=INTEGER}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_task_sub_time + set task_detail_id = #{taskDetailId,jdbcType=BIGINT}, + begin_time = #{beginTime,jdbcType=BIGINT}, + end_time = #{endTime,jdbcType=BIGINT}, + real_begin_time = #{realBeginTime,jdbcType=BIGINT}, + real_end_time = #{realEndTime,jdbcType=BIGINT}, + complated_status = #{complatedStatus,jdbcType=INTEGER}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/ProTodoMapper.xml b/tall/target/classes/mapper_raw/ProTodoMapper.xml new file mode 100644 index 00000000..88d74b7a --- /dev/null +++ b/tall/target/classes/mapper_raw/ProTodoMapper.xml @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, content, project_id, task_detail_id, isFinish, created_id, send_id, created_at, + updated_at, rec_status + + + + + delete from t_pro_todo + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_todo + + + + + + insert into t_pro_todo (id, content, project_id, + task_detail_id, isFinish, created_id, + send_id, created_at, updated_at, + rec_status) + values (#{id,jdbcType=BIGINT}, #{content,jdbcType=VARCHAR}, #{projectId,jdbcType=BIGINT}, + #{taskDetailId,jdbcType=BIGINT}, #{isfinish,jdbcType=TINYINT}, #{createdId,jdbcType=BIGINT}, + #{sendId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, + #{recStatus,jdbcType=TINYINT}) + + + insert into t_pro_todo + + + id, + + + content, + + + project_id, + + + task_detail_id, + + + isFinish, + + + created_id, + + + send_id, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{content,jdbcType=VARCHAR}, + + + #{projectId,jdbcType=BIGINT}, + + + #{taskDetailId,jdbcType=BIGINT}, + + + #{isfinish,jdbcType=TINYINT}, + + + #{createdId,jdbcType=BIGINT}, + + + #{sendId,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_todo + + + id = #{record.id,jdbcType=BIGINT}, + + + content = #{record.content,jdbcType=VARCHAR}, + + + project_id = #{record.projectId,jdbcType=BIGINT}, + + + task_detail_id = #{record.taskDetailId,jdbcType=BIGINT}, + + + isFinish = #{record.isfinish,jdbcType=TINYINT}, + + + created_id = #{record.createdId,jdbcType=BIGINT}, + + + send_id = #{record.sendId,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_todo + set id = #{record.id,jdbcType=BIGINT}, + content = #{record.content,jdbcType=VARCHAR}, + project_id = #{record.projectId,jdbcType=BIGINT}, + task_detail_id = #{record.taskDetailId,jdbcType=BIGINT}, + isFinish = #{record.isfinish,jdbcType=TINYINT}, + created_id = #{record.createdId,jdbcType=BIGINT}, + send_id = #{record.sendId,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_todo + + + content = #{content,jdbcType=VARCHAR}, + + + project_id = #{projectId,jdbcType=BIGINT}, + + + task_detail_id = #{taskDetailId,jdbcType=BIGINT}, + + + isFinish = #{isfinish,jdbcType=TINYINT}, + + + created_id = #{createdId,jdbcType=BIGINT}, + + + send_id = #{sendId,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_todo + set content = #{content,jdbcType=VARCHAR}, + project_id = #{projectId,jdbcType=BIGINT}, + task_detail_id = #{taskDetailId,jdbcType=BIGINT}, + isFinish = #{isfinish,jdbcType=TINYINT}, + created_id = #{createdId,jdbcType=BIGINT}, + send_id = #{sendId,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/SysAuthMapper.xml b/tall/target/classes/mapper_raw/SysAuthMapper.xml new file mode 100644 index 00000000..fb775a5a --- /dev/null +++ b/tall/target/classes/mapper_raw/SysAuthMapper.xml @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, user_id, identify_type, identifier, credential, salt, created_at, updated_at, + rec_status + + + + + delete from t_sys_auth + where id = #{id,jdbcType=BIGINT} + + + delete from t_sys_auth + + + + + + insert into t_sys_auth (id, user_id, identify_type, + identifier, credential, salt, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{identifyType,jdbcType=TINYINT}, + #{identifier,jdbcType=VARCHAR}, #{credential,jdbcType=VARCHAR}, #{salt,jdbcType=VARCHAR}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_sys_auth + + + id, + + + user_id, + + + identify_type, + + + identifier, + + + credential, + + + salt, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{userId,jdbcType=BIGINT}, + + + #{identifyType,jdbcType=TINYINT}, + + + #{identifier,jdbcType=VARCHAR}, + + + #{credential,jdbcType=VARCHAR}, + + + #{salt,jdbcType=VARCHAR}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_sys_auth + + + id = #{record.id,jdbcType=BIGINT}, + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + identify_type = #{record.identifyType,jdbcType=TINYINT}, + + + identifier = #{record.identifier,jdbcType=VARCHAR}, + + + credential = #{record.credential,jdbcType=VARCHAR}, + + + salt = #{record.salt,jdbcType=VARCHAR}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_sys_auth + set id = #{record.id,jdbcType=BIGINT}, + user_id = #{record.userId,jdbcType=BIGINT}, + identify_type = #{record.identifyType,jdbcType=TINYINT}, + identifier = #{record.identifier,jdbcType=VARCHAR}, + credential = #{record.credential,jdbcType=VARCHAR}, + salt = #{record.salt,jdbcType=VARCHAR}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_sys_auth + + + user_id = #{userId,jdbcType=BIGINT}, + + + identify_type = #{identifyType,jdbcType=TINYINT}, + + + identifier = #{identifier,jdbcType=VARCHAR}, + + + credential = #{credential,jdbcType=VARCHAR}, + + + salt = #{salt,jdbcType=VARCHAR}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_sys_auth + set user_id = #{userId,jdbcType=BIGINT}, + identify_type = #{identifyType,jdbcType=TINYINT}, + identifier = #{identifier,jdbcType=VARCHAR}, + credential = #{credential,jdbcType=VARCHAR}, + salt = #{salt,jdbcType=VARCHAR}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/SysBalanceLogMapper.xml b/tall/target/classes/mapper_raw/SysBalanceLogMapper.xml new file mode 100644 index 00000000..0697f8c4 --- /dev/null +++ b/tall/target/classes/mapper_raw/SysBalanceLogMapper.xml @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, user_id, balance, offset, type, phase, created_at, updated_at, rec_status + + + + + delete from t_sys_balance_log + where id = #{id,jdbcType=BIGINT} + + + delete from t_sys_balance_log + + + + + + insert into t_sys_balance_log (id, user_id, balance, + offset, type, phase, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{balance,jdbcType=INTEGER}, + #{offset,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{phase,jdbcType=VARCHAR}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_sys_balance_log + + + id, + + + user_id, + + + balance, + + + offset, + + + type, + + + phase, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{userId,jdbcType=BIGINT}, + + + #{balance,jdbcType=INTEGER}, + + + #{offset,jdbcType=INTEGER}, + + + #{type,jdbcType=INTEGER}, + + + #{phase,jdbcType=VARCHAR}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_sys_balance_log + + + id = #{record.id,jdbcType=BIGINT}, + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + balance = #{record.balance,jdbcType=INTEGER}, + + + offset = #{record.offset,jdbcType=INTEGER}, + + + type = #{record.type,jdbcType=INTEGER}, + + + phase = #{record.phase,jdbcType=VARCHAR}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_sys_balance_log + set id = #{record.id,jdbcType=BIGINT}, + user_id = #{record.userId,jdbcType=BIGINT}, + balance = #{record.balance,jdbcType=INTEGER}, + offset = #{record.offset,jdbcType=INTEGER}, + type = #{record.type,jdbcType=INTEGER}, + phase = #{record.phase,jdbcType=VARCHAR}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_sys_balance_log + + + user_id = #{userId,jdbcType=BIGINT}, + + + balance = #{balance,jdbcType=INTEGER}, + + + offset = #{offset,jdbcType=INTEGER}, + + + type = #{type,jdbcType=INTEGER}, + + + phase = #{phase,jdbcType=VARCHAR}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_sys_balance_log + set user_id = #{userId,jdbcType=BIGINT}, + balance = #{balance,jdbcType=INTEGER}, + offset = #{offset,jdbcType=INTEGER}, + type = #{type,jdbcType=INTEGER}, + phase = #{phase,jdbcType=VARCHAR}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/SysCommitedFileMapper.xml b/tall/target/classes/mapper_raw/SysCommitedFileMapper.xml new file mode 100644 index 00000000..9a901ec1 --- /dev/null +++ b/tall/target/classes/mapper_raw/SysCommitedFileMapper.xml @@ -0,0 +1,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, name, path, md5, sha1, time, count, created_at, updated_at, rec_status + + + + + delete from t_sys_commited_file + where id = #{id,jdbcType=BIGINT} + + + delete from t_sys_commited_file + + + + + + insert into t_sys_commited_file (id, name, path, + md5, sha1, time, count, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{path,jdbcType=VARCHAR}, + #{md5,jdbcType=VARCHAR}, #{sha1,jdbcType=VARCHAR}, #{time,jdbcType=BIGINT}, #{count,jdbcType=INTEGER}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_sys_commited_file + + + id, + + + name, + + + path, + + + md5, + + + sha1, + + + time, + + + count, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{path,jdbcType=VARCHAR}, + + + #{md5,jdbcType=VARCHAR}, + + + #{sha1,jdbcType=VARCHAR}, + + + #{time,jdbcType=BIGINT}, + + + #{count,jdbcType=INTEGER}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_sys_commited_file + + + id = #{record.id,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + path = #{record.path,jdbcType=VARCHAR}, + + + md5 = #{record.md5,jdbcType=VARCHAR}, + + + sha1 = #{record.sha1,jdbcType=VARCHAR}, + + + time = #{record.time,jdbcType=BIGINT}, + + + count = #{record.count,jdbcType=INTEGER}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_sys_commited_file + set id = #{record.id,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + path = #{record.path,jdbcType=VARCHAR}, + md5 = #{record.md5,jdbcType=VARCHAR}, + sha1 = #{record.sha1,jdbcType=VARCHAR}, + time = #{record.time,jdbcType=BIGINT}, + count = #{record.count,jdbcType=INTEGER}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_sys_commited_file + + + name = #{name,jdbcType=VARCHAR}, + + + path = #{path,jdbcType=VARCHAR}, + + + md5 = #{md5,jdbcType=VARCHAR}, + + + sha1 = #{sha1,jdbcType=VARCHAR}, + + + time = #{time,jdbcType=BIGINT}, + + + count = #{count,jdbcType=INTEGER}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_sys_commited_file + set name = #{name,jdbcType=VARCHAR}, + path = #{path,jdbcType=VARCHAR}, + md5 = #{md5,jdbcType=VARCHAR}, + sha1 = #{sha1,jdbcType=VARCHAR}, + time = #{time,jdbcType=BIGINT}, + count = #{count,jdbcType=INTEGER}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/SysGradeMapper.xml b/tall/target/classes/mapper_raw/SysGradeMapper.xml new file mode 100644 index 00000000..256d23d6 --- /dev/null +++ b/tall/target/classes/mapper_raw/SysGradeMapper.xml @@ -0,0 +1,258 @@ + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, name, description, sequence, avatar_url, created_at, updated_at, rec_status + + + + + delete from t_sys_grade + where id = #{id,jdbcType=BIGINT} + + + delete from t_sys_grade + + + + + + insert into t_sys_grade (id, name, description, + sequence, avatar_url, created_at, + updated_at, rec_status) + values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, + #{sequence,jdbcType=INTEGER}, #{avatarUrl,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) + + + insert into t_sys_grade + + + id, + + + name, + + + description, + + + sequence, + + + avatar_url, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{sequence,jdbcType=INTEGER}, + + + #{avatarUrl,jdbcType=VARCHAR}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_sys_grade + + + id = #{record.id,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + sequence = #{record.sequence,jdbcType=INTEGER}, + + + avatar_url = #{record.avatarUrl,jdbcType=VARCHAR}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_sys_grade + set id = #{record.id,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + sequence = #{record.sequence,jdbcType=INTEGER}, + avatar_url = #{record.avatarUrl,jdbcType=VARCHAR}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_sys_grade + + + name = #{name,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + sequence = #{sequence,jdbcType=INTEGER}, + + + avatar_url = #{avatarUrl,jdbcType=VARCHAR}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_sys_grade + set name = #{name,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + sequence = #{sequence,jdbcType=INTEGER}, + avatar_url = #{avatarUrl,jdbcType=VARCHAR}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/SysPluginMapper.xml b/tall/target/classes/mapper_raw/SysPluginMapper.xml new file mode 100644 index 00000000..69846018 --- /dev/null +++ b/tall/target/classes/mapper_raw/SysPluginMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, name, description, scene, created_at, updated_at, rec_status + + + + + delete from t_sys_plugin + where id = #{id,jdbcType=BIGINT} + + + delete from t_sys_plugin + + + + + + insert into t_sys_plugin (id, name, description, + scene, created_at, updated_at, + rec_status) + values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, + #{scene,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, + #{recStatus,jdbcType=TINYINT}) + + + insert into t_sys_plugin + + + id, + + + name, + + + description, + + + scene, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{scene,jdbcType=TINYINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_sys_plugin + + + id = #{record.id,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + scene = #{record.scene,jdbcType=TINYINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_sys_plugin + set id = #{record.id,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + scene = #{record.scene,jdbcType=TINYINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_sys_plugin + + + name = #{name,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + scene = #{scene,jdbcType=TINYINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_sys_plugin + set name = #{name,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + scene = #{scene,jdbcType=TINYINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/SysProjectMapper.xml b/tall/target/classes/mapper_raw/SysProjectMapper.xml new file mode 100644 index 00000000..361eea09 --- /dev/null +++ b/tall/target/classes/mapper_raw/SysProjectMapper.xml @@ -0,0 +1,353 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, creator_id, parent_task_id, scene_id, name, description, begin_time, end_time, + address, published, template, created_at, updated_at, rec_status + + + + + delete from t_sys_project + where id = #{id,jdbcType=BIGINT} + + + delete from t_sys_project + + + + + + insert into t_sys_project (id, creator_id, parent_task_id, + scene_id, name, description, + begin_time, end_time, address, + published, template, created_at, + updated_at, rec_status) + values (#{id,jdbcType=BIGINT}, #{creatorId,jdbcType=BIGINT}, #{parentTaskId,jdbcType=BIGINT}, + #{sceneId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, + #{beginTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, #{address,jdbcType=VARCHAR}, + #{published,jdbcType=TINYINT}, #{template,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) + + + insert into t_sys_project + + + id, + + + creator_id, + + + parent_task_id, + + + scene_id, + + + name, + + + description, + + + begin_time, + + + end_time, + + + address, + + + published, + + + template, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{creatorId,jdbcType=BIGINT}, + + + #{parentTaskId,jdbcType=BIGINT}, + + + #{sceneId,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{beginTime,jdbcType=BIGINT}, + + + #{endTime,jdbcType=BIGINT}, + + + #{address,jdbcType=VARCHAR}, + + + #{published,jdbcType=TINYINT}, + + + #{template,jdbcType=TINYINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_sys_project + + + id = #{record.id,jdbcType=BIGINT}, + + + creator_id = #{record.creatorId,jdbcType=BIGINT}, + + + parent_task_id = #{record.parentTaskId,jdbcType=BIGINT}, + + + scene_id = #{record.sceneId,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + begin_time = #{record.beginTime,jdbcType=BIGINT}, + + + end_time = #{record.endTime,jdbcType=BIGINT}, + + + address = #{record.address,jdbcType=VARCHAR}, + + + published = #{record.published,jdbcType=TINYINT}, + + + template = #{record.template,jdbcType=TINYINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_sys_project + set id = #{record.id,jdbcType=BIGINT}, + creator_id = #{record.creatorId,jdbcType=BIGINT}, + parent_task_id = #{record.parentTaskId,jdbcType=BIGINT}, + scene_id = #{record.sceneId,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + begin_time = #{record.beginTime,jdbcType=BIGINT}, + end_time = #{record.endTime,jdbcType=BIGINT}, + address = #{record.address,jdbcType=VARCHAR}, + published = #{record.published,jdbcType=TINYINT}, + template = #{record.template,jdbcType=TINYINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_sys_project + + + creator_id = #{creatorId,jdbcType=BIGINT}, + + + parent_task_id = #{parentTaskId,jdbcType=BIGINT}, + + + scene_id = #{sceneId,jdbcType=BIGINT}, + + + name = #{name,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + begin_time = #{beginTime,jdbcType=BIGINT}, + + + end_time = #{endTime,jdbcType=BIGINT}, + + + address = #{address,jdbcType=VARCHAR}, + + + published = #{published,jdbcType=TINYINT}, + + + template = #{template,jdbcType=TINYINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_sys_project + set creator_id = #{creatorId,jdbcType=BIGINT}, + parent_task_id = #{parentTaskId,jdbcType=BIGINT}, + scene_id = #{sceneId,jdbcType=BIGINT}, + name = #{name,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + begin_time = #{beginTime,jdbcType=BIGINT}, + end_time = #{endTime,jdbcType=BIGINT}, + address = #{address,jdbcType=VARCHAR}, + published = #{published,jdbcType=TINYINT}, + template = #{template,jdbcType=TINYINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/SysSceneMapper.xml b/tall/target/classes/mapper_raw/SysSceneMapper.xml new file mode 100644 index 00000000..e880194e --- /dev/null +++ b/tall/target/classes/mapper_raw/SysSceneMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, name, description, sequence, created_at, updated_at, rec_status + + + + + delete from t_sys_scene + where id = #{id,jdbcType=BIGINT} + + + delete from t_sys_scene + + + + + + insert into t_sys_scene (id, name, description, + sequence, created_at, updated_at, + rec_status) + values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, + #{sequence,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, + #{recStatus,jdbcType=TINYINT}) + + + insert into t_sys_scene + + + id, + + + name, + + + description, + + + sequence, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{sequence,jdbcType=INTEGER}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_sys_scene + + + id = #{record.id,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + sequence = #{record.sequence,jdbcType=INTEGER}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_sys_scene + set id = #{record.id,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + sequence = #{record.sequence,jdbcType=INTEGER}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_sys_scene + + + name = #{name,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + sequence = #{sequence,jdbcType=INTEGER}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_sys_scene + set name = #{name,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + sequence = #{sequence,jdbcType=INTEGER}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/SysUserMapper.xml b/tall/target/classes/mapper_raw/SysUserMapper.xml new file mode 100644 index 00000000..b1989433 --- /dev/null +++ b/tall/target/classes/mapper_raw/SysUserMapper.xml @@ -0,0 +1,385 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, grade_id, avatar_url, nickname, gender, country, province, city, language, phone, + wechat, email, balance, created_at, updated_at, rec_status + + + + + delete from t_sys_user + where id = #{id,jdbcType=BIGINT} + + + delete from t_sys_user + + + + + + insert into t_sys_user (id, grade_id, avatar_url, + nickname, gender, country, + province, city, language, + phone, wechat, email, + balance, created_at, updated_at, + rec_status) + values (#{id,jdbcType=BIGINT}, #{gradeId,jdbcType=BIGINT}, #{avatarUrl,jdbcType=VARCHAR}, + #{nickname,jdbcType=VARCHAR}, #{gender,jdbcType=TINYINT}, #{country,jdbcType=VARCHAR}, + #{province,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, #{language,jdbcType=VARCHAR}, + #{phone,jdbcType=VARCHAR}, #{wechat,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, + #{balance,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, + #{recStatus,jdbcType=TINYINT}) + + + insert into t_sys_user + + + id, + + + grade_id, + + + avatar_url, + + + nickname, + + + gender, + + + country, + + + province, + + + city, + + + language, + + + phone, + + + wechat, + + + email, + + + balance, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{gradeId,jdbcType=BIGINT}, + + + #{avatarUrl,jdbcType=VARCHAR}, + + + #{nickname,jdbcType=VARCHAR}, + + + #{gender,jdbcType=TINYINT}, + + + #{country,jdbcType=VARCHAR}, + + + #{province,jdbcType=VARCHAR}, + + + #{city,jdbcType=VARCHAR}, + + + #{language,jdbcType=VARCHAR}, + + + #{phone,jdbcType=VARCHAR}, + + + #{wechat,jdbcType=VARCHAR}, + + + #{email,jdbcType=VARCHAR}, + + + #{balance,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_sys_user + + + id = #{record.id,jdbcType=BIGINT}, + + + grade_id = #{record.gradeId,jdbcType=BIGINT}, + + + avatar_url = #{record.avatarUrl,jdbcType=VARCHAR}, + + + nickname = #{record.nickname,jdbcType=VARCHAR}, + + + gender = #{record.gender,jdbcType=TINYINT}, + + + country = #{record.country,jdbcType=VARCHAR}, + + + province = #{record.province,jdbcType=VARCHAR}, + + + city = #{record.city,jdbcType=VARCHAR}, + + + language = #{record.language,jdbcType=VARCHAR}, + + + phone = #{record.phone,jdbcType=VARCHAR}, + + + wechat = #{record.wechat,jdbcType=VARCHAR}, + + + email = #{record.email,jdbcType=VARCHAR}, + + + balance = #{record.balance,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_sys_user + set id = #{record.id,jdbcType=BIGINT}, + grade_id = #{record.gradeId,jdbcType=BIGINT}, + avatar_url = #{record.avatarUrl,jdbcType=VARCHAR}, + nickname = #{record.nickname,jdbcType=VARCHAR}, + gender = #{record.gender,jdbcType=TINYINT}, + country = #{record.country,jdbcType=VARCHAR}, + province = #{record.province,jdbcType=VARCHAR}, + city = #{record.city,jdbcType=VARCHAR}, + language = #{record.language,jdbcType=VARCHAR}, + phone = #{record.phone,jdbcType=VARCHAR}, + wechat = #{record.wechat,jdbcType=VARCHAR}, + email = #{record.email,jdbcType=VARCHAR}, + balance = #{record.balance,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_sys_user + + + grade_id = #{gradeId,jdbcType=BIGINT}, + + + avatar_url = #{avatarUrl,jdbcType=VARCHAR}, + + + nickname = #{nickname,jdbcType=VARCHAR}, + + + gender = #{gender,jdbcType=TINYINT}, + + + country = #{country,jdbcType=VARCHAR}, + + + province = #{province,jdbcType=VARCHAR}, + + + city = #{city,jdbcType=VARCHAR}, + + + language = #{language,jdbcType=VARCHAR}, + + + phone = #{phone,jdbcType=VARCHAR}, + + + wechat = #{wechat,jdbcType=VARCHAR}, + + + email = #{email,jdbcType=VARCHAR}, + + + balance = #{balance,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_sys_user + set grade_id = #{gradeId,jdbcType=BIGINT}, + avatar_url = #{avatarUrl,jdbcType=VARCHAR}, + nickname = #{nickname,jdbcType=VARCHAR}, + gender = #{gender,jdbcType=TINYINT}, + country = #{country,jdbcType=VARCHAR}, + province = #{province,jdbcType=VARCHAR}, + city = #{city,jdbcType=VARCHAR}, + language = #{language,jdbcType=VARCHAR}, + phone = #{phone,jdbcType=VARCHAR}, + wechat = #{wechat,jdbcType=VARCHAR}, + email = #{email,jdbcType=VARCHAR}, + balance = #{balance,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mapper_raw/UserAttentionMapper.xml b/tall/target/classes/mapper_raw/UserAttentionMapper.xml new file mode 100644 index 00000000..f5b99251 --- /dev/null +++ b/tall/target/classes/mapper_raw/UserAttentionMapper.xml @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, user_id, project_id, created_at, updated_at, rec_status + + + + + delete from t_sys_user_attention + where id = #{id,jdbcType=BIGINT} + + + delete from t_sys_user_attention + + + + + + insert into t_sys_user_attention (id, user_id, project_id, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_sys_user_attention + + + id, + + + user_id, + + + project_id, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{userId,jdbcType=BIGINT}, + + + #{projectId,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_sys_user_attention + + + id = #{record.id,jdbcType=BIGINT}, + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + project_id = #{record.projectId,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_sys_user_attention + set id = #{record.id,jdbcType=BIGINT}, + user_id = #{record.userId,jdbcType=BIGINT}, + project_id = #{record.projectId,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_sys_user_attention + + + user_id = #{userId,jdbcType=BIGINT}, + + + project_id = #{projectId,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_sys_user_attention + set user_id = #{userId,jdbcType=BIGINT}, + project_id = #{projectId,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/target/classes/mybatis/mybatis-config.xml b/tall/target/classes/mybatis/mybatis-config.xml new file mode 100644 index 00000000..06ec6488 --- /dev/null +++ b/tall/target/classes/mybatis/mybatis-config.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tall/target/classes/template/excel1.xlsx b/tall/target/classes/template/excel1.xlsx new file mode 100644 index 00000000..8ee32506 Binary files /dev/null and b/tall/target/classes/template/excel1.xlsx differ diff --git a/tall/target/classes/template/excel2.xlsx b/tall/target/classes/template/excel2.xlsx new file mode 100644 index 00000000..d27a5f13 Binary files /dev/null and b/tall/target/classes/template/excel2.xlsx differ diff --git a/tall/target/classes/template/spiderTemplate.docx b/tall/target/classes/template/spiderTemplate.docx new file mode 100644 index 00000000..7c24baba --- /dev/null +++ b/tall/target/classes/template/spiderTemplate.docx @@ -0,0 +1,637 @@ + +中国创新创业大赛北京地区赛2019 + 企业成长组资料填写表 + +一、企业基本信息和概况 + * 企业名称 +-------------------------------------------------------------------------------- + + *统一社会信用 + 代码 + + *成立日期 + + *参赛行业领域 +◎电子信息 ◎互联网 ◎生物医药 ◎先进制造 +◎新能源及节能环保 ◎新材料 + *行政区域 +_________省（自治区、直辖市、计划单列市）_________市（区、县） + *推荐单位 + + *属于国家高新区 + 内的企业 +◎是 ◎否 + +高新区名称________________________（选择列表） +*属于国家级经济开发区内的企业 +◎是 ◎否 + +经济开发区名称________________________（选择列表） + *属于国家级科技企业孵化器内的企业 +◎是 ◎否 + +孵化器名称____________________________________（选择列表） + *属于国家大学 + 科技园内的企业 +◎是 ◎否 + +大学科技园名称______________________________（选择列表） + *国家备案的众创空间内的企业 +◎是 ◎否 + +众创空间名称_____________________（选择列表） + *企业注册类型 +◎内资企业 +◎国有企业 ◎集体企业 ◎股份合作企业 + +◎联营企业 +◎国有联营企业 ◎集体联营企业 ◎国有与集体联营企业 ◎其他联营企业 + +◎有限责任公司 +◎国有独资公司 ◎其他有限责任公司 + +◎股份有限公司 + +◎私营企业 +◎私营独资企业 ◎私营合伙企业 ◎私营有限责任公司 ◎私营股份有限公司 ◎其他企业 + +◎港、澳、台商投资企业 +◎合资经营企业（港、澳、台资） ◎合作经营企业（港、澳、台资） ◎港、澳、台商独资经营企业 ◎港、澳、台商投资股份有限公司 ◎其他港、澳、台商投资企业 + +◎外商投资企业 +◎中外合资经营企业 ◎中外合作经营企业 ◎外资企业 ◎外商投资股份有限公司 ◎其他外商投资企业 + *注册资本 + (万元人民币) + + 实收资本 +(万元人民币) + + * 企业注册地址 +省、市、县/区 + 邮政编码 + + *通信地址 + + 邮政编码 + + 企业网址 + + 企业官方微信 + + + *姓名 + *国籍 + *性别 + *出生年月 + *学历 + *职位 + 座机 + *手机 + *E-mail + *企业法定代表人 + + + + + + + + + + *企业负责人 + + + + + + + + + + *联 系 人 + + + + + + + + + + *职工总数 + 只能填整数 + *直接从事研发科技人员数 + 只填数 + *上年度吸纳高校应届毕业生人数 + 只填数 + *人员结构 + 学 历 + 博 士 + 硕 士 + 本 科 + 大专及以下 + 人 数 + + + + + 职 称 + 高级职称 + 中级职称 + 初级职称 + 高级技工 + 人 数 + + + + +*上市公司控股企业 +□是 □否 +*新三板企业 +□是 □否 +*高新技术企业 +□是 □否 +获得时间 + +*登记入库的科技型中小企业 +□是 □否 + 拥有国家或省部级以上研发机构情况表 +（可增加） + 研发机构名称 + 研发机构级别 + 证明文件名称 + + +□国家级 □省部级 + + 获奖与支持 +企业近五年内获得国家级科技奖励情况表（可增加） + 奖励成果名称 + 排名 + 证明文件名称 + + + + + + +企业获得的省部级科技类奖项（可增加） + 获奖名称 + 排名 + 证明文件名称 + + + + +* 核心技术 +（可复选项） + □专 利（可增加） + + 专 利 名 + 专利类型 + 获得方式 + 专利号 + 获得时间 + + + +□自主研发 + + + + + +□权利转移获得 +□国外 +□国内 +□高校 +□科研院所 +□企业 +□其他 + + + +*专利类型：1发明专利 2实用新型专利 3外观设计 + + □软件著作权 +（可增加） + 软件著作权名 + 软件著作权人 + 登记号 + 获得时间 + + + + + + + +□集成电路布图设计专有权 + + + □药品批文（可增加） + 药品名称 + 国家新药 + 国家一级中药保护品种 +药品批准文号 + 有效日期 + + + + + + + + + □医疗器械注册证 + 产品名称 + 医疗器械注册号 + 有效日期 + + + + + + + 植物新品种（可增加） + + 国家级农作物品种（可增加） + + + 企业参与国际、国家或行业标准制定情况表（可增加） + + 标准名称 + 标准级别 + 标准编号 + 起草单位中的地位 + + + ◎国际 ◎国家 ◎行业 + + ◎ 牵头 ◎参与 + +□无 + *企业概要 + （不超1000字） +文字提示：公司简介，主要业务、产品等 +重点提炼：核心竞争力，文字不得少于200字（系统自动判断） + *关 键 词 +填写与企业及产品等相关的关键词 + + + + +二、股东信息 + * 股东信息 + *股东名称/姓名 + *股东类型 + *应缴金额 + （万元￥） + *实缴金额 + （万元￥） + *出资形式 + *股份比例 + + + + + + + + + + + + + + + + + + +* 融资经历 + 股权融资（□有/□无） + 投资人/投资机构 + 融资金额（万元￥） + 所占股权比例 + 投资时间 + + + + + 现融资阶段 +□天使 □ A轮 □ B轮 □ C轮 □ 其他_______ + 债权融资（□有/□无） + 出借方 + 贷款金额（万元￥） + 贷款启动时间 + 贷款结束时间 + + + + + +* 股东类型：1．自然人 2.上市公司 3.投资机构 4. 国有法人 5.其他 +* 万元人民币：小数点后保留两位数 +* 出资形式包括：1.货币 2.实物 3.知识产权 4.土地使用权 + + +三、核心团队（最少三人） + * 核心团队成员（最少三人） + 姓 名 + 性 别 + 出生年月 + 全 职 + 职 位 + 职 称 + + + + + + + 最高学历 + 留学经历 + 大学生科技企业 + 院 士 + 创业次数 + 下拉选 + 是/否 + 是/否 + □中科院 □工程院 + + 手 机 + +大学生科技企业：是指由大学生独自创办或大学生团队合作创办的科技型小企业，具备独立企业法人资格；大学生本人为本企业的专职人员，负责本企业主要的技术研发或经营管理，承担主要职责。（大学生，是指高等院校在读或毕业未超过两年的大学生、研究生。） + 教育经历（可增加） + 学历 + 毕业学院 + 专业 + 毕业时间 + + + + 主要工作经历/主要成就 + + 姓 名 + 性 别 + 出生年月 + 全 职 + 职 位 + 职 称 + + + + 是/否 + + + 最高学历 + 留学经历 + 大学生科技企业 + 院 士 + 创业次数 + + + 是/否 + □中科院 □工程院 + + 手 机 + + 教育经历（可增加） + 学历 + 毕业学院 + 专业 + 毕业时间 + + + + 主要工作经历/主要成就 + + 姓 名 + 性 别 + 出生年月 + 全 职 + 职 位 + 职 称 + + + + 是/否 + + + 最高学历 + 留学经历 + 大学生科技企业 + 院 士 + 创业次数 + + 是/否 + 是/否 + □中科院 □工程院 + + 手 机 + + 教育经历（可增加） + 学历 + 毕业学院 + 专业 + 毕业时间 + + + + 主要工作经历/主要成就 + +三、商业计划书 + （注：模版仅供参考） +*参赛项目名称 + +参赛项目产品图片 +（上传产品图片，上传要求） +参赛项目收入占去年企业营业收入比例 +____% +*参赛项目介绍（1000字以内） +项目介绍、产品、技术介绍，文字不得少于200字（系统自动判断） +* 产品市场分析及竞争优势 +（行业历史与前景分析与预测，产品市场概况，市场需求，规模及增长趋势，市场定位，市场销售预测，进入该行业的技术壁垒，贸易壁垒，政策限制，其他； +产品竞争优势,竞争对手分析，如成本、价格优势、以及产品性能、品牌、销售渠道优于竞争对手产品等） +* 当前五大客户 +* 当前五大供应商 + + +* 市场竞争分析 +国内市场地位排名 +第_____名（1-10名次选择） +市场份额占有率_________% +主要市场竞争对手 +竞争对手名称 +（可增加） + +□国际竞争对手 □国内竞争对手 + +竞争对手是上市公司 +□是/□否 +竞争对手市场份额占有率 +_________% +* 商业模式及业务拓展计划 +（产品的市场营销策略，产品的获利模式;在建立销售网络、销售渠道、设立代理商、分销商方面的策略；在广告促销方面、产品销售价格及建立良好销售队伍方面的策略；如何保证销售策略具体实施的有效性；对销售队伍采取什么样的激励机制等)文字不得少于100字（系统自动判断） +* 经营风险与对策 +(包括：政策风险、技术开发风险、经营管理风险、市场开拓风险、生产风险、财务风险、汇率风险、对公司关键人员依赖的风险等，提出有效的风险控制和防范手段)文字不得少于50字（系统自动判断） +法律风险（可增加） +□经济诉讼 +□环保诉讼 +□其它 +诉讼原因 + + + +诉讼内容 + +* 企业管理模式 +（机构设置，员工持股，劳动合同，知识产权管理，规章制度等）文字不得少于20字（系统自动判断） +公司对管理层及关键人员是否已采取激励措施？（□是/□否） +公司是否考虑员工持股问题？（□是/□否） +* 企业其他技术、产品及服务（1000字以内） +文字不得少于50字（系统自动判断） +*历史财务数据 +注意：以下财务数据是企业整体财务数据 单位：万元人民币，小数点后两位 +科 目 + 2016年 + 2017年 + 2018年 +营业收入 + + +不能超过2亿 +营业成本 +不能为"0" +不能为"0" +不能为"0" +营业费用 + + + +管理费用 + + + +财务费用 + + + +投入研发费用总额 + + + +营业利润 + + + +利润总额 + + + +所得税 + + + +净利润 + + + +资产总计 +不能为"0" +不能为"0" +不能为"0" +负债总计 + + + +净资产（所有者权益） + + + +* 财务预测 +科 目 + 2019年 + 2020年 + 2021年 +营业收入 + + + +营业成本 +不能为"0" +不能为"0" +不能为"0" +营业税金及附加 + + + +净利润 + + + + + +四、创业服务需求（可复选项） +* 参赛目的 +-------------------------------------------------------------------------------- +◎获得荣誉 ◎寻求股权融资机会 ◎寻求债权融资机会 +◎寻求学习交流机会 ◎寻求政府政策支持 ◎宣传展示 ◎其他_______ +□并购需求 +□愿意被上市公司等其他企业并购 + +□愿意并购其他相关企业 + 申请大赛组织的大企业对接活动（□是/□否） + 债权融资需求（□有/□无） + 融资金额（万元￥） + 可以接受的最高年利率% + 融资时间 + + + +资金使用计划 +（资金使用方向细目。包括固定资产投入、在建工程、研发投入、管理费等，希望投资机构提供哪些增值服务？） + 申请大赛推荐信贷机构（□是/□否） + 股权融资需求（□有/□无） + 融资金额（万元￥） + 拟出让股权比例 + 融资时间 + + + +资金使用计划 +（资金使用方向细目。包括固定资产投入、在建工程、研发投入、管理费等,希望投资机构提供哪些增值服务？） + 申请大赛推荐投资机构（□是/□否） + 申请大赛组织的融资路演（□是/□否） +□申请国家科技成果转化引导基金设立的子基金推荐 + +□北京国科瑞华战略性新兴产业投资基金（有限合伙） +基金规模：221619万元，投资领域：高端装备制造、信息技术、消费与生命健康 + +□北京君联成业股权投资合伙企业（有限合伙） +基金规模：170000 万元，投资领域：智能制造、专业服务、TMT及创新消费 + +□天津天创盈鑫创业投资合伙企业 +基金规模：28600万元， 投资领域：节能环保、信息技术、先进制造 + +□国投（上海）科技成果转化创业投资基金企业（有限合伙） +基金规模：1000000 万元，投资领域：电子信息、先进制造、能源环保、生物医药等领域重大专项科技成果转化 + +□国投京津冀科技成果转化创业投资基金（有限合伙） +基金规模：100000 万元，投资领域：信息技术、先进制造、生物医药等 + +□新能源汽车科技创新（合肥）股权投资合伙企业（有限合伙） +基金规模：50000 万元，投资领域： 新能源汽车及相关产业 + +□上海高特佳懿海投资合伙企业（有限合伙） +基金规模：35243.2万元， 投资领域： 生物医药等 + +□苏州瑞华投资合伙企业（有限合伙） +基金规模：100000 万元，投资领域： 生物医药、电子信息、新材料 + + + +更多大赛信息请关注北京赛区微信公众号： + + diff --git a/tall/target/classes/template/spiderTemplate.xlsx b/tall/target/classes/template/spiderTemplate.xlsx new file mode 100644 index 00000000..41a009ac Binary files /dev/null and b/tall/target/classes/template/spiderTemplate.xlsx differ diff --git a/tall/target/classes/template/wordTemplate.docx b/tall/target/classes/template/wordTemplate.docx new file mode 100644 index 00000000..25678060 --- /dev/null +++ b/tall/target/classes/template/wordTemplate.docx @@ -0,0 +1,132 @@ + TPD致动器老化测试报告 +老化设备编号 + +老化时间 + +温度（℃） + +湿度 + +设定速度（r/min） + +正转时间（s） + +停顿时间（s） + +反转时间（s） + +循环次数 + +累计时间（h） + + 产品编号 + 试验结果 + 产品编号 + 试验结果 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 不良产品数量(台) + + 不良率 + + 实验结论 + + diff --git a/util/target/classes/META-INF/spring-configuration-metadata.json b/util/target/classes/META-INF/spring-configuration-metadata.json new file mode 100644 index 00000000..017a538b --- /dev/null +++ b/util/target/classes/META-INF/spring-configuration-metadata.json @@ -0,0 +1,173 @@ +{ + "groups": [ + { + "name": "spring.datasource.druid", + "type": "com.ccsens.util.config.DruidProps", + "sourceType": "com.ccsens.util.config.DruidProps" + } + ], + "properties": [ + { + "name": "spring.datasource.druid.connection-properties", + "type": "java.lang.String", + "sourceType": "com.ccsens.util.config.DruidProps" + }, + { + "name": "spring.datasource.druid.driver-class-name", + "type": "java.lang.String", + "sourceType": "com.ccsens.util.config.DruidProps" + }, + { + "name": "spring.datasource.druid.dynamic-url", + "type": "java.lang.String", + "sourceType": "com.ccsens.util.config.DruidProps" + }, + { + "name": "spring.datasource.druid.filter-exclusions", + "type": "java.lang.String", + "sourceType": "com.ccsens.util.config.DruidProps" + }, + { + "name": "spring.datasource.druid.filter-name", + "type": "java.lang.String", + "sourceType": "com.ccsens.util.config.DruidProps" + }, + { + "name": "spring.datasource.druid.filter-profile-enable", + "type": "java.lang.String", + "sourceType": "com.ccsens.util.config.DruidProps" + }, + { + "name": "spring.datasource.druid.filter-url-pattern", + "type": "java.lang.String", + "sourceType": "com.ccsens.util.config.DruidProps" + }, + { + "name": "spring.datasource.druid.filters", + "type": "java.lang.String", + "sourceType": "com.ccsens.util.config.DruidProps" + }, + { + "name": "spring.datasource.druid.initial-size", + "type": "java.lang.Integer", + "sourceType": "com.ccsens.util.config.DruidProps", + "defaultValue": 0 + }, + { + "name": "spring.datasource.druid.log-slow-sql", + "type": "java.lang.String", + "sourceType": "com.ccsens.util.config.DruidProps" + }, + { + "name": "spring.datasource.druid.max-active", + "type": "java.lang.Integer", + "sourceType": "com.ccsens.util.config.DruidProps", + "defaultValue": 0 + }, + { + "name": "spring.datasource.druid.max-pool-prepared-statement-per-connection-size", + "type": "java.lang.Integer", + "sourceType": "com.ccsens.util.config.DruidProps", + "defaultValue": 0 + }, + { + "name": "spring.datasource.druid.max-wait", + "type": "java.lang.Integer", + "sourceType": "com.ccsens.util.config.DruidProps", + "defaultValue": 0 + }, + { + "name": "spring.datasource.druid.min-evictable-idle-time-millis", + "type": "java.lang.Integer", + "sourceType": "com.ccsens.util.config.DruidProps", + "defaultValue": 0 + }, + { + "name": "spring.datasource.druid.min-idle", + "type": "java.lang.Integer", + "sourceType": "com.ccsens.util.config.DruidProps", + "defaultValue": 0 + }, + { + "name": "spring.datasource.druid.password", + "type": "java.lang.String", + "sourceType": "com.ccsens.util.config.DruidProps" + }, + { + "name": "spring.datasource.druid.pool-prepared-statements", + "type": "java.lang.Boolean", + "sourceType": "com.ccsens.util.config.DruidProps", + "defaultValue": false + }, + { + "name": "spring.datasource.druid.servlet-log-slow-sql", + "type": "java.lang.String", + "sourceType": "com.ccsens.util.config.DruidProps" + }, + { + "name": "spring.datasource.druid.servlet-login-password", + "type": "java.lang.String", + "sourceType": "com.ccsens.util.config.DruidProps" + }, + { + "name": "spring.datasource.druid.servlet-login-username", + "type": "java.lang.String", + "sourceType": "com.ccsens.util.config.DruidProps" + }, + { + "name": "spring.datasource.druid.servlet-name", + "type": "java.lang.String", + "sourceType": "com.ccsens.util.config.DruidProps" + }, + { + "name": "spring.datasource.druid.servlet-reset-enable", + "type": "java.lang.String", + "sourceType": "com.ccsens.util.config.DruidProps" + }, + { + "name": "spring.datasource.druid.servlet-url-mapping", + "type": "java.lang.String", + "sourceType": "com.ccsens.util.config.DruidProps" + }, + { + "name": "spring.datasource.druid.test-on-borrow", + "type": "java.lang.Boolean", + "sourceType": "com.ccsens.util.config.DruidProps", + "defaultValue": false + }, + { + "name": "spring.datasource.druid.test-on-return", + "type": "java.lang.Boolean", + "sourceType": "com.ccsens.util.config.DruidProps", + "defaultValue": false + }, + { + "name": "spring.datasource.druid.test-while-idle", + "type": "java.lang.Boolean", + "sourceType": "com.ccsens.util.config.DruidProps", + "defaultValue": false + }, + { + "name": "spring.datasource.druid.time-between-eviction-runs-millis", + "type": "java.lang.Integer", + "sourceType": "com.ccsens.util.config.DruidProps", + "defaultValue": 0 + }, + { + "name": "spring.datasource.druid.url", + "type": "java.lang.String", + "sourceType": "com.ccsens.util.config.DruidProps" + }, + { + "name": "spring.datasource.druid.username", + "type": "java.lang.String", + "sourceType": "com.ccsens.util.config.DruidProps" + }, + { + "name": "spring.datasource.druid.validation-query", + "type": "java.lang.String", + "sourceType": "com.ccsens.util.config.DruidProps" + } + ], + "hints": [] +} \ No newline at end of file diff --git a/util/target/classes/com/ccsens/util/BeanWrapperUtil.class b/util/target/classes/com/ccsens/util/BeanWrapperUtil.class new file mode 100644 index 00000000..f55c777e Binary files /dev/null and b/util/target/classes/com/ccsens/util/BeanWrapperUtil.class differ diff --git a/util/target/classes/com/ccsens/util/CodeEnum.class b/util/target/classes/com/ccsens/util/CodeEnum.class new file mode 100644 index 00000000..e34daf8c Binary files /dev/null and b/util/target/classes/com/ccsens/util/CodeEnum.class differ diff --git a/util/target/classes/com/ccsens/util/DateUtil.class b/util/target/classes/com/ccsens/util/DateUtil.class new file mode 100644 index 00000000..01db8cef Binary files /dev/null and b/util/target/classes/com/ccsens/util/DateUtil.class differ diff --git a/util/target/classes/com/ccsens/util/ExcelUtil.class b/util/target/classes/com/ccsens/util/ExcelUtil.class new file mode 100644 index 00000000..a310ef47 Binary files /dev/null and b/util/target/classes/com/ccsens/util/ExcelUtil.class differ diff --git a/util/target/classes/com/ccsens/util/GenericsUtils.class b/util/target/classes/com/ccsens/util/GenericsUtils.class new file mode 100644 index 00000000..6de935b1 Binary files /dev/null and b/util/target/classes/com/ccsens/util/GenericsUtils.class differ diff --git a/util/target/classes/com/ccsens/util/GetUserInfoException.class b/util/target/classes/com/ccsens/util/GetUserInfoException.class new file mode 100644 index 00000000..2d9bcf4d Binary files /dev/null and b/util/target/classes/com/ccsens/util/GetUserInfoException.class differ diff --git a/util/target/classes/com/ccsens/util/HttpServletUtil.class b/util/target/classes/com/ccsens/util/HttpServletUtil.class new file mode 100644 index 00000000..a7380021 Binary files /dev/null and b/util/target/classes/com/ccsens/util/HttpServletUtil.class differ diff --git a/util/target/classes/com/ccsens/util/HttpsUtil.class b/util/target/classes/com/ccsens/util/HttpsUtil.class new file mode 100644 index 00000000..724d0992 Binary files /dev/null and b/util/target/classes/com/ccsens/util/HttpsUtil.class differ diff --git a/util/target/classes/com/ccsens/util/ImgUtil.class b/util/target/classes/com/ccsens/util/ImgUtil.class new file mode 100644 index 00000000..4c64b886 Binary files /dev/null and b/util/target/classes/com/ccsens/util/ImgUtil.class differ diff --git a/util/target/classes/com/ccsens/util/JacksonUtil$1.class b/util/target/classes/com/ccsens/util/JacksonUtil$1.class new file mode 100644 index 00000000..effa7f21 Binary files /dev/null and b/util/target/classes/com/ccsens/util/JacksonUtil$1.class differ diff --git a/util/target/classes/com/ccsens/util/JacksonUtil.class b/util/target/classes/com/ccsens/util/JacksonUtil.class new file mode 100644 index 00000000..17d75370 Binary files /dev/null and b/util/target/classes/com/ccsens/util/JacksonUtil.class differ diff --git a/util/target/classes/com/ccsens/util/JsonResponse$RegularError.class b/util/target/classes/com/ccsens/util/JsonResponse$RegularError.class new file mode 100644 index 00000000..6ae2e5c2 Binary files /dev/null and b/util/target/classes/com/ccsens/util/JsonResponse$RegularError.class differ diff --git a/util/target/classes/com/ccsens/util/JsonResponse$TokenError.class b/util/target/classes/com/ccsens/util/JsonResponse$TokenError.class new file mode 100644 index 00000000..63bfec13 Binary files /dev/null and b/util/target/classes/com/ccsens/util/JsonResponse$TokenError.class differ diff --git a/util/target/classes/com/ccsens/util/JsonResponse.class b/util/target/classes/com/ccsens/util/JsonResponse.class new file mode 100644 index 00000000..f64fbfbe Binary files /dev/null and b/util/target/classes/com/ccsens/util/JsonResponse.class differ diff --git a/util/target/classes/com/ccsens/util/JsonResponse1$Data.class b/util/target/classes/com/ccsens/util/JsonResponse1$Data.class new file mode 100644 index 00000000..f27b6feb Binary files /dev/null and b/util/target/classes/com/ccsens/util/JsonResponse1$Data.class differ diff --git a/util/target/classes/com/ccsens/util/JsonResponse1$Link.class b/util/target/classes/com/ccsens/util/JsonResponse1$Link.class new file mode 100644 index 00000000..d6b65d44 Binary files /dev/null and b/util/target/classes/com/ccsens/util/JsonResponse1$Link.class differ diff --git a/util/target/classes/com/ccsens/util/JsonResponse1$Meta$RegularError.class b/util/target/classes/com/ccsens/util/JsonResponse1$Meta$RegularError.class new file mode 100644 index 00000000..f85946c8 Binary files /dev/null and b/util/target/classes/com/ccsens/util/JsonResponse1$Meta$RegularError.class differ diff --git a/util/target/classes/com/ccsens/util/JsonResponse1$Meta$TokenError.class b/util/target/classes/com/ccsens/util/JsonResponse1$Meta$TokenError.class new file mode 100644 index 00000000..40fea1e0 Binary files /dev/null and b/util/target/classes/com/ccsens/util/JsonResponse1$Meta$TokenError.class differ diff --git a/util/target/classes/com/ccsens/util/JsonResponse1$Meta.class b/util/target/classes/com/ccsens/util/JsonResponse1$Meta.class new file mode 100644 index 00000000..c1a3b4c0 Binary files /dev/null and b/util/target/classes/com/ccsens/util/JsonResponse1$Meta.class differ diff --git a/util/target/classes/com/ccsens/util/JsonResponse1.class b/util/target/classes/com/ccsens/util/JsonResponse1.class new file mode 100644 index 00000000..1fea51aa Binary files /dev/null and b/util/target/classes/com/ccsens/util/JsonResponse1.class differ diff --git a/util/target/classes/com/ccsens/util/JsonResponse2$RegularError.class b/util/target/classes/com/ccsens/util/JsonResponse2$RegularError.class new file mode 100644 index 00000000..a26c10a3 Binary files /dev/null and b/util/target/classes/com/ccsens/util/JsonResponse2$RegularError.class differ diff --git a/util/target/classes/com/ccsens/util/JsonResponse2$TokenError.class b/util/target/classes/com/ccsens/util/JsonResponse2$TokenError.class new file mode 100644 index 00000000..e6521c73 Binary files /dev/null and b/util/target/classes/com/ccsens/util/JsonResponse2$TokenError.class differ diff --git a/util/target/classes/com/ccsens/util/JsonResponse2.class b/util/target/classes/com/ccsens/util/JsonResponse2.class new file mode 100644 index 00000000..e79624e0 Binary files /dev/null and b/util/target/classes/com/ccsens/util/JsonResponse2.class differ diff --git a/util/target/classes/com/ccsens/util/JwtUtil$JwtError.class b/util/target/classes/com/ccsens/util/JwtUtil$JwtError.class new file mode 100644 index 00000000..3a37408e Binary files /dev/null and b/util/target/classes/com/ccsens/util/JwtUtil$JwtError.class differ diff --git a/util/target/classes/com/ccsens/util/JwtUtil.class b/util/target/classes/com/ccsens/util/JwtUtil.class new file mode 100644 index 00000000..7fa2b7f6 Binary files /dev/null and b/util/target/classes/com/ccsens/util/JwtUtil.class differ diff --git a/util/target/classes/com/ccsens/util/Md5Util.class b/util/target/classes/com/ccsens/util/Md5Util.class new file mode 100644 index 00000000..08670699 Binary files /dev/null and b/util/target/classes/com/ccsens/util/Md5Util.class differ diff --git a/util/target/classes/com/ccsens/util/MyJacksonObjectMapper.class b/util/target/classes/com/ccsens/util/MyJacksonObjectMapper.class new file mode 100644 index 00000000..a7d7635e Binary files /dev/null and b/util/target/classes/com/ccsens/util/MyJacksonObjectMapper.class differ diff --git a/util/target/classes/com/ccsens/util/MyX509TrustManager.class b/util/target/classes/com/ccsens/util/MyX509TrustManager.class new file mode 100644 index 00000000..3a6abb68 Binary files /dev/null and b/util/target/classes/com/ccsens/util/MyX509TrustManager.class differ diff --git a/util/target/classes/com/ccsens/util/NotSupportedFileTypeException.class b/util/target/classes/com/ccsens/util/NotSupportedFileTypeException.class new file mode 100644 index 00000000..3ee1c12a Binary files /dev/null and b/util/target/classes/com/ccsens/util/NotSupportedFileTypeException.class differ diff --git a/util/target/classes/com/ccsens/util/PasswordEncryptionUtil.class b/util/target/classes/com/ccsens/util/PasswordEncryptionUtil.class new file mode 100644 index 00000000..e9d8cd69 Binary files /dev/null and b/util/target/classes/com/ccsens/util/PasswordEncryptionUtil.class differ diff --git a/util/target/classes/com/ccsens/util/PayException.class b/util/target/classes/com/ccsens/util/PayException.class new file mode 100644 index 00000000..b935c935 Binary files /dev/null and b/util/target/classes/com/ccsens/util/PayException.class differ diff --git a/util/target/classes/com/ccsens/util/PoiUtil.class b/util/target/classes/com/ccsens/util/PoiUtil.class new file mode 100644 index 00000000..d1b82aaa Binary files /dev/null and b/util/target/classes/com/ccsens/util/PoiUtil.class differ diff --git a/util/target/classes/com/ccsens/util/PropUtil.class b/util/target/classes/com/ccsens/util/PropUtil.class new file mode 100644 index 00000000..01589977 Binary files /dev/null and b/util/target/classes/com/ccsens/util/PropUtil.class differ diff --git a/util/target/classes/com/ccsens/util/RedisKeyManager.class b/util/target/classes/com/ccsens/util/RedisKeyManager.class new file mode 100644 index 00000000..8693360e Binary files /dev/null and b/util/target/classes/com/ccsens/util/RedisKeyManager.class differ diff --git a/util/target/classes/com/ccsens/util/RedisUtil.class b/util/target/classes/com/ccsens/util/RedisUtil.class new file mode 100644 index 00000000..5cef17ae Binary files /dev/null and b/util/target/classes/com/ccsens/util/RedisUtil.class differ diff --git a/util/target/classes/com/ccsens/util/SQLUtil.class b/util/target/classes/com/ccsens/util/SQLUtil.class new file mode 100644 index 00000000..4b1ac285 Binary files /dev/null and b/util/target/classes/com/ccsens/util/SQLUtil.class differ diff --git a/util/target/classes/com/ccsens/util/Sha1Util.class b/util/target/classes/com/ccsens/util/Sha1Util.class new file mode 100644 index 00000000..a885e8b2 Binary files /dev/null and b/util/target/classes/com/ccsens/util/Sha1Util.class differ diff --git a/util/target/classes/com/ccsens/util/ShiroKit.class b/util/target/classes/com/ccsens/util/ShiroKit.class new file mode 100644 index 00000000..0f7c240e Binary files /dev/null and b/util/target/classes/com/ccsens/util/ShiroKit.class differ diff --git a/util/target/classes/com/ccsens/util/SmsUtil.class b/util/target/classes/com/ccsens/util/SmsUtil.class new file mode 100644 index 00000000..a19c30bc Binary files /dev/null and b/util/target/classes/com/ccsens/util/SmsUtil.class differ diff --git a/util/target/classes/com/ccsens/util/SpringContextUtils.class b/util/target/classes/com/ccsens/util/SpringContextUtils.class new file mode 100644 index 00000000..7315b524 Binary files /dev/null and b/util/target/classes/com/ccsens/util/SpringContextUtils.class differ diff --git a/util/target/classes/com/ccsens/util/StringUtil.class b/util/target/classes/com/ccsens/util/StringUtil.class new file mode 100644 index 00000000..86deaf27 Binary files /dev/null and b/util/target/classes/com/ccsens/util/StringUtil.class differ diff --git a/util/target/classes/com/ccsens/util/ToolUtil.class b/util/target/classes/com/ccsens/util/ToolUtil.class new file mode 100644 index 00000000..d17aae60 Binary files /dev/null and b/util/target/classes/com/ccsens/util/ToolUtil.class differ diff --git a/util/target/classes/com/ccsens/util/UploadFileUtil_Servlet3.class b/util/target/classes/com/ccsens/util/UploadFileUtil_Servlet3.class new file mode 100644 index 00000000..911e5a04 Binary files /dev/null and b/util/target/classes/com/ccsens/util/UploadFileUtil_Servlet3.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$APP_SCENE.class b/util/target/classes/com/ccsens/util/WebConstant$APP_SCENE.class new file mode 100644 index 00000000..b1fa685e Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$APP_SCENE.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$CLIENT_TYPE.class b/util/target/classes/com/ccsens/util/WebConstant$CLIENT_TYPE.class new file mode 100644 index 00000000..415a18e3 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$CLIENT_TYPE.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$EVENT_PROCESS.class b/util/target/classes/com/ccsens/util/WebConstant$EVENT_PROCESS.class new file mode 100644 index 00000000..26e7d385 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$EVENT_PROCESS.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$Gender.class b/util/target/classes/com/ccsens/util/WebConstant$Gender.class new file mode 100644 index 00000000..b9602ca7 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$Gender.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$IDENTIFY_TYPE.class b/util/target/classes/com/ccsens/util/WebConstant$IDENTIFY_TYPE.class new file mode 100644 index 00000000..fa0f22d1 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$IDENTIFY_TYPE.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$Message_Ack_Event.class b/util/target/classes/com/ccsens/util/WebConstant$Message_Ack_Event.class new file mode 100644 index 00000000..c73f94ff Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$Message_Ack_Event.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$Message_Admin_Event.class b/util/target/classes/com/ccsens/util/WebConstant$Message_Admin_Event.class new file mode 100644 index 00000000..fa1ce0e4 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$Message_Admin_Event.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$Message_Auth_Event.class b/util/target/classes/com/ccsens/util/WebConstant$Message_Auth_Event.class new file mode 100644 index 00000000..6269d24d Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$Message_Auth_Event.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$Message_BatchSetting_Event.class b/util/target/classes/com/ccsens/util/WebConstant$Message_BatchSetting_Event.class new file mode 100644 index 00000000..a90dc991 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$Message_BatchSetting_Event.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$Message_Channel_Event.class b/util/target/classes/com/ccsens/util/WebConstant$Message_Channel_Event.class new file mode 100644 index 00000000..b982e693 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$Message_Channel_Event.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$Message_Deliver_Event.class b/util/target/classes/com/ccsens/util/WebConstant$Message_Deliver_Event.class new file mode 100644 index 00000000..d381a463 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$Message_Deliver_Event.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$Message_Heart_Event.class b/util/target/classes/com/ccsens/util/WebConstant$Message_Heart_Event.class new file mode 100644 index 00000000..8c3efd9f Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$Message_Heart_Event.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$Message_MasterStatus_Event.class b/util/target/classes/com/ccsens/util/WebConstant$Message_MasterStatus_Event.class new file mode 100644 index 00000000..3516364f Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$Message_MasterStatus_Event.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$Message_Node_Event.class b/util/target/classes/com/ccsens/util/WebConstant$Message_Node_Event.class new file mode 100644 index 00000000..739aee77 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$Message_Node_Event.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$Message_Ring_Event.class b/util/target/classes/com/ccsens/util/WebConstant$Message_Ring_Event.class new file mode 100644 index 00000000..bbc2b334 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$Message_Ring_Event.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$Message_Sync_Event.class b/util/target/classes/com/ccsens/util/WebConstant$Message_Sync_Event.class new file mode 100644 index 00000000..1903a4bb Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$Message_Sync_Event.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$Message_Type.class b/util/target/classes/com/ccsens/util/WebConstant$Message_Type.class new file mode 100644 index 00000000..ea839ae0 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$Message_Type.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$Message_User_Event.class b/util/target/classes/com/ccsens/util/WebConstant$Message_User_Event.class new file mode 100644 index 00000000..50d1e2a1 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$Message_User_Event.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$NODE_USER_ROLE_TYPE.class b/util/target/classes/com/ccsens/util/WebConstant$NODE_USER_ROLE_TYPE.class new file mode 100644 index 00000000..9b38d1bc Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$NODE_USER_ROLE_TYPE.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$PARTI_DEVICE_TYPE.class b/util/target/classes/com/ccsens/util/WebConstant$PARTI_DEVICE_TYPE.class new file mode 100644 index 00000000..5f8b2078 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$PARTI_DEVICE_TYPE.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$PARTI_LOGIN_STATUS.class b/util/target/classes/com/ccsens/util/WebConstant$PARTI_LOGIN_STATUS.class new file mode 100644 index 00000000..02666b85 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$PARTI_LOGIN_STATUS.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$PartiVerify.class b/util/target/classes/com/ccsens/util/WebConstant$PartiVerify.class new file mode 100644 index 00000000..beae9f32 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$PartiVerify.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$Parti_Verify_Type.class b/util/target/classes/com/ccsens/util/WebConstant$Parti_Verify_Type.class new file mode 100644 index 00000000..4298133f Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$Parti_Verify_Type.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$REC_STATUS.class b/util/target/classes/com/ccsens/util/WebConstant$REC_STATUS.class new file mode 100644 index 00000000..9203a1ee Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$REC_STATUS.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$ROLE_NAME.class b/util/target/classes/com/ccsens/util/WebConstant$ROLE_NAME.class new file mode 100644 index 00000000..b8de21a1 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$ROLE_NAME.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$Role.class b/util/target/classes/com/ccsens/util/WebConstant$Role.class new file mode 100644 index 00000000..e15c7fe0 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$Role.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$TASK_DELAY.class b/util/target/classes/com/ccsens/util/WebConstant$TASK_DELAY.class new file mode 100644 index 00000000..a9d3a5e0 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$TASK_DELAY.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$TASK_Execute_Type.class b/util/target/classes/com/ccsens/util/WebConstant$TASK_Execute_Type.class new file mode 100644 index 00000000..f51a2d33 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$TASK_Execute_Type.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$TASK_LEVEL.class b/util/target/classes/com/ccsens/util/WebConstant$TASK_LEVEL.class new file mode 100644 index 00000000..9bacb296 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$TASK_LEVEL.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$TASK_VIRTUAL.class b/util/target/classes/com/ccsens/util/WebConstant$TASK_VIRTUAL.class new file mode 100644 index 00000000..dd339aae Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$TASK_VIRTUAL.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant$Task_Check_Status.class b/util/target/classes/com/ccsens/util/WebConstant$Task_Check_Status.class new file mode 100644 index 00000000..296c490d Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant$Task_Check_Status.class differ diff --git a/util/target/classes/com/ccsens/util/WebConstant.class b/util/target/classes/com/ccsens/util/WebConstant.class new file mode 100644 index 00000000..ceb2ae4c Binary files /dev/null and b/util/target/classes/com/ccsens/util/WebConstant.class differ diff --git a/util/target/classes/com/ccsens/util/WechatUtil$PreparePayBean.class b/util/target/classes/com/ccsens/util/WechatUtil$PreparePayBean.class new file mode 100644 index 00000000..b524e9b1 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WechatUtil$PreparePayBean.class differ diff --git a/util/target/classes/com/ccsens/util/WechatUtil$PreparePayReSignBean.class b/util/target/classes/com/ccsens/util/WechatUtil$PreparePayReSignBean.class new file mode 100644 index 00000000..9d128638 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WechatUtil$PreparePayReSignBean.class differ diff --git a/util/target/classes/com/ccsens/util/WechatUtil$PreparePayResultBean.class b/util/target/classes/com/ccsens/util/WechatUtil$PreparePayResultBean.class new file mode 100644 index 00000000..d7b67b63 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WechatUtil$PreparePayResultBean.class differ diff --git a/util/target/classes/com/ccsens/util/WechatUtil$WechatCode.class b/util/target/classes/com/ccsens/util/WechatUtil$WechatCode.class new file mode 100644 index 00000000..475368a3 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WechatUtil$WechatCode.class differ diff --git a/util/target/classes/com/ccsens/util/WechatUtil$WechatToken.class b/util/target/classes/com/ccsens/util/WechatUtil$WechatToken.class new file mode 100644 index 00000000..78af5504 Binary files /dev/null and b/util/target/classes/com/ccsens/util/WechatUtil$WechatToken.class differ diff --git a/util/target/classes/com/ccsens/util/WechatUtil$WechatUser.class b/util/target/classes/com/ccsens/util/WechatUtil$WechatUser.class new file mode 100644 index 00000000..0155ed8a Binary files /dev/null and b/util/target/classes/com/ccsens/util/WechatUtil$WechatUser.class differ diff --git a/util/target/classes/com/ccsens/util/WechatUtil.class b/util/target/classes/com/ccsens/util/WechatUtil.class new file mode 100644 index 00000000..cdb30afa Binary files /dev/null and b/util/target/classes/com/ccsens/util/WechatUtil.class differ diff --git a/util/target/classes/com/ccsens/util/bean/BaseVo.class b/util/target/classes/com/ccsens/util/bean/BaseVo.class new file mode 100644 index 00000000..0e406354 Binary files /dev/null and b/util/target/classes/com/ccsens/util/bean/BaseVo.class differ diff --git a/util/target/classes/com/ccsens/util/config/CommonConfig.class b/util/target/classes/com/ccsens/util/config/CommonConfig.class new file mode 100644 index 00000000..c479d205 Binary files /dev/null and b/util/target/classes/com/ccsens/util/config/CommonConfig.class differ diff --git a/util/target/classes/com/ccsens/util/config/ControllerExceptionHandler.class b/util/target/classes/com/ccsens/util/config/ControllerExceptionHandler.class new file mode 100644 index 00000000..fd621d0e Binary files /dev/null and b/util/target/classes/com/ccsens/util/config/ControllerExceptionHandler.class differ diff --git a/util/target/classes/com/ccsens/util/config/DruidProps.class b/util/target/classes/com/ccsens/util/config/DruidProps.class new file mode 100644 index 00000000..e7d147a6 Binary files /dev/null and b/util/target/classes/com/ccsens/util/config/DruidProps.class differ diff --git a/util/target/classes/com/ccsens/util/config/H5WebSocketInterceptor.class b/util/target/classes/com/ccsens/util/config/H5WebSocketInterceptor.class new file mode 100644 index 00000000..c37bb976 Binary files /dev/null and b/util/target/classes/com/ccsens/util/config/H5WebSocketInterceptor.class differ diff --git a/util/target/classes/com/ccsens/util/config/MyPropertySourceFactory.class b/util/target/classes/com/ccsens/util/config/MyPropertySourceFactory.class new file mode 100644 index 00000000..68de4f74 Binary files /dev/null and b/util/target/classes/com/ccsens/util/config/MyPropertySourceFactory.class differ diff --git a/util/target/classes/com/ccsens/util/config/RabbitMQConfig.class b/util/target/classes/com/ccsens/util/config/RabbitMQConfig.class new file mode 100644 index 00000000..b8ed5106 Binary files /dev/null and b/util/target/classes/com/ccsens/util/config/RabbitMQConfig.class differ diff --git a/util/target/classes/com/ccsens/util/config/RedisConfig.class b/util/target/classes/com/ccsens/util/config/RedisConfig.class new file mode 100644 index 00000000..44d9167f Binary files /dev/null and b/util/target/classes/com/ccsens/util/config/RedisConfig.class differ diff --git a/util/target/classes/com/ccsens/util/config/ServletConfig.class b/util/target/classes/com/ccsens/util/config/ServletConfig.class new file mode 100644 index 00000000..6bdf7b27 Binary files /dev/null and b/util/target/classes/com/ccsens/util/config/ServletConfig.class differ diff --git a/util/target/classes/com/ccsens/util/config/SpringConfig.class b/util/target/classes/com/ccsens/util/config/SpringConfig.class new file mode 100644 index 00000000..4f3e13d7 Binary files /dev/null and b/util/target/classes/com/ccsens/util/config/SpringConfig.class differ diff --git a/util/target/classes/com/ccsens/util/config/SwaggerConfigure.class b/util/target/classes/com/ccsens/util/config/SwaggerConfigure.class new file mode 100644 index 00000000..ac7ca1e5 Binary files /dev/null and b/util/target/classes/com/ccsens/util/config/SwaggerConfigure.class differ diff --git a/util/target/classes/com/ccsens/util/cron/CronConstant$CronExpression.class b/util/target/classes/com/ccsens/util/cron/CronConstant$CronExpression.class new file mode 100644 index 00000000..6aae09e1 Binary files /dev/null and b/util/target/classes/com/ccsens/util/cron/CronConstant$CronExpression.class differ diff --git a/util/target/classes/com/ccsens/util/cron/CronConstant$TaskCron.class b/util/target/classes/com/ccsens/util/cron/CronConstant$TaskCron.class new file mode 100644 index 00000000..63a65744 Binary files /dev/null and b/util/target/classes/com/ccsens/util/cron/CronConstant$TaskCron.class differ diff --git a/util/target/classes/com/ccsens/util/cron/CronConstant$TaskDate.class b/util/target/classes/com/ccsens/util/cron/CronConstant$TaskDate.class new file mode 100644 index 00000000..7d5e588a Binary files /dev/null and b/util/target/classes/com/ccsens/util/cron/CronConstant$TaskDate.class differ diff --git a/util/target/classes/com/ccsens/util/cron/CronConstant.class b/util/target/classes/com/ccsens/util/cron/CronConstant.class new file mode 100644 index 00000000..5da19560 Binary files /dev/null and b/util/target/classes/com/ccsens/util/cron/CronConstant.class differ diff --git a/util/target/classes/com/ccsens/util/cron/NatureConstant.class b/util/target/classes/com/ccsens/util/cron/NatureConstant.class new file mode 100644 index 00000000..0ff8a477 Binary files /dev/null and b/util/target/classes/com/ccsens/util/cron/NatureConstant.class differ diff --git a/util/target/classes/com/ccsens/util/cron/NatureLanguage.class b/util/target/classes/com/ccsens/util/cron/NatureLanguage.class new file mode 100644 index 00000000..e093af31 Binary files /dev/null and b/util/target/classes/com/ccsens/util/cron/NatureLanguage.class differ diff --git a/util/target/classes/com/ccsens/util/cron/NatureToDate.class b/util/target/classes/com/ccsens/util/cron/NatureToDate.class new file mode 100644 index 00000000..a78020a5 Binary files /dev/null and b/util/target/classes/com/ccsens/util/cron/NatureToDate.class differ diff --git a/util/target/classes/com/ccsens/util/exception/BaseException.class b/util/target/classes/com/ccsens/util/exception/BaseException.class new file mode 100644 index 00000000..82420e6b Binary files /dev/null and b/util/target/classes/com/ccsens/util/exception/BaseException.class differ diff --git a/util/util.iml b/util/util.iml index 1c92eac1..54caeb04 100644 --- a/util/util.iml +++ b/util/util.iml @@ -4,23 +4,12 @@ - - - - - - - - - - - @@ -119,8 +108,6 @@ - -