diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 75ce7554..c6a9cc40 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -6,20 +6,20 @@ + - + + - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 8d3c5b97..a486458d 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,7 +1,9 @@ + + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_ecwid_consul_consul_api_1_4_1.xml b/.idea/libraries/Maven__com_ecwid_consul_consul_api_1_4_1.xml deleted file mode 100644 index 30b747b8..00000000 --- a/.idea/libraries/Maven__com_ecwid_consul_consul_api_1_4_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index bbd3a886..00000000 --- a/.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 06441f49..00000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_7.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_7.xml deleted file mode 100644 index 02897bef..00000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_7.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_7.xml deleted file mode 100644 index 11ddfbae..00000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_9_7.xml b/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_9_7.xml deleted file mode 100644 index 78e3db0a..00000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_9_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_7.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_7.xml deleted file mode 100644 index a5beee87..00000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_7.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_7.xml deleted file mode 100644 index 9bcce3bb..00000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_9_7.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_9_7.xml deleted file mode 100644 index ee952278..00000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_9_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_7.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_7.xml deleted file mode 100644 index b9cc6e22..00000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_jknack_handlebars_4_1_2.xml b/.idea/libraries/Maven__com_github_jknack_handlebars_4_1_2.xml deleted file mode 100644 index 190aaffa..00000000 --- a/.idea/libraries/Maven__com_github_jknack_handlebars_4_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_0.xml b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_0.xml deleted file mode 100644 index d7b01a35..00000000 --- a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_4.xml b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_4.xml deleted file mode 100644 index ca8aa78e..00000000 --- a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_tomakehurst_wiremock_standalone_2_20_0.xml b/.idea/libraries/Maven__com_github_tomakehurst_wiremock_standalone_2_20_0.xml deleted file mode 100644 index bd5230f7..00000000 --- a/.idea/libraries/Maven__com_github_tomakehurst_wiremock_standalone_2_20_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 09453c91..00000000 --- a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 2888f96d..00000000 --- a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_5.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_1_1_6.xml b/.idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_1_1_6.xml deleted file mode 100644 index 9ee346c5..00000000 --- a/.idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_1_1_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_ibm_icu_icu4j_4_6.xml b/.idea/libraries/Maven__com_ibm_icu_icu4j_4_6.xml deleted file mode 100644 index 670405c2..00000000 --- a/.idea/libraries/Maven__com_ibm_icu_icu4j_4_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jcraft_jsch_0_1_54.xml b/.idea/libraries/Maven__com_jcraft_jsch_0_1_54.xml deleted file mode 100644 index 2a43ce75..00000000 --- a/.idea/libraries/Maven__com_jcraft_jsch_0_1_54.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jcraft_jsch_agentproxy_core_0_0_9.xml b/.idea/libraries/Maven__com_jcraft_jsch_agentproxy_core_0_0_9.xml deleted file mode 100644 index 6e468946..00000000 --- a/.idea/libraries/Maven__com_jcraft_jsch_agentproxy_core_0_0_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jcraft_jsch_agentproxy_jsch_0_0_9.xml b/.idea/libraries/Maven__com_jcraft_jsch_agentproxy_jsch_0_0_9.xml deleted file mode 100644 index 59623180..00000000 --- a/.idea/libraries/Maven__com_jcraft_jsch_agentproxy_jsch_0_0_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jcraft_jsch_agentproxy_sshagent_0_0_9.xml b/.idea/libraries/Maven__com_jcraft_jsch_agentproxy_sshagent_0_0_9.xml deleted file mode 100644 index 9ca1e392..00000000 --- a/.idea/libraries/Maven__com_jcraft_jsch_agentproxy_sshagent_0_0_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jcraft_jsch_agentproxy_usocket_jna_0_0_9.xml b/.idea/libraries/Maven__com_jcraft_jsch_agentproxy_usocket_jna_0_0_9.xml deleted file mode 100644 index ff3245b2..00000000 --- a/.idea/libraries/Maven__com_jcraft_jsch_agentproxy_usocket_jna_0_0_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jcraft_jzlib_1_1_1.xml b/.idea/libraries/Maven__com_jcraft_jzlib_1_1_1.xml deleted file mode 100644 index 3795be8a..00000000 --- a/.idea/libraries/Maven__com_jcraft_jzlib_1_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index bd9061c2..00000000 --- a/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_18.xml b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_18.xml deleted file mode 100644 index 588dca0f..00000000 --- a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_18.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_javanica_1_5_18.xml b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_javanica_1_5_18.xml deleted file mode 100644 index 4abf5770..00000000 --- a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_javanica_1_5_18.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_18.xml b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_18.xml deleted file mode 100644 index eb0c81dd..00000000 --- a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_18.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_serialization_1_5_18.xml b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_serialization_1_5_18.xml deleted file mode 100644 index 0c801493..00000000 --- a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_serialization_1_5_18.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index a1a320cd..00000000 --- a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_3_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 09c6f6e0..00000000 --- a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_3_0.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_3_0.xml deleted file mode 100644 index 28cf8800..00000000 --- a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_3_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_3_0.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_3_0.xml deleted file mode 100644 index eff738de..00000000 --- a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_3_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_3_0.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_3_0.xml deleted file mode 100644 index 13122699..00000000 --- a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_3_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_3_0.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_3_0.xml deleted file mode 100644 index a1ff3f02..00000000 --- a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_3_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_3_0.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_3_0.xml deleted file mode 100644 index 658fe0c2..00000000 --- a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_3_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 837985aa..00000000 --- a/.idea/libraries/Maven__com_netflix_servo_servo_core_0_12_21.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_audit_log_client_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_audit_log_client_M_1_0_0_RELEASE.xml deleted file mode 100644 index 6bf07c9a..00000000 --- a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_audit_log_client_M_1_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_common_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_common_M_1_0_0_RELEASE.xml deleted file mode 100644 index 6bc7fd1c..00000000 --- a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_common_M_1_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_common_params_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_common_params_M_1_0_0_RELEASE.xml deleted file mode 100644 index 08334052..00000000 --- a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_common_params_M_1_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_core_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_core_M_1_0_0_RELEASE.xml deleted file mode 100644 index c5689b5b..00000000 --- a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_core_M_1_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_micro_client_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_micro_client_M_1_0_0_RELEASE.xml deleted file mode 100644 index bdfe73b7..00000000 --- a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_micro_client_M_1_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_mq_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_mq_M_1_0_0_RELEASE.xml deleted file mode 100644 index 4affb288..00000000 --- a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_mq_M_1_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_msg_client_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_msg_client_M_1_0_0_RELEASE.xml deleted file mode 100644 index 6083793c..00000000 --- a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_msg_client_M_1_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_safe_common_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_safe_common_M_1_0_0_RELEASE.xml deleted file mode 100644 index b64d4151..00000000 --- a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_safe_common_M_1_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_safe_common_jwt_utils_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_safe_common_jwt_utils_M_1_0_0_RELEASE.xml deleted file mode 100644 index 4aaae9e9..00000000 --- a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_safe_common_jwt_utils_M_1_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_safe_mybatis_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_safe_mybatis_M_1_0_0_RELEASE.xml deleted file mode 100644 index 2037a530..00000000 --- a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_safe_mybatis_M_1_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_tomcat_conf_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_tomcat_conf_M_1_0_0_RELEASE.xml deleted file mode 100644 index ac9439ca..00000000 --- a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_tomcat_conf_M_1_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_utils_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_utils_M_1_0_0_RELEASE.xml deleted file mode 100644 index f692592b..00000000 --- a/.idea/libraries/Maven__com_qingqinkj_mdp_mdp_utils_M_1_0_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_rackspace_eclipse_webtools_sourceediting_org_eclipse_wst_xml_xpath2_processor_2_1_100.xml b/.idea/libraries/Maven__com_rackspace_eclipse_webtools_sourceediting_org_eclipse_wst_xml_xpath2_processor_2_1_100.xml deleted file mode 100644 index 5624ade4..00000000 --- a/.idea/libraries/Maven__com_rackspace_eclipse_webtools_sourceediting_org_eclipse_wst_xml_xpath2_processor_2_1_100.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 2061d8cf..00000000 --- a/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 2b077bc2..00000000 --- a/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 91d65b20..00000000 --- a/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_toomuchcoding_jsonassert_jsonassert_0_4_13.xml b/.idea/libraries/Maven__com_toomuchcoding_jsonassert_jsonassert_0_4_13.xml deleted file mode 100644 index dbcc289e..00000000 --- a/.idea/libraries/Maven__com_toomuchcoding_jsonassert_jsonassert_0_4_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 8f760a20..00000000 --- a/.idea/libraries/Maven__com_zaxxer_HikariCP_3_2_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 687a60e2..00000000 --- a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 4c8ff546..00000000 --- a/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 13afda29..00000000 --- a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 772d6fed..00000000 --- a/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 2ec83767..00000000 --- a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml deleted file mode 100644 index eab40b32..00000000 --- a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__dk_brics_automaton_automaton_1_11_8.xml b/.idea/libraries/Maven__dk_brics_automaton_automaton_1_11_8.xml deleted file mode 100644 index 40327c1e..00000000 --- a/.idea/libraries/Maven__dk_brics_automaton_automaton_1_11_8.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__edu_princeton_cup_java_cup_10k.xml b/.idea/libraries/Maven__edu_princeton_cup_java_cup_10k.xml deleted file mode 100644 index 12ad41db..00000000 --- a/.idea/libraries/Maven__edu_princeton_cup_java_cup_10k.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_9_0.xml b/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_9_0.xml deleted file mode 100644 index d1cd6eb7..00000000 --- a/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_9_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_micrometer_micrometer_core_1_1_0.xml b/.idea/libraries/Maven__io_micrometer_micrometer_core_1_1_0.xml deleted file mode 100644 index ac20e559..00000000 --- a/.idea/libraries/Maven__io_micrometer_micrometer_core_1_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_29_Final.xml b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_29_Final.xml deleted file mode 100644 index 111bef96..00000000 --- a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_29_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_codec_4_1_29_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_4_1_29_Final.xml deleted file mode 100644 index c60c2d07..00000000 --- a/.idea/libraries/Maven__io_netty_netty_codec_4_1_29_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_codec_http2_4_1_29_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_http2_4_1_29_Final.xml deleted file mode 100644 index e2c9284e..00000000 --- a/.idea/libraries/Maven__io_netty_netty_codec_http2_4_1_29_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_29_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_29_Final.xml deleted file mode 100644 index 4f0c553b..00000000 --- a/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_29_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_codec_socks_4_1_29_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_socks_4_1_29_Final.xml deleted file mode 100644 index cbb60634..00000000 --- a/.idea/libraries/Maven__io_netty_netty_codec_socks_4_1_29_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_common_4_1_29_Final.xml b/.idea/libraries/Maven__io_netty_netty_common_4_1_29_Final.xml deleted file mode 100644 index 8b624c53..00000000 --- a/.idea/libraries/Maven__io_netty_netty_common_4_1_29_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_handler_4_1_29_Final.xml b/.idea/libraries/Maven__io_netty_netty_handler_4_1_29_Final.xml deleted file mode 100644 index e5d265df..00000000 --- a/.idea/libraries/Maven__io_netty_netty_handler_4_1_29_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_handler_proxy_4_1_29_Final.xml b/.idea/libraries/Maven__io_netty_netty_handler_proxy_4_1_29_Final.xml deleted file mode 100644 index e30b80e5..00000000 --- a/.idea/libraries/Maven__io_netty_netty_handler_proxy_4_1_29_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_29_Final.xml b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_29_Final.xml deleted file mode 100644 index 9a62ab2c..00000000 --- a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_29_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_transport_4_1_29_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_4_1_29_Final.xml deleted file mode 100644 index c30cd9cd..00000000 --- a/.idea/libraries/Maven__io_netty_netty_transport_4_1_29_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_linux_x86_64_4_1_29_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_linux_x86_64_4_1_29_Final.xml deleted file mode 100644 index ceec5fc1..00000000 --- a/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_linux_x86_64_4_1_29_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_29_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_29_Final.xml deleted file mode 100644 index 796f2dc4..00000000 --- a/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_29_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_projectreactor_netty_reactor_netty_0_8_2_RELEASE.xml b/.idea/libraries/Maven__io_projectreactor_netty_reactor_netty_0_8_2_RELEASE.xml deleted file mode 100644 index 9b427a27..00000000 --- a/.idea/libraries/Maven__io_projectreactor_netty_reactor_netty_0_8_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_projectreactor_reactor_core_3_2_2_RELEASE.xml b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_2_2_RELEASE.xml deleted file mode 100644 index ae962cf0..00000000 --- a/.idea/libraries/Maven__io_projectreactor_reactor_core_3_2_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index cda742ba..00000000 --- a/.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index c77c4af8..00000000 --- a/.idea/libraries/Maven__io_reactivex_rxjava_reactive_streams_1_2_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 82613f4c..00000000 --- a/.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 1ce62ff2..00000000 --- a/.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index f9da5f75..00000000 --- a/.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index e74f3ab2..00000000 --- a/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 93cf65ab..00000000 --- a/.idea/libraries/Maven__javax_inject_javax_inject_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 6978c0b2..00000000 --- a/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index a0c4d766..00000000 --- a/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__joda_time_joda_time_2_10_1.xml b/.idea/libraries/Maven__joda_time_joda_time_2_10_1.xml deleted file mode 100644 index 9f7554a4..00000000 --- a/.idea/libraries/Maven__joda_time_joda_time_2_10_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index d4110417..00000000 --- a/.idea/libraries/Maven__junit_junit_4_12.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_13.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_13.xml deleted file mode 100644 index fc36ef0e..00000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_3.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_3.xml deleted file mode 100644 index 183a4307..00000000 --- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_3.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_3.xml deleted file mode 100644 index be4d19f3..00000000 --- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_java_dev_jna_jna_4_5_2.xml b/.idea/libraries/Maven__net_java_dev_jna_jna_4_5_2.xml deleted file mode 100644 index 556ed9ec..00000000 --- a/.idea/libraries/Maven__net_java_dev_jna_jna_4_5_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_java_dev_jna_jna_platform_4_5_2.xml b/.idea/libraries/Maven__net_java_dev_jna_jna_platform_4_5_2.xml deleted file mode 100644 index 8147ed69..00000000 --- a/.idea/libraries/Maven__net_java_dev_jna_jna_platform_4_5_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 33b78e93..00000000 --- a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_8_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_6_0.xml b/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_6_0.xml deleted file mode 100644 index bc0f1b37..00000000 --- a/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_6_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_text_1_6.xml b/.idea/libraries/Maven__org_apache_commons_commons_text_1_6.xml deleted file mode 100644 index 5a2fa29c..00000000 --- a/.idea/libraries/Maven__org_apache_commons_commons_text_1_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_6.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_6.xml deleted file mode 100644 index 8de95f78..00000000 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_10.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_10.xml deleted file mode 100644 index 29b722ad..00000000 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_12.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_12.xml deleted file mode 100644 index aaf3bd06..00000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_12.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_12.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_12.xml deleted file mode 100644 index 671ab545..00000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_12.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_12.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_12.xml deleted file mode 100644 index b3896527..00000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_12.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_0_0.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_0_0.xml deleted file mode 100644 index a82457d5..00000000 --- a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_2.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_2.xml deleted file mode 100644 index a1f3d909..00000000 --- a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 4d16d46c..00000000 --- a/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 3cc14932..00000000 --- a/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_60.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_62.xml b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_62.xml deleted file mode 100644 index f546c7ad..00000000 --- a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_62.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_groovy_groovy_2_5_3.xml b/.idea/libraries/Maven__org_codehaus_groovy_groovy_2_5_3.xml deleted file mode 100644 index 8e408561..00000000 --- a/.idea/libraries/Maven__org_codehaus_groovy_groovy_2_5_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_groovy_groovy_json_2_5_3.xml b/.idea/libraries/Maven__org_codehaus_groovy_groovy_json_2_5_3.xml deleted file mode 100644 index 7decd9ea..00000000 --- a/.idea/libraries/Maven__org_codehaus_groovy_groovy_json_2_5_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_groovy_groovy_nio_2_5_3.xml b/.idea/libraries/Maven__org_codehaus_groovy_groovy_nio_2_5_3.xml deleted file mode 100644 index 08fb42f7..00000000 --- a/.idea/libraries/Maven__org_codehaus_groovy_groovy_nio_2_5_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_groovy_groovy_xml_2_5_3.xml b/.idea/libraries/Maven__org_codehaus_groovy_groovy_xml_2_5_3.xml deleted file mode 100644 index c85291c3..00000000 --- a/.idea/libraries/Maven__org_codehaus_groovy_groovy_xml_2_5_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_aether_aether_api_1_1_0.xml b/.idea/libraries/Maven__org_eclipse_aether_aether_api_1_1_0.xml deleted file mode 100644 index a032f213..00000000 --- a/.idea/libraries/Maven__org_eclipse_aether_aether_api_1_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jgit_org_eclipse_jgit_5_1_3_201810200350_r.xml b/.idea/libraries/Maven__org_eclipse_jgit_org_eclipse_jgit_5_1_3_201810200350_r.xml deleted file mode 100644 index 93b51034..00000000 --- a/.idea/libraries/Maven__org_eclipse_jgit_org_eclipse_jgit_5_1_3_201810200350_r.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ehcache_ehcache_3_6_1.xml b/.idea/libraries/Maven__org_ehcache_ehcache_3_6_1.xml deleted file mode 100644 index 824afae4..00000000 --- a/.idea/libraries/Maven__org_ehcache_ehcache_3_6_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index f58bbc11..00000000 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 78dbe458..00000000 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 04cc8040..00000000 --- a/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_13_Final.xml b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_13_Final.xml deleted file mode 100644 index 2f57c13f..00000000 --- a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_13_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml deleted file mode 100644 index 5f7dd01e..00000000 --- a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_3_1.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_3_1.xml deleted file mode 100644 index 27b26f89..00000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_3_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_3_1.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_3_1.xml deleted file mode 100644 index fb639ae5..00000000 --- a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_3_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_2_23_0.xml b/.idea/libraries/Maven__org_mockito_mockito_core_2_23_0.xml deleted file mode 100644 index e905c50b..00000000 --- a/.idea/libraries/Maven__org_mockito_mockito_core_2_23_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 655ae2e1..00000000 --- a/.idea/libraries/Maven__org_mybatis_mybatis_3_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index bd108d5b..00000000 --- a/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 218b48a6..00000000 --- a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 77694f1d..00000000 --- a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index af41e3b6..00000000 --- a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_1_1.xml b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_1_1.xml deleted file mode 100644 index 70277dfa..00000000 --- a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 0bf8cf2b..00000000 --- a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_2.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_2.xml deleted file mode 100644 index 638f01ba..00000000 --- a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml b/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml deleted file mode 100644 index 457c7b78..00000000 --- a/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml deleted file mode 100644 index 6073e533..00000000 --- a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml deleted file mode 100644 index 20e81636..00000000 --- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_0_RELEASE.xml deleted file mode 100644 index 2195c71e..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_1_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_1_0_RELEASE.xml deleted file mode 100644 index 6bdfd492..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_1_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_1_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_1_0_RELEASE.xml deleted file mode 100644 index 35de4e74..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_1_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_0_RELEASE.xml deleted file mode 100644 index 93ebb16f..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_0_RELEASE.xml deleted file mode 100644 index 16649948..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_1_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_1_0_RELEASE.xml deleted file mode 100644 index d021c38d..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_1_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_1_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_1_0_RELEASE.xml deleted file mode 100644 index b3566a15..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_1_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_1_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_1_0_RELEASE.xml deleted file mode 100644 index b5de6ae5..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_1_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_0_RELEASE.xml deleted file mode 100644 index 155a67f1..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_0_RELEASE.xml deleted file mode 100644 index 8f6248c4..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_reactor_netty_2_1_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_reactor_netty_2_1_0_RELEASE.xml deleted file mode 100644 index ebb4a8f4..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_reactor_netty_2_1_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_1_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_1_0_RELEASE.xml deleted file mode 100644 index a75e7170..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_1_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_0_RELEASE.xml deleted file mode 100644 index b6ec7bef..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_0_RELEASE.xml deleted file mode 100644 index 5be0f81d..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_0_RELEASE.xml deleted file mode 100644 index 609328bb..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_webflux_2_1_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_webflux_2_1_0_RELEASE.xml deleted file mode 100644 index a0c4e9f2..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_webflux_2_1_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_0_RELEASE.xml deleted file mode 100644 index d5dcccf9..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_0_RELEASE.xml deleted file mode 100644 index f5eb1c33..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_1_2_RELEASE.xml deleted file mode 100644 index 02cd66c5..00000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_consul_core_2_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_consul_core_2_1_2_RELEASE.xml deleted file mode 100644 index b93aa6c0..00000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_consul_core_2_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_consul_discovery_2_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_consul_discovery_2_1_2_RELEASE.xml deleted file mode 100644 index 8f237bfb..00000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_consul_discovery_2_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_1_2_RELEASE.xml deleted file mode 100644 index 97edcec0..00000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_shade_2_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_shade_2_1_2_RELEASE.xml deleted file mode 100644 index 3b71b1b4..00000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_shade_2_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_spec_2_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_spec_2_1_2_RELEASE.xml deleted file mode 100644 index c428515d..00000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_spec_2_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_stub_runner_2_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_stub_runner_2_1_2_RELEASE.xml deleted file mode 100644 index e1f9bac7..00000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_stub_runner_2_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_verifier_2_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_verifier_2_1_2_RELEASE.xml deleted file mode 100644 index 99d27fa2..00000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_verifier_2_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_wiremock_2_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_wiremock_2_1_2_RELEASE.xml deleted file mode 100644 index e62c4597..00000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_wiremock_2_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_1_2_RELEASE.xml deleted file mode 100644 index 8a002ede..00000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_hystrix_2_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_hystrix_2_1_2_RELEASE.xml deleted file mode 100644 index 1bf99020..00000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_hystrix_2_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_1_2_RELEASE.xml deleted file mode 100644 index 23416676..00000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_1_2_RELEASE.xml deleted file mode 100644 index 69d0f46a..00000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_consul_2_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_consul_2_1_2_RELEASE.xml deleted file mode 100644 index 7fd0b2be..00000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_consul_2_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_consul_discovery_2_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_consul_discovery_2_1_2_RELEASE.xml deleted file mode 100644 index c650bad7..00000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_consul_discovery_2_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_contract_stub_runner_2_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_contract_stub_runner_2_1_2_RELEASE.xml deleted file mode 100644 index f06be489..00000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_contract_stub_runner_2_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_1_2_RELEASE.xml deleted file mode 100644 index 2bf506fe..00000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_2_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_2_1_2_RELEASE.xml deleted file mode 100644 index 6ccf4893..00000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_2_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_1_2_RELEASE.xml deleted file mode 100644 index 806fa37a..00000000 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_2_RELEASE.xml deleted file mode 100644 index 79c288ab..00000000 --- a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_1_2_RELEASE.xml deleted file mode 100644 index 335566df..00000000 --- a/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_1_2_RELEASE.xml deleted file mode 100644 index e2ec00f5..00000000 --- a/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_config_5_1_1_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_config_5_1_1_RELEASE.xml deleted file mode 100644 index 74d32a2a..00000000 --- a/.idea/libraries/Maven__org_springframework_security_spring_security_config_5_1_1_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_core_5_1_1_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_core_5_1_1_RELEASE.xml deleted file mode 100644 index 938ebd7a..00000000 --- a/.idea/libraries/Maven__org_springframework_security_spring_security_core_5_1_1_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_1_1_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_1_1_RELEASE.xml deleted file mode 100644 index c928419e..00000000 --- a/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_1_1_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index dbf9b606..00000000 --- a/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_web_5_1_1_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_web_5_1_1_RELEASE.xml deleted file mode 100644 index 71bdb8ba..00000000 --- a/.idea/libraries/Maven__org_springframework_security_spring_security_web_5_1_1_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_session_spring_session_core_2_1_1_RELEASE.xml b/.idea/libraries/Maven__org_springframework_session_spring_session_core_2_1_1_RELEASE.xml deleted file mode 100644 index 3c9dd5c2..00000000 --- a/.idea/libraries/Maven__org_springframework_session_spring_session_core_2_1_1_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_session_spring_session_data_redis_2_1_1_RELEASE.xml b/.idea/libraries/Maven__org_springframework_session_spring_session_data_redis_2_1_1_RELEASE.xml deleted file mode 100644 index 814e127e..00000000 --- a/.idea/libraries/Maven__org_springframework_session_spring_session_data_redis_2_1_1_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_1_2_RELEASE.xml deleted file mode 100644 index ceaddccd..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_aop_5_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aspects_5_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aspects_5_1_2_RELEASE.xml deleted file mode 100644 index f5151b0b..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_aspects_5_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_1_2_RELEASE.xml deleted file mode 100644 index d5022031..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_beans_5_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_1_2_RELEASE.xml deleted file mode 100644 index a40fb549..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_context_5_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_2_RELEASE.xml deleted file mode 100644 index ad137ecb..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_1_2_RELEASE.xml deleted file mode 100644 index 238bf6ef..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_core_5_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_1_2_RELEASE.xml deleted file mode 100644 index 2b13ac33..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_expression_5_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_2_RELEASE.xml deleted file mode 100644 index bb4b7179..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_2_RELEASE.xml deleted file mode 100644 index 921e9b1f..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_oxm_5_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_oxm_5_1_2_RELEASE.xml deleted file mode 100644 index 18129d97..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_oxm_5_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_5_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_1_2_RELEASE.xml deleted file mode 100644 index 123eeb33..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_test_5_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_1_2_RELEASE.xml deleted file mode 100644 index 9da2b7f0..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_tx_5_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_1_2_RELEASE.xml deleted file mode 100644 index f0ca3a47..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_web_5_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webflux_5_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webflux_5_1_2_RELEASE.xml deleted file mode 100644 index 43feb272..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_webflux_5_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_2_RELEASE.xml deleted file mode 100644 index a72e1b7c..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_synchronoss_cloud_nio_multipart_parser_1_1_0.xml b/.idea/libraries/Maven__org_synchronoss_cloud_nio_multipart_parser_1_1_0.xml deleted file mode 100644 index 1a8ebe7d..00000000 --- a/.idea/libraries/Maven__org_synchronoss_cloud_nio_multipart_parser_1_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_synchronoss_cloud_nio_stream_storage_1_1_3.xml b/.idea/libraries/Maven__org_synchronoss_cloud_nio_stream_storage_1_1_3.xml deleted file mode 100644 index 3897687e..00000000 --- a/.idea/libraries/Maven__org_synchronoss_cloud_nio_stream_storage_1_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml deleted file mode 100644 index 9f44657d..00000000 --- a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 7e63769b..00000000 --- a/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml b/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml deleted file mode 100644 index 77144ff4..00000000 --- a/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 7c4c3023..f141ceb2 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,9 +2,9 @@ + + - - \ No newline at end of file diff --git a/.idea/xm-backend.iml b/.idea/xm-backend.iml new file mode 100644 index 00000000..f409c0ea --- /dev/null +++ b/.idea/xm-backend.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/xm-server.iml b/.idea/xm-server.iml deleted file mode 100644 index 416afa96..00000000 --- a/.idea/xm-server.iml +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/README.md b/README.md index dedcc541..7e5b4754 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# xm-server +# xm-backend diff --git a/pom.xml b/pom.xml index 63d6dd94..46953257 100644 --- a/pom.xml +++ b/pom.xml @@ -2,13 +2,13 @@ 4.0.0 - com.qingqinkj.xm - xm-server + com.xm + xm-backend pom 唛盟云-项目管理系统 唛盟云-项目管理系统 - com.qingqinkj.mdp + com.mdp mdp-products M.1.0.0-RELEASE @@ -21,12 +21,12 @@ xm-core - xm-starter + xm-bootstrap - com.qingqinkj.xm + com.xm xm-core ${mdp.version} @@ -34,35 +34,12 @@ - com.qingqinkj.mdp - mdp-utils - - - com.qingqinkj.mdp - mdp-micro-client - - - com.qingqinkj.mdp - mdp-msg-client - - - com.qingqinkj.mdp - mdp-core - - - com.qingqinkj.mdp - mdp-safe-common - - - com.qingqinkj.mdp - mdp-common - - - com.qingqinkj.mdp - mdp-tomcat-conf + com.mdp + mdp-oauth2-client + ${mdp.version} - com.qingqinkj.mdp + com.mdp mdp-audit-log-client ${mdp.version} diff --git a/xm-starter/README.md b/xm-bootstrap/README.md similarity index 100% rename from xm-starter/README.md rename to xm-bootstrap/README.md diff --git a/xm-starter/pom.xml b/xm-bootstrap/pom.xml similarity index 65% rename from xm-starter/pom.xml rename to xm-bootstrap/pom.xml index 1e46a876..608838e3 100644 --- a/xm-starter/pom.xml +++ b/xm-bootstrap/pom.xml @@ -2,37 +2,21 @@ 4.0.0 - xm-starter + xm-bootstrap jar 唛盟云-项目管理系统服务端启动器 - com.qingqinkj.xm - xm-server + com.xm + xm-backend M.1.0.0-RELEASE - org.springframework.boot - spring-boot-starter-actuator + com.mdp + mdp-cloud-starter - org.springframework.boot - spring-boot-starter-webflux - - - org.springframework.cloud - spring-cloud-starter-netflix-hystrix - - - org.springframework.cloud - spring-cloud-starter-contract-stub-runner - - - org.springframework.cloud - spring-cloud-starter-consul-discovery - - - com.qingqinkj.xm + com.xm xm-core diff --git a/xm-starter/src/main/java/com/qqkj/XmApplication.java b/xm-bootstrap/src/main/java/com/qqkj/XmApplication.java similarity index 93% rename from xm-starter/src/main/java/com/qqkj/XmApplication.java rename to xm-bootstrap/src/main/java/com/qqkj/XmApplication.java index 9819b648..d5a5d0a2 100644 --- a/xm-starter/src/main/java/com/qqkj/XmApplication.java +++ b/xm-bootstrap/src/main/java/com/qqkj/XmApplication.java @@ -10,8 +10,8 @@ import org.springframework.http.client.SimpleClientHttpRequestFactory; import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession; import org.springframework.web.client.RestTemplate; -import com.qqkj.mdp.core.entity.AppAuth; -import com.qqkj.mdp.safe.common.rest.MdpRestTemplate; +import com.mdp.core.entity.AppAuth; +import com.mdp.safe.common.rest.MdpRestTemplate; //@SpringBootApplication @SpringCloudApplication diff --git a/xm-starter/src/main/java/com/qqkj/mdp/MdpWebAppConfigurer.java b/xm-bootstrap/src/main/java/com/qqkj/mdp/MdpWebAppConfigurer.java similarity index 97% rename from xm-starter/src/main/java/com/qqkj/mdp/MdpWebAppConfigurer.java rename to xm-bootstrap/src/main/java/com/qqkj/mdp/MdpWebAppConfigurer.java index 00011595..c255e481 100644 --- a/xm-starter/src/main/java/com/qqkj/mdp/MdpWebAppConfigurer.java +++ b/xm-bootstrap/src/main/java/com/qqkj/mdp/MdpWebAppConfigurer.java @@ -1,4 +1,4 @@ -package com.qqkj.mdp; +package com.mdp; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.CorsRegistry; diff --git a/xm-starter/src/main/java/com/qqkj/mdp/WebSecurityConfig.java b/xm-bootstrap/src/main/java/com/qqkj/mdp/WebSecurityConfig.java similarity index 90% rename from xm-starter/src/main/java/com/qqkj/mdp/WebSecurityConfig.java rename to xm-bootstrap/src/main/java/com/qqkj/mdp/WebSecurityConfig.java index d2d76e24..1585810c 100644 --- a/xm-starter/src/main/java/com/qqkj/mdp/WebSecurityConfig.java +++ b/xm-bootstrap/src/main/java/com/qqkj/mdp/WebSecurityConfig.java @@ -1,4 +1,4 @@ -package com.qqkj.mdp; +package com.mdp; import java.util.ArrayList; import java.util.List; @@ -30,17 +30,17 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic import org.springframework.security.web.authentication.logout.HttpStatusReturningLogoutSuccessHandler; import org.springframework.web.cors.CorsUtils; -import com.qqkj.mdp.core.log.MdpLogFilter; -import com.qqkj.mdp.safe.common.entrypoint.SafeAuthenticationEntryPoint; -import com.qqkj.mdp.safe.common.expression.DbPermissionEvaluator; -import com.qqkj.mdp.safe.common.filter.MdpApiAuthorizationFilter; -import com.qqkj.mdp.safe.common.filter.MdpUserAuthenticationFilter; -import com.qqkj.mdp.safe.common.filter.MdpUserAuthorizationFilter; -import com.qqkj.mdp.safe.common.handle.SafeAccessDeniedHandler; -import com.qqkj.mdp.safe.common.handle.SafeAuthenticationFailureHandler; -import com.qqkj.mdp.safe.common.handle.SafeAuthenticationSuccessHandler; -import com.qqkj.mdp.safe.common.pwd.SafePasswordEncoder; -import com.qqkj.mdp.safe.common.service.SafeUserService; +import com.mdp.core.log.MdpLogFilter; +import com.mdp.safe.common.entrypoint.SafeAuthenticationEntryPoint; +import com.mdp.safe.common.expression.DbPermissionEvaluator; +import com.mdp.safe.common.filter.MdpApiAuthorizationFilter; +import com.mdp.safe.common.filter.MdpUserAuthenticationFilter; +import com.mdp.safe.common.filter.MdpUserAuthorizationFilter; +import com.mdp.safe.common.handle.SafeAccessDeniedHandler; +import com.mdp.safe.common.handle.SafeAuthenticationFailureHandler; +import com.mdp.safe.common.handle.SafeAuthenticationSuccessHandler; +import com.mdp.safe.common.pwd.SafePasswordEncoder; +import com.mdp.safe.common.service.SafeUserService; @Configuration @EnableWebSecurity diff --git a/xm-starter/src/main/resources/application-123prod.properties b/xm-bootstrap/src/main/resources/application-123prod.properties similarity index 100% rename from xm-starter/src/main/resources/application-123prod.properties rename to xm-bootstrap/src/main/resources/application-123prod.properties diff --git a/xm-starter/src/main/resources/application-dev.properties b/xm-bootstrap/src/main/resources/application-dev.properties similarity index 100% rename from xm-starter/src/main/resources/application-dev.properties rename to xm-bootstrap/src/main/resources/application-dev.properties diff --git a/xm-starter/src/main/resources/application-m1prod.properties b/xm-bootstrap/src/main/resources/application-m1prod.properties similarity index 100% rename from xm-starter/src/main/resources/application-m1prod.properties rename to xm-bootstrap/src/main/resources/application-m1prod.properties diff --git a/xm-starter/src/main/resources/application-prod.properties b/xm-bootstrap/src/main/resources/application-prod.properties similarity index 100% rename from xm-starter/src/main/resources/application-prod.properties rename to xm-bootstrap/src/main/resources/application-prod.properties diff --git a/xm-starter/src/main/resources/application.properties b/xm-bootstrap/src/main/resources/application.properties similarity index 100% rename from xm-starter/src/main/resources/application.properties rename to xm-bootstrap/src/main/resources/application.properties diff --git a/xm-starter/src/main/resources/db/activiti.oracle.create.engine.sql b/xm-bootstrap/src/main/resources/db/activiti.oracle.create.engine.sql similarity index 100% rename from xm-starter/src/main/resources/db/activiti.oracle.create.engine.sql rename to xm-bootstrap/src/main/resources/db/activiti.oracle.create.engine.sql diff --git a/xm-starter/src/main/resources/db/activiti.oracle.create.history.sql b/xm-bootstrap/src/main/resources/db/activiti.oracle.create.history.sql similarity index 100% rename from xm-starter/src/main/resources/db/activiti.oracle.create.history.sql rename to xm-bootstrap/src/main/resources/db/activiti.oracle.create.history.sql diff --git a/xm-starter/src/main/resources/db/activiti.oracle.create.identity.sql b/xm-bootstrap/src/main/resources/db/activiti.oracle.create.identity.sql similarity index 100% rename from xm-starter/src/main/resources/db/activiti.oracle.create.identity.sql rename to xm-bootstrap/src/main/resources/db/activiti.oracle.create.identity.sql diff --git a/xm-starter/src/main/resources/locale/message_zh.properties b/xm-bootstrap/src/main/resources/locale/message_zh.properties similarity index 100% rename from xm-starter/src/main/resources/locale/message_zh.properties rename to xm-bootstrap/src/main/resources/locale/message_zh.properties diff --git a/xm-starter/src/main/resources/logback-spring.xml b/xm-bootstrap/src/main/resources/logback-spring.xml similarity index 100% rename from xm-starter/src/main/resources/logback-spring.xml rename to xm-bootstrap/src/main/resources/logback-spring.xml diff --git a/xm-starter/src/main/resources/mybatis/mybatis-config.xml b/xm-bootstrap/src/main/resources/mybatis/mybatis-config.xml similarity index 94% rename from xm-starter/src/main/resources/mybatis/mybatis-config.xml rename to xm-bootstrap/src/main/resources/mybatis/mybatis-config.xml index 9a681c2f..8c92d0f5 100644 --- a/xm-starter/src/main/resources/mybatis/mybatis-config.xml +++ b/xm-bootstrap/src/main/resources/mybatis/mybatis-config.xml @@ -15,7 +15,7 @@ - + @@ -45,6 +45,6 @@ - + \ No newline at end of file diff --git a/xm-starter/src/main/resources/processes/readme.txt b/xm-bootstrap/src/main/resources/processes/readme.txt similarity index 100% rename from xm-starter/src/main/resources/processes/readme.txt rename to xm-bootstrap/src/main/resources/processes/readme.txt diff --git a/xm-starter/src/main/resources/stencilset_bpmn.json b/xm-bootstrap/src/main/resources/stencilset_bpmn.json similarity index 100% rename from xm-starter/src/main/resources/stencilset_bpmn.json rename to xm-bootstrap/src/main/resources/stencilset_bpmn.json diff --git a/xm-bootstrap/xm-bootstrap.iml b/xm-bootstrap/xm-bootstrap.iml new file mode 100644 index 00000000..cb6ef783 --- /dev/null +++ b/xm-bootstrap/xm-bootstrap.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/xm-core/pom.xml b/xm-core/pom.xml index dd63ba84..73a39ae5 100644 --- a/xm-core/pom.xml +++ b/xm-core/pom.xml @@ -7,8 +7,8 @@ 唛盟云-项目管理系统服务端核心 唛盟云-项目管理系统服务端核心 - com.qingqinkj.xm - xm-server + com.xm + xm-backend M.1.0.0-RELEASE diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/push/XmPushController.java b/xm-core/src/main/java/com/qqkj/xm/core/ctrl/push/XmPushController.java deleted file mode 100644 index 73823fa6..00000000 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/push/XmPushController.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.qqkj.xm.core.ctrl.push; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; - -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmBranchStateService; -import com.qqkj.xm.core.entity.XmBranchState; -import com.qqkj.xm.core.entity.XmBranchState; -/** - * url编制采用rest风格,如对XM.xm_branch_state 机构内所有项目指标汇总的操作有增删改查,对应的url分别为:
- * 新增: core/xmBranchState/add
- * 查询: core/xmBranchState/list
- * 模糊查询: core/xmBranchState/listKey
- * 修改: core/xmBranchState/edit
- * 删除: core/xmBranchState/del
- * 批量删除: core/xmBranchState/batchDel
- * 组织 com.qqkj 顶级模块 xm 大模块 core 小模块
- * 实体 XmBranchState 表 XM.xm_branch_state 当前主键(包括多主键): id; - ***/ -@RestController("xm.core.push.xmPushController") -@RequestMapping(value="/**/core/push") -@Api(tags={"消息推送接口"}) -public class XmPushController { - - static Log logger=LogFactory.getLog(XmPushController.class); - - - -} diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmAttachmentController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmAttachmentController.java similarity index 93% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmAttachmentController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmAttachmentController.java index 6f238277..2940dbb2 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmAttachmentController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmAttachmentController.java @@ -1,10 +1,10 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.xm.core.entity.XmAttachment; -import com.qqkj.xm.core.service.XmAttachmentService; +import com.mdp.core.entity.Tips; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmAttachment; +import com.xm.core.service.XmAttachmentService; import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -58,7 +58,7 @@ public class XmAttachmentController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmAttachment.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmAttachment.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmAttachment( @RequestParam Map xmAttachment){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmBranchStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateController.java similarity index 89% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmBranchStateController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateController.java index e00402e0..86a5dfea 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmBranchStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateController.java @@ -1,38 +1,22 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmBranchState; +import com.xm.core.service.XmBranchStateService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmBranchStateService; -import com.qqkj.xm.core.entity.XmBranchState; -import com.qqkj.xm.core.entity.XmBranchState; /** * url编制采用rest风格,如对XM.xm_branch_state 机构内所有项目指标汇总的操作有增删改查,对应的url分别为:
* 新增: core/xmBranchState/add
@@ -118,7 +102,7 @@ public class XmBranchStateController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmBranchState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmBranchState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmBranchState( @RequestParam Map xmBranchState){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmBranchTaskTypeStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmBranchTaskTypeStateController.java similarity index 87% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmBranchTaskTypeStateController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmBranchTaskTypeStateController.java index 2ac53e19..70d9fe56 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmBranchTaskTypeStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmBranchTaskTypeStateController.java @@ -1,38 +1,23 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmBranchState; +import com.xm.core.entity.XmBranchTaskTypeState; +import com.xm.core.service.XmBranchTaskTypeStateService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmBranchTaskTypeStateService; -import com.qqkj.xm.core.entity.XmBranchState; -import com.qqkj.xm.core.entity.XmBranchTaskTypeState; /** * url编制采用rest风格,如对XM.xm_branch_task_type_state 按机构编号任务类型汇总的操作有增删改查,对应的url分别为:
* 新增: core/xmBranchTaskTypeState/add
@@ -86,7 +71,7 @@ public class XmBranchTaskTypeStateController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmBranchTaskTypeState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmBranchTaskTypeState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmBranchTaskTypeState( @RequestParam Map xmBranchTaskTypeState){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmEnvListController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmEnvListController.java similarity index 87% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmEnvListController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmEnvListController.java index 4b9a8219..252a542b 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmEnvListController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmEnvListController.java @@ -1,41 +1,24 @@ -package com.qqkj.xm.core.ctrl; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +package com.xm.core.ctrl; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.mdp.qx.HasQx; import com.qqkj.audit.log.client.annotation.AuditLog; import com.qqkj.audit.log.client.annotation.OperType; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.qx.HasQx; +import com.xm.core.entity.XmEnvList; +import com.xm.core.service.XmEnvListService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmEnvListService; -import com.qqkj.xm.core.entity.XmEnvList; /** * url编制采用rest风格,如对XM.xm_env_list xm_env_list的操作有增删改查,对应的url分别为:
* 新增: xm/xmEnvList/add
@@ -90,7 +73,7 @@ public class XmEnvListController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmEnvList.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmEnvList.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmEnvList( @RequestParam Map xmEnvList){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmExchangeController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmExchangeController.java similarity index 88% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmExchangeController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmExchangeController.java index 0839d568..4f4e3bbf 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmExchangeController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmExchangeController.java @@ -1,38 +1,14 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.qx.HasQx; + +import com.xm.core.service.XmExchangeService; +import io.swagger.annotations.Api; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmExchangeService; -import com.qqkj.xm.core.entity.XmExchange; /** * url编制采用rest风格,如对XM.xm_exchange 功能表的操作有增删改查,对应的url分别为:
* 新增: xm/xmExchange/add
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmFileController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmFileController.java similarity index 88% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmFileController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmFileController.java index 21b20693..f229ed19 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmFileController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmFileController.java @@ -1,35 +1,25 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.qqkj.mdp.qx.HasQx; -import com.qqkj.xm.core.vo.XmFileVo; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.mdp.qx.HasQx; +import com.qqkj.audit.log.client.annotation.AuditLog; +import com.qqkj.audit.log.client.annotation.OperType; +import com.xm.core.entity.XmFile; +import com.xm.core.service.XmFileService; +import com.xm.core.vo.XmFileVo; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.audit.log.client.annotation.AuditLog; -import com.qqkj.audit.log.client.annotation.OperType; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.xm.core.service.XmFileService; -import com.qqkj.xm.core.entity.XmFile; /** * url编制采用rest风格,如对XM.xm_file xm_file的操作有增删改查,对应的url分别为:
* 新增: xm/xmFile/add
@@ -71,7 +61,7 @@ public class XmFileController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmFile.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmFile.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmFile( @RequestParam Map xmFile){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmIterationController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java similarity index 89% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmIterationController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java index ecfdd00e..4f836f13 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmIterationController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java @@ -1,33 +1,22 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.qqkj.mdp.qx.HasQx; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.mdp.qx.HasQx; +import com.xm.core.entity.XmIteration; +import com.xm.core.service.XmIterationService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.xm.core.entity.XmIteration; -import com.qqkj.xm.core.service.XmIterationService; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * url编制采用rest风格,如对XM.xm_iteration 迭代定义的操作有增删改查,对应的url分别为:
* 新增: xm/xmIteration/add
@@ -78,7 +67,7 @@ public class XmIterationController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmIteration.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmIteration.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmIteration( @RequestParam Map xmIteration){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmIterationMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java similarity index 83% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmIterationMenuController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java index 4aa626fc..17240fd9 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmIterationMenuController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java @@ -1,42 +1,25 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.mdp.safe.common.entity.User; +import com.mdp.safe.common.utils.LoginUtils; +import com.xm.core.entity.XmIterationMenu; +import com.xm.core.service.XmIterationMenuService; +import com.xm.core.service.push.XmMenuPushMsgService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.safe.common.entity.User; -import com.qqkj.mdp.safe.common.utils.LoginUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmIterationMenuService; -import com.qqkj.xm.core.service.XmTaskService; -import com.qqkj.xm.core.service.push.XmMenuPushMsgService; -import com.qqkj.xm.core.entity.XmIterationMenu; /** * url编制采用rest风格,如对XM.xm_iteration_menu 迭代定义的操作有增删改查,对应的url分别为:
* 新增: xm/xmIterationMenu/add
@@ -61,7 +44,7 @@ public class XmIterationMenuController { @Autowired - XmMenuPushMsgService xmMenuPushMsgService; + XmMenuPushMsgService xmMenuPushMsgService; @@ -80,7 +63,7 @@ public class XmIterationMenuController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmIterationMenu.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmIterationMenu.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmIterationMenu( @RequestParam Map xmIterationMenu){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmIterationStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationStateController.java similarity index 87% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmIterationStateController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmIterationStateController.java index 5f8d46f8..76c847b5 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmIterationStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationStateController.java @@ -1,37 +1,21 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmIterationState; +import com.xm.core.service.XmIterationStateService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmIterationStateService; -import com.qqkj.xm.core.entity.XmIterationState; /** * url编制采用rest风格,如对XM.xm_iteration_state 迭代定义的操作有增删改查,对应的url分别为:
* 新增: core/xmIterationState/add
@@ -92,7 +76,7 @@ public class XmIterationStateController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmIterationState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmIterationState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmIterationState( @RequestParam Map xmIterationState){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java similarity index 89% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmMenuController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java index 1575768d..23571a33 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmMenuController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java @@ -1,39 +1,28 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.qqkj.mdp.qx.HasQx; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.mdp.qx.HasQx; +import com.mdp.safe.common.entity.User; +import com.mdp.safe.common.utils.LoginUtils; +import com.xm.core.entity.XmMenu; +import com.xm.core.entity.XmTask; +import com.xm.core.service.XmMenuService; +import com.xm.core.service.XmTaskService; +import com.xm.core.vo.XmMenuVo; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.safe.common.entity.User; -import com.qqkj.mdp.safe.common.utils.LoginUtils; -import com.qqkj.xm.core.entity.XmMenu; -import com.qqkj.xm.core.entity.XmTask; -import com.qqkj.xm.core.service.XmMenuService; -import com.qqkj.xm.core.service.XmTaskService; -import com.qqkj.xm.core.vo.XmMenuVo; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * url编制采用rest风格,如对XM.xm_menu 项目菜单表的操作有增删改查,对应的url分别为:
* 新增: xm/xmMenu/add
@@ -72,7 +61,7 @@ public class XmMenuController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmMenu.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmMenu.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmMenu( @RequestParam Map xmMenu){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmMenuExchangeController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuExchangeController.java similarity index 86% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmMenuExchangeController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmMenuExchangeController.java index ebfbbde0..570ba828 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmMenuExchangeController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuExchangeController.java @@ -1,37 +1,24 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.qqkj.mdp.qx.HasQx; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.mdp.qx.HasQx; +import com.xm.core.entity.XmMenuExchange; +import com.xm.core.service.XmMenuExchangeService; +import com.xm.core.service.push.XmMenuPushMsgService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.safe.common.entity.User; -import com.qqkj.mdp.safe.common.utils.LoginUtils; -import com.qqkj.xm.core.entity.XmMenuExchange; -import com.qqkj.xm.core.service.XmMenuExchangeService; -import com.qqkj.xm.core.service.push.XmMenuPushMsgService; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * url编制采用rest风格,如对XM.xm_menu_exchange 功能表的操作有增删改查,对应的url分别为:
* 新增: xm/xmMenuExchange/add
@@ -54,7 +41,7 @@ public class XmMenuExchangeController { private XmMenuExchangeService xmMenuExchangeService; @Autowired - XmMenuPushMsgService pushMsgService ; + XmMenuPushMsgService pushMsgService ; @ApiOperation( value = "查询功能表信息列表",notes="listXmMenuExchange,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}") @@ -87,7 +74,7 @@ public class XmMenuExchangeController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmMenuExchange.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmMenuExchange.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmMenuExchange( @RequestParam Map xmMenuExchange){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmMenuPlanController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java similarity index 91% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmMenuPlanController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java index 0e650df3..0ac9449b 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmMenuPlanController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java @@ -1,42 +1,26 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.qx.HasQx; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.mdp.qx.HasQx; +import com.mdp.safe.common.entity.User; +import com.mdp.safe.common.utils.LoginUtils; +import com.xm.core.entity.XmMenuPlan; +import com.xm.core.service.XmMenuPlanService; +import com.xm.core.service.push.XmMenuPushMsgService; +import com.xm.core.vo.XmMenuPlanVo; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import org.springframework.web.bind.annotation.*; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.safe.common.entity.User; -import com.qqkj.mdp.safe.common.utils.LoginUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmMenuPlanService; -import com.qqkj.xm.core.service.push.XmMenuPushMsgService; -import com.qqkj.xm.core.vo.XmMenuPlanVo; -import com.qqkj.xm.core.entity.XmMenuPlan; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * url编制采用rest风格,如对XM.xm_menu_plan 功能计划表,无需前端维护，所有数据由汇总统计得出的操作有增删改查,对应的url分别为:
* 新增: xm/xmMenuPlan/add
@@ -59,7 +43,7 @@ public class XmMenuPlanController { private XmMenuPlanService xmMenuPlanService; @Autowired - XmMenuPushMsgService pushMsgService ; + XmMenuPushMsgService pushMsgService ; @ApiOperation( value = "查询功能计划表,无需前端维护，所有数据由汇总统计得出信息列表",notes="listXmMenuPlan,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}") diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmMenuStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuStateController.java similarity index 90% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmMenuStateController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmMenuStateController.java index 8d6b1df8..1f213b2e 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmMenuStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuStateController.java @@ -1,38 +1,23 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmMenuState; +import com.xm.core.service.XmMenuStateService; +import com.xm.core.vo.XmMenuStateVo; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmMenuStateService; -import com.qqkj.xm.core.vo.XmMenuStateVo; -import com.qqkj.xm.core.entity.XmMenuState; /** * url编制采用rest风格,如对XM.xm_menu_state 功能状态表,无需前端维护，所有数据由汇总统计得出的操作有增删改查,对应的url分别为:
* 新增: xm/xmMenuState/add
@@ -110,7 +95,7 @@ public class XmMenuStateController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmMenuState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmMenuState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmMenuState( @RequestParam Map xmMenuState){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmMenuTemplateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuTemplateController.java similarity index 86% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmMenuTemplateController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmMenuTemplateController.java index 16dcd6a4..870a669f 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmMenuTemplateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuTemplateController.java @@ -1,37 +1,22 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmMenuTemplate; +import com.xm.core.service.XmMenuTemplateService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmMenuTemplateService; -import com.qqkj.xm.core.entity.XmMenuTemplate; /** * url编制采用rest风格,如对XM.xm_menu_template 功能表的操作有增删改查,对应的url分别为:
* 新增: xm/xmMenuTemplate/add
@@ -78,7 +63,7 @@ public class XmMenuTemplateController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmMenuTemplate.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmMenuTemplate.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmMenuTemplate( @RequestParam Map xmMenuTemplate){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmMyFocusController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMyFocusController.java similarity index 82% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmMyFocusController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmMyFocusController.java index fbc7551e..e8227e1a 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmMyFocusController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMyFocusController.java @@ -1,38 +1,23 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmMyFocus; +import com.xm.core.service.XmMyFocusService; +import com.xm.core.service.XmRecordService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmMyFocusService; -import com.qqkj.xm.core.service.XmRecordService; -import com.qqkj.xm.core.entity.XmMyFocus; /** * url编制采用rest风格,如对XM.xm_my_focus xm_my_focus的操作有增删改查,对应的url分别为:
* 新增: xm/xmMyFocus/add
@@ -57,7 +42,7 @@ public class XmMyFocusController { @Autowired - XmRecordService xmRecordService; + XmRecordService xmRecordService; @ApiOperation( value = "查询xm_my_focus信息列表",notes="listXmMyFocus,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}") @ApiImplicitParams({ @@ -76,7 +61,7 @@ public class XmMyFocusController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmMyFocus.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmMyFocus.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmMyFocus( @RequestParam Map xmMyFocus){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProductController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java similarity index 85% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProductController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java index baadee66..926bdb70 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProductController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java @@ -1,41 +1,23 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.qx.HasQx; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.mdp.qx.HasQx; +import com.mdp.safe.common.entity.User; +import com.mdp.safe.common.utils.LoginUtils; +import com.xm.core.entity.XmProduct; +import com.xm.core.service.XmProductService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.*; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.safe.common.entity.User; -import com.qqkj.mdp.safe.common.utils.LoginUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmProductService; -import com.qqkj.xm.core.entity.XmProduct; /** * url编制采用rest风格,如对XM.xm_product 产品表的操作有增删改查,对应的url分别为:
* 新增: xm/xmProduct/add
@@ -73,7 +55,7 @@ public class XmProductController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmProduct.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProduct.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProduct( @RequestParam Map xmProduct){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProductStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductStateController.java similarity index 88% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProductStateController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProductStateController.java index 6d4eb747..559d077c 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProductStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductStateController.java @@ -1,37 +1,21 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmProductState; +import com.xm.core.service.XmProductStateService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmProductStateService; -import com.qqkj.xm.core.entity.XmProductState; /** * url编制采用rest风格,如对XM.xm_product_state 功能状态表,无需前端维护，所有数据由汇总统计得出的操作有增删改查,对应的url分别为:
* 新增: core/xmProductState/add
@@ -104,7 +88,7 @@ public class XmProductStateController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmProductState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProductState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProductState( @RequestParam Map xmProductState){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProductTemplateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductTemplateController.java similarity index 84% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProductTemplateController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProductTemplateController.java index 9cefa8bb..f32361ad 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProductTemplateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductTemplateController.java @@ -1,37 +1,22 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmProductTemplate; +import com.xm.core.service.XmProductTemplateService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmProductTemplateService; -import com.qqkj.xm.core.entity.XmProductTemplate; /** * url编制采用rest风格,如对XM.xm_product_template 产品表的操作有增删改查,对应的url分别为:
* 新增: xm/xmProductTemplate/add
@@ -76,7 +61,7 @@ public class XmProductTemplateController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmProductTemplate.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProductTemplate.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProductTemplate( @RequestParam Map xmProductTemplate){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectBaselineController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectBaselineController.java similarity index 89% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectBaselineController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProjectBaselineController.java index c2481edf..07755c7c 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectBaselineController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectBaselineController.java @@ -1,37 +1,23 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmProjectBaseline; +import com.xm.core.service.XmProjectBaselineService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmProjectBaselineService; -import com.qqkj.xm.core.entity.XmProjectBaseline; /** * url编制采用rest风格,如对XM.xm_project_baseline xm_project_baseline的操作有增删改查,对应的url分别为:
* 新增: xm/xmProjectBaseline/add
@@ -105,7 +91,7 @@ public class XmProjectBaselineController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmProjectBaseline.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProjectBaseline.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProjectBaseline( @RequestParam Map xmProjectBaseline){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectContractController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectContractController.java similarity index 89% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectContractController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProjectContractController.java index 3e04506a..3786e568 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectContractController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectContractController.java @@ -1,8 +1,11 @@ -package com.qqkj.xm.core.ctrl; - -import java.util.HashMap; -import java.util.Map; +package com.xm.core.ctrl; +import com.mdp.core.entity.Tips; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmProjectContract; +import com.xm.core.service.XmProjectContractService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -11,18 +14,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.xm.core.entity.XmProjectContract; -import com.qqkj.xm.core.service.XmProjectContractService; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.Map; /** * url编制采用rest风格,如对XM.xm_project_contract xm_project_contract的操作有增删改查,对应的url分别为:
* 新增: xm/xmProjectContract/add
@@ -57,7 +50,7 @@ public class XmProjectContractController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmProjectContract.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProjectContract.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProjectContract( @RequestParam Map contractCard){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java similarity index 91% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java index 845e94f1..ba2a4d1f 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java @@ -1,36 +1,25 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.qqkj.mdp.qx.HasQx; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.mdp.qx.HasQx; +import com.qqkj.audit.log.client.annotation.AuditLog; +import com.qqkj.audit.log.client.annotation.OperType; +import com.xm.core.entity.XmProject; +import com.xm.core.service.XmProjectService; +import com.xm.core.vo.XmProjectVo; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.qqkj.audit.log.client.annotation.AuditLog; -import com.qqkj.audit.log.client.annotation.OperType; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.xm.core.entity.XmProject; -import com.qqkj.xm.core.service.XmProjectService; -import com.qqkj.xm.core.vo.XmProjectVo; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * url编制采用rest风格,如对XM.xm_project xm_project的操作有增删改查,对应的url分别为:
@@ -79,7 +68,7 @@ public class XmProjectController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmProject.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProject.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProject( @RequestParam Map xmProject){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectEnvListController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectEnvListController.java similarity index 87% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectEnvListController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProjectEnvListController.java index 3e723aa3..4045b7d4 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectEnvListController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectEnvListController.java @@ -1,40 +1,23 @@ -package com.qqkj.xm.core.ctrl; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +package com.xm.core.ctrl; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; import com.qqkj.audit.log.client.annotation.AuditLog; import com.qqkj.audit.log.client.annotation.OperType; -import com.qqkj.mdp.core.context.ContextHolder; +import com.xm.core.entity.XmProjectEnvList; +import com.xm.core.service.XmProjectEnvListService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmProjectEnvListService; -import com.qqkj.xm.core.entity.XmProjectEnvList; /** * url编制采用rest风格,如对XM.xm_project_env_list xm_project_env_list的操作有增删改查,对应的url分别为:
* 新增: xm/xmProjectEnvList/add
@@ -84,7 +67,7 @@ public class XmProjectEnvListController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmProjectEnvList.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProjectEnvList.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProjectEnvList( @RequestParam Map xmProjectEnvList){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectGroupController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java similarity index 87% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectGroupController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java index 41630bf6..8ebc7209 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectGroupController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java @@ -1,41 +1,31 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.qqkj.mdp.qx.HasQx; -import com.qqkj.xm.core.vo.XmProjectGroupVo; +import com.alibaba.fastjson.JSON; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.mdp.qx.HasQx; +import com.mdp.safe.common.entity.User; +import com.mdp.safe.common.utils.LoginUtils; +import com.xm.core.entity.XmProject; +import com.xm.core.entity.XmProjectGroup; +import com.xm.core.service.XmProjectGroupService; +import com.xm.core.service.XmProjectService; +import com.xm.core.service.XmRecordService; +import com.xm.core.service.push.XmPushMsgService; +import com.xm.core.vo.XmProjectGroupVo; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.safe.common.entity.User; -import com.qqkj.mdp.safe.common.utils.LoginUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.alibaba.fastjson.JSON; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.xm.core.service.XmProjectGroupService; -import com.qqkj.xm.core.service.XmProjectService; -import com.qqkj.xm.core.service.XmRecordService; -import com.qqkj.xm.core.service.push.XmPushMsgService; -import com.qqkj.xm.core.entity.XmProject; -import com.qqkj.xm.core.entity.XmProjectGroup; /** * url编制采用rest风格,如对XM.xm_project_group xm_project_group的操作有增删改查,对应的url分别为:
* 新增: xm/xmProjectGroup/add
@@ -61,14 +51,14 @@ public class XmProjectGroupController { private XmProjectService xmProjectService; @Autowired - XmPushMsgService pushMsgService; + XmPushMsgService pushMsgService; @Autowired - XmRecordService xmRecordService; + XmRecordService xmRecordService; @ApiOperation( value = "删除旧团队，新增新团队",notes="") @ApiResponses({ - @ApiResponse(code = 200,response=XmProjectGroup.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") + @ApiResponse(code = 200,response= XmProjectGroup.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") }) @HasQx(value = "xm_core_xmProjectGroup_updateGroup",name = "批量更新修改项目团队信息",categoryId = "admin-xm",categoryName = "管理端-项目管理系统") @RequestMapping(value="/updateGroup",method=RequestMethod.POST) diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectGroupFormworkController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupFormworkController.java similarity index 83% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectGroupFormworkController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupFormworkController.java index d137cd9a..610d2114 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectGroupFormworkController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupFormworkController.java @@ -1,37 +1,22 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmProjectGroupFormwork; +import com.xm.core.service.XmProjectGroupFormworkService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmProjectGroupFormworkService; -import com.qqkj.xm.core.entity.XmProjectGroupFormwork; /** * url编制采用rest风格,如对XM.xm_project_group_formwork xm_project_group_formwork的操作有增删改查,对应的url分别为:
* 新增: xm/xmProjectGroupFormwork/add
@@ -69,7 +54,7 @@ public class XmProjectGroupFormworkController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmProjectGroupFormwork.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProjectGroupFormwork.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProjectGroupFormwork( @RequestParam Map xmProjectGroupFormwork){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectGroupStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupStateController.java similarity index 88% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectGroupStateController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupStateController.java index ad7c47f7..a972daf1 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectGroupStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupStateController.java @@ -1,37 +1,21 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmProjectGroupState; +import com.xm.core.service.XmProjectGroupStateService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmProjectGroupStateService; -import com.qqkj.xm.core.entity.XmProjectGroupState; /** * url编制采用rest风格,如对XM.xm_project_group_state 功能状态表,无需前端维护，所有数据由汇总统计得出的操作有增删改查,对应的url分别为:
* 新增: core/xmProjectGroupState/add
@@ -101,7 +85,7 @@ public class XmProjectGroupStateController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmProjectGroupState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProjectGroupState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProjectGroupState( @RequestParam Map xmProjectGroupState){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectGroupUserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupUserController.java similarity index 86% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectGroupUserController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupUserController.java index 752f8922..7a6b8789 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectGroupUserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupUserController.java @@ -1,37 +1,23 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmProjectGroupUser; +import com.xm.core.service.XmProjectGroupUserService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmProjectGroupUserService; -import com.qqkj.xm.core.entity.XmProjectGroupUser; /** * url编制采用rest风格,如对XM.xm_project_group_user xm_project_group_user的操作有增删改查,对应的url分别为:
* 新增: core/xmProjectGroupUser/add
@@ -76,7 +62,7 @@ public class XmProjectGroupUserController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmProjectGroupUser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProjectGroupUser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProjectGroupUser( @RequestParam Map xmProjectGroupUser){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectKpiController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiController.java similarity index 84% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectKpiController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiController.java index 5e983b91..ab2e8728 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectKpiController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiController.java @@ -1,37 +1,22 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmProjectKpi; +import com.xm.core.service.XmProjectKpiService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmProjectKpiService; -import com.qqkj.xm.core.entity.XmProjectKpi; /** * url编制采用rest风格,如对XM.xm_project_kpi xm_project_kpi的操作有增删改查,对应的url分别为:
* 新增: xm/xmProjectKpi/add
@@ -80,7 +65,7 @@ public class XmProjectKpiController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmProjectKpi.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProjectKpi.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProjectKpi( @RequestParam Map xmProjectKpi){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectKpiHisController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiHisController.java similarity index 87% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectKpiHisController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiHisController.java index 77dc5369..88f981e2 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectKpiHisController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiHisController.java @@ -1,37 +1,23 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmProjectKpiHis; +import com.xm.core.service.XmProjectKpiHisService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmProjectKpiHisService; -import com.qqkj.xm.core.entity.XmProjectKpiHis; /** * url编制采用rest风格,如对XM.xm_project_kpi_his xm_project_kpi_his的操作有增删改查,对应的url分别为:
* 新增: xm/xmProjectKpiHis/add
@@ -82,7 +68,7 @@ public class XmProjectKpiHisController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmProjectKpiHis.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProjectKpiHis.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProjectKpiHis( @RequestParam Map xmProjectKpiHis){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMBudgetCostNouserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMBudgetCostNouserController.java similarity index 92% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMBudgetCostNouserController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProjectMBudgetCostNouserController.java index 1c9a14ab..da701211 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMBudgetCostNouserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMBudgetCostNouserController.java @@ -1,41 +1,28 @@ -package com.qqkj.xm.core.ctrl; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +package com.xm.core.ctrl; +import com.alibaba.fastjson.JSON; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.NumberUtil; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.qqkj.audit.log.client.annotation.AuditLog; +import com.qqkj.audit.log.client.annotation.OperType; +import com.xm.core.entity.XmProjectMBudgetCostNouser; +import com.xm.core.service.XmProjectMBudgetCostNouserService; +import com.xm.core.service.XmRecordService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.alibaba.fastjson.JSON; -import com.qqkj.audit.log.client.annotation.AuditLog; -import com.qqkj.audit.log.client.annotation.OperType; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.utils.NumberUtil; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.xm.core.entity.XmProjectMBudgetCostNouser; -import com.qqkj.xm.core.entity.XmProjectMBudgetCostUser; -import com.qqkj.xm.core.entity.XmProjectMBudgetCostNouser; -import com.qqkj.xm.core.service.XmProjectMBudgetCostNouserService; -import com.qqkj.xm.core.service.XmRecordService; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * url编制采用rest风格,如对XM.xm_project_m_budget_cost_nouser xm_project_m_budget_cost_nouser的操作有增删改查,对应的url分别为:
* 新增: xm/xmProjectMBudgetCostNouser/add
@@ -59,7 +46,7 @@ public class XmProjectMBudgetCostNouserController { @Autowired - XmRecordService xmRecordService; + XmRecordService xmRecordService; @ApiOperation( value = "查询xm_project_m_budget_cost_nouser信息列表",notes="listXmProjectMBudgetCostNouser,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}") @@ -83,7 +70,7 @@ public class XmProjectMBudgetCostNouserController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmProjectMBudgetCostNouser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProjectMBudgetCostNouser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProjectMBudgetCostNouser( @RequestParam Map xmProjectMBudgetCostNouser){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMBudgetCostUserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMBudgetCostUserController.java similarity index 93% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMBudgetCostUserController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProjectMBudgetCostUserController.java index 672240a5..09f88111 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMBudgetCostUserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMBudgetCostUserController.java @@ -1,39 +1,28 @@ -package com.qqkj.xm.core.ctrl; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +package com.xm.core.ctrl; +import com.alibaba.fastjson.JSON; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.NumberUtil; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.qqkj.audit.log.client.annotation.AuditLog; +import com.qqkj.audit.log.client.annotation.OperType; +import com.xm.core.entity.XmProjectMBudgetCostUser; +import com.xm.core.service.XmProjectMBudgetCostUserService; +import com.xm.core.service.XmRecordService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.alibaba.fastjson.JSON; -import com.qqkj.audit.log.client.annotation.AuditLog; -import com.qqkj.audit.log.client.annotation.OperType; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.utils.NumberUtil; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.xm.core.entity.XmProjectMBudgetCostUser; -import com.qqkj.xm.core.service.XmProjectMBudgetCostUserService; -import com.qqkj.xm.core.service.XmRecordService; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @RestController("xm.core.xmProjectMBudgetCostUserController") @RequestMapping(value="/**/xm/core/xmProjectMBudgetCostUser") @Api(tags={"xm_project_m_budget_cost_user操作接口"}) @@ -47,7 +36,7 @@ public class XmProjectMBudgetCostUserController { @Autowired - XmRecordService xmRecordService; + XmRecordService xmRecordService; @ApiOperation( value = "查询xm_project_m_budget_cost_user信息列表",notes="listXmProjectMBudgetCostUser,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}") @ApiImplicitParams({ @@ -72,7 +61,7 @@ public class XmProjectMBudgetCostUserController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmProjectMBudgetCostUser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProjectMBudgetCostUser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProjectMBudgetCostUser( @RequestParam Map xmProjectMBudgetCostUser){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMCostNouserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMCostNouserController.java similarity index 92% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMCostNouserController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProjectMCostNouserController.java index 1943d35f..4658d201 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMCostNouserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMCostNouserController.java @@ -1,39 +1,28 @@ -package com.qqkj.xm.core.ctrl; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +package com.xm.core.ctrl; +import com.alibaba.fastjson.JSON; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.NumberUtil; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.qqkj.audit.log.client.annotation.AuditLog; +import com.qqkj.audit.log.client.annotation.OperType; +import com.xm.core.entity.XmProjectMCostNouser; +import com.xm.core.service.XmProjectMCostNouserService; +import com.xm.core.service.XmRecordService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.alibaba.fastjson.JSON; -import com.qqkj.audit.log.client.annotation.AuditLog; -import com.qqkj.audit.log.client.annotation.OperType; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.utils.NumberUtil; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.xm.core.entity.XmProjectMCostNouser; -import com.qqkj.xm.core.service.XmProjectMCostNouserService; -import com.qqkj.xm.core.service.XmRecordService; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * url编制采用rest风格,如对XM.xm_project_m_cost_nouser xm_project_m_cost_nouser的操作有增删改查,对应的url分别为:
* 新增: xm/xmProjectMCostNouser/add
@@ -57,7 +46,7 @@ public class XmProjectMCostNouserController { @Autowired - XmRecordService xmRecordService; + XmRecordService xmRecordService; @ApiOperation( value = "查询xm_project_m_cost_nouser信息列表",notes="listXmProjectMCostNouser,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}") @@ -89,7 +78,7 @@ public class XmProjectMCostNouserController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmProjectMCostNouser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProjectMCostNouser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProjectMCostNouser( @RequestParam Map xmProjectMCostNouser){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMCostUserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMCostUserController.java similarity index 91% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMCostUserController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProjectMCostUserController.java index 7d2cb48a..41b86c41 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectMCostUserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMCostUserController.java @@ -1,40 +1,29 @@ -package com.qqkj.xm.core.ctrl; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +package com.xm.core.ctrl; +import com.alibaba.fastjson.JSON; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.NumberUtil; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.qqkj.audit.log.client.annotation.AuditLog; +import com.qqkj.audit.log.client.annotation.OperType; +import com.xm.core.entity.XmProjectMBudgetCostNouser; +import com.xm.core.entity.XmProjectMCostUser; +import com.xm.core.service.XmProjectMCostUserService; +import com.xm.core.service.XmRecordService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.alibaba.fastjson.JSON; -import com.qqkj.audit.log.client.annotation.AuditLog; -import com.qqkj.audit.log.client.annotation.OperType; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.utils.NumberUtil; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.xm.core.entity.XmProjectMBudgetCostNouser; -import com.qqkj.xm.core.entity.XmProjectMCostUser; -import com.qqkj.xm.core.service.XmProjectMCostUserService; -import com.qqkj.xm.core.service.XmRecordService; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * url编制采用rest风格,如对XM.xm_project_m_cost_user xm_project_m_cost_user的操作有增删改查,对应的url分别为:
* 新增: xm/xmProjectMCostUser/add
@@ -58,7 +47,7 @@ public class XmProjectMCostUserController { @Autowired - XmRecordService xmRecordService; + XmRecordService xmRecordService; @ApiOperation( value = "查询xm_project_m_cost_user信息列表",notes="listXmProjectMCostUser,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}") @@ -91,7 +80,7 @@ public class XmProjectMCostUserController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmProjectMCostUser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProjectMCostUser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProjectMCostUser( @RequestParam Map xmProjectMCostUser){ @@ -108,7 +97,7 @@ public class XmProjectMCostUserController { @ApiResponses({ - @ApiResponse(code = 200,response=XmProjectMBudgetCostNouser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProjectMBudgetCostNouser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/listSum",method=RequestMethod.GET) public Map listSum( @RequestParam Map xmProjectMCostUser){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectOptionsController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectOptionsController.java similarity index 85% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectOptionsController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProjectOptionsController.java index 18543879..dfcf3272 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectOptionsController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectOptionsController.java @@ -1,37 +1,23 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmProjectOptions; +import com.xm.core.service.XmProjectOptionsService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmProjectOptionsService; -import com.qqkj.xm.core.entity.XmProjectOptions; /** * url编制采用rest风格,如对XM.xm_project_options xm_project_options的操作有增删改查,对应的url分别为:
* 新增: xm/xmProjectOptions/add
@@ -69,7 +55,7 @@ public class XmProjectOptionsController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmProjectOptions.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProjectOptions.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProjectOptions( @RequestParam Map xmProjectOptions){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectPhaseBaselineController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseBaselineController.java similarity index 88% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectPhaseBaselineController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseBaselineController.java index 120586d6..e9a0036e 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectPhaseBaselineController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseBaselineController.java @@ -1,37 +1,23 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmProjectPhaseBaseline; +import com.xm.core.service.XmProjectPhaseBaselineService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmProjectPhaseBaselineService; -import com.qqkj.xm.core.entity.XmProjectPhaseBaseline; /** * url编制采用rest风格,如对XM.xm_project_phase_baseline xm_project_phase_baseline的操作有增删改查,对应的url分别为:
* 新增: xm/xmProjectPhaseBaseline/add
@@ -85,7 +71,7 @@ public class XmProjectPhaseBaselineController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmProjectPhaseBaseline.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProjectPhaseBaseline.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProjectPhaseBaseline( @RequestParam Map xmProjectPhaseBaseline){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectPhaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java similarity index 94% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectPhaseController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java index 192a9cda..c9e433d1 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectPhaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java @@ -1,41 +1,29 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.qqkj.mdp.qx.HasQx; +import com.alibaba.fastjson.JSON; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.NumberUtil; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.mdp.qx.HasQx; +import com.xm.core.entity.XmProjectPhase; +import com.xm.core.service.XmProjectPhaseService; +import com.xm.core.service.XmProjectService; +import com.xm.core.service.XmRecordService; +import com.xm.core.vo.XmProjectPhaseVo; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import com.alibaba.fastjson.JSON; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.utils.NumberUtil; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.xm.core.entity.XmProjectPhase; -import com.qqkj.xm.core.service.XmProjectPhaseService; -import com.qqkj.xm.core.service.XmProjectService; -import com.qqkj.xm.core.service.XmRecordService; -import com.qqkj.xm.core.vo.CalcActPhaseDataVo; -import com.qqkj.xm.core.vo.XmProjectPhaseVo; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * url编制采用rest风格,如对XM.xm_project_phase 项目阶段模板的操作有增删改查,对应的url分别为:
* 新增: xm/xmProjectPhase/add
@@ -61,7 +49,7 @@ public class XmProjectPhaseController { @Autowired private XmProjectService xmProjectService; @Autowired - XmRecordService xmRecordService; + XmRecordService xmRecordService; @ApiOperation( value = "查询项目阶段模板信息列表",notes="listXmProjectPhase,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}") @ApiImplicitParams({ @@ -110,7 +98,7 @@ public class XmProjectPhaseController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmProjectPhase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProjectPhase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProjectPhase( @RequestParam Map xmProjectPhase){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectPhaseTemplateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseTemplateController.java similarity index 88% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectPhaseTemplateController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseTemplateController.java index 22a5bc77..d35ea66d 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectPhaseTemplateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseTemplateController.java @@ -1,37 +1,22 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmProjectPhaseTemplate; +import com.xm.core.service.XmProjectPhaseTemplateService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmProjectPhaseTemplateService; -import com.qqkj.xm.core.entity.XmProjectPhaseTemplate; /** * url编制采用rest风格,如对XM.xm_project_phase_template 项目阶段模板的操作有增删改查,对应的url分别为:
* 新增: xm/xmProjectPhaseTemplate/add
@@ -89,7 +74,7 @@ public class XmProjectPhaseTemplateController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmProjectPhaseTemplate.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProjectPhaseTemplate.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProjectPhaseTemplate( @RequestParam Map xmProjectPhaseTemplate){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateController.java similarity index 90% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectStateController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateController.java index e91b125f..bc0dacb0 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateController.java @@ -1,37 +1,22 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmProjectState; +import com.xm.core.service.XmProjectStateService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmProjectStateService; -import com.qqkj.xm.core.entity.XmProjectState; /** * url编制采用rest风格,如对XM.xm_project_state 项目指标日统计表的操作有增删改查,对应的url分别为:
* 新增: xm/xmProjectState/add
@@ -121,7 +106,7 @@ public class XmProjectStateController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmProjectState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProjectState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProjectState( @RequestParam Map xmProjectState){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectStateHisController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateHisController.java similarity index 91% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectStateHisController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateHisController.java index f655c400..e791abee 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectStateHisController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateHisController.java @@ -1,37 +1,23 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmProjectStateHis; +import com.xm.core.service.XmProjectStateHisService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmProjectStateHisService; -import com.qqkj.xm.core.entity.XmProjectStateHis; /** * url编制采用rest风格,如对XM.xm_project_state_his 项目指标日统计表的操作有增删改查,对应的url分别为:
* 新增: core/xmProjectStateHis/add
@@ -119,7 +105,7 @@ public class XmProjectStateHisController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmProjectStateHis.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProjectStateHis.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProjectStateHis( @RequestParam Map xmProjectStateHis){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectTaskTypeStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectTaskTypeStateController.java similarity index 87% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectTaskTypeStateController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProjectTaskTypeStateController.java index aba30800..ed44feac 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectTaskTypeStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectTaskTypeStateController.java @@ -1,38 +1,22 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmProjectTaskTypeState; +import com.xm.core.service.XmProjectTaskTypeStateService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmProjectTaskTypeStateService; -import com.qqkj.xm.core.entity.XmBranchState; -import com.qqkj.xm.core.entity.XmProjectTaskTypeState; /** * url编制采用rest风格,如对XM.xm_project_task_type_state 按任务类型汇总的操作有增删改查,对应的url分别为:
* 新增: core/xmProjectTaskTypeState/add
@@ -87,7 +71,7 @@ public class XmProjectTaskTypeStateController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmProjectTaskTypeState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProjectTaskTypeState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProjectTaskTypeState( @RequestParam Map xmProjectTaskTypeState){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectTemplateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectTemplateController.java similarity index 88% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectTemplateController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmProjectTemplateController.java index 89025f79..5f1d300b 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmProjectTemplateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectTemplateController.java @@ -1,37 +1,22 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmProjectTemplate; +import com.xm.core.service.XmProjectTemplateService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmProjectTemplateService; -import com.qqkj.xm.core.entity.XmProjectTemplate; /** * url编制采用rest风格,如对XM.xm_project_template xm_project_template的操作有增删改查,对应的url分别为:
* 新增: xm/xmProjectTemplate/add
@@ -112,7 +97,7 @@ public class XmProjectTemplateController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmProjectTemplate.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmProjectTemplate.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmProjectTemplate( @RequestParam Map xmProjectTemplate){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmQuestionController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java similarity index 90% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmQuestionController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java index 25e3d254..b493502e 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmQuestionController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java @@ -1,40 +1,29 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.qqkj.mdp.qx.HasQx; -import com.qqkj.xm.core.vo.XmQuestionVo; - -import org.springframework.util.StringUtils; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.mdp.qx.HasQx; +import com.mdp.safe.common.entity.User; +import com.mdp.safe.common.utils.LoginUtils; +import com.qqkj.audit.log.client.annotation.AuditLog; +import com.qqkj.audit.log.client.annotation.OperType; +import com.xm.core.entity.XmQuestion; +import com.xm.core.service.XmQuestionService; +import com.xm.core.service.push.XmPushMsgService; +import com.xm.core.vo.XmQuestionVo; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.safe.common.entity.User; -import com.qqkj.mdp.safe.common.utils.LoginUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.audit.log.client.annotation.AuditLog; -import com.qqkj.audit.log.client.annotation.OperType; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.xm.core.service.XmQuestionService; -import com.qqkj.xm.core.service.push.XmPushMsgService; -import com.qqkj.xm.core.entity.XmQuestion; /** * url编制采用rest风格,如对XM.xm_question xm_question的操作有增删改查,对应的url分别为:
* 新增: xm/xmQuestion/add
@@ -57,7 +46,7 @@ public class XmQuestionController { private XmQuestionService xmQuestionService; @Autowired - private XmPushMsgService xmPushMsgService; + private XmPushMsgService xmPushMsgService; @ApiOperation( value = "查询xm_question信息列表",notes="listXmQuestion,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}") @@ -104,7 +93,7 @@ public class XmQuestionController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmQuestion.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmQuestion.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmQuestion( @RequestParam Map xmQuestion){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmQuestionHandleController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionHandleController.java similarity index 87% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmQuestionHandleController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmQuestionHandleController.java index 5a845a09..73dd3bd5 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmQuestionHandleController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionHandleController.java @@ -1,37 +1,23 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmQuestionHandle; +import com.xm.core.service.XmQuestionHandleService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmQuestionHandleService; -import com.qqkj.xm.core.entity.XmQuestionHandle; /** * url编制采用rest风格,如对XM.xm_question_handle xm_question_handle的操作有增删改查,对应的url分别为:
* 新增: xm/xmQuestionHandle/add
@@ -82,7 +68,7 @@ public class XmQuestionHandleController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmQuestionHandle.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmQuestionHandle.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmQuestionHandle( @RequestParam Map xmQuestionHandle){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmQuestionTagController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionTagController.java similarity index 85% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmQuestionTagController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmQuestionTagController.java index 26359adf..9d5396c0 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmQuestionTagController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionTagController.java @@ -1,37 +1,23 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmQuestionTag; +import com.xm.core.service.XmQuestionTagService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmQuestionTagService; -import com.qqkj.xm.core.entity.XmQuestionTag; /** * url编制采用rest风格,如对XM.xm_question_tag 问题标签关联表的操作有增删改查,对应的url分别为:
* 新增: xm/xmQuestionTag/add
@@ -70,7 +56,7 @@ public class XmQuestionTagController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmQuestionTag.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmQuestionTag.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmQuestionTag( @RequestParam Map xmQuestionTag){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmRecordController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmRecordController.java similarity index 86% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmRecordController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmRecordController.java index fce2a3e7..2ab269f0 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmRecordController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmRecordController.java @@ -1,37 +1,23 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmRecord; +import com.xm.core.service.XmRecordService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmRecordService; -import com.qqkj.xm.core.entity.XmRecord; /** * url编制采用rest风格,如对XM.xm_record xm_record的操作有增删改查,对应的url分别为:
* 新增: xm/xmRecord/add
@@ -79,7 +65,7 @@ public class XmRecordController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmRecord.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmRecord.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmRecord( @RequestParam Map xmRecord){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java similarity index 94% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTaskController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index 91f63344..a7793ef5 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -1,45 +1,33 @@ -package com.qqkj.xm.core.ctrl; - -import java.math.BigDecimal; -import java.util.*; +package com.xm.core.ctrl; import com.alibaba.fastjson.JSON; -import com.github.pagehelper.Page; -import com.qqkj.mdp.qx.HasQx; -import com.qqkj.xm.core.vo.XmProjectGroupVo; -import com.qqkj.xm.core.vo.XmTaskVo; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.NumberUtil; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.mdp.qx.HasQx; +import com.mdp.safe.common.entity.User; +import com.mdp.safe.common.utils.LoginUtils; +import com.qqkj.audit.log.client.annotation.AuditLog; +import com.qqkj.audit.log.client.annotation.OperType; +import com.xm.core.entity.XmTask; +import com.xm.core.service.XmProjectGroupService; +import com.xm.core.service.XmRecordService; +import com.xm.core.service.XmTaskService; +import com.xm.core.service.push.XmPushMsgService; +import com.xm.core.vo.XmProjectGroupVo; +import com.xm.core.vo.XmTaskVo; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.math.BigDecimal; +import java.util.*; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.safe.common.entity.User; -import com.qqkj.mdp.safe.common.utils.LoginUtils; -import com.qqkj.mdp.core.utils.NumberUtil; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.audit.log.client.annotation.AuditLog; -import com.qqkj.audit.log.client.annotation.OperType; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.xm.core.service.XmProjectGroupService; -import com.qqkj.xm.core.service.XmRecordService; -import com.qqkj.xm.core.service.XmTaskService; -import com.qqkj.xm.core.service.push.XmPushMsgService; -import com.qqkj.xm.core.entity.XmTask; -import com.qqkj.xm.core.entity.XmTask; /** * url编制采用rest风格,如对XM.xm_task xm_task的操作有增删改查,对应的url分别为:
* 新增: xm/xmTask/add
@@ -62,13 +50,13 @@ public class XmTaskController { private XmTaskService xmTaskService; @Autowired - XmProjectGroupService groupService; + XmProjectGroupService groupService; @Autowired private XmRecordService xmRecordService; @Autowired - private XmPushMsgService xmPushMsgService; + private XmPushMsgService xmPushMsgService; @ApiOperation( value = "查询xm_task信息列表",notes="listXmTask,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}") @@ -111,7 +99,7 @@ public class XmTaskController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmTask.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmTask.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/getTask",method=RequestMethod.GET) public Map getTask( @RequestParam Map xmTask){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTaskExecuserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java similarity index 93% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTaskExecuserController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java index 839fe947..863b5be8 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTaskExecuserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java @@ -1,47 +1,31 @@ -package com.qqkj.xm.core.ctrl; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +package com.xm.core.ctrl; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.mdp.qx.HasQx; +import com.mdp.safe.common.entity.User; +import com.mdp.safe.common.utils.LoginUtils; import com.qqkj.audit.log.client.annotation.AuditLog; import com.qqkj.audit.log.client.annotation.OperType; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.qx.HasQx; +import com.xm.core.entity.XmTaskExecuser; +import com.xm.core.service.XmProjectGroupService; +import com.xm.core.service.XmProjectGroupUserService; +import com.xm.core.service.XmTaskExecuserService; +import com.xm.core.vo.XmProjectGroupVo; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.safe.common.entity.User; -import com.qqkj.mdp.safe.common.utils.LoginUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmProjectGroupService; -import com.qqkj.xm.core.service.XmProjectGroupUserService; -import com.qqkj.xm.core.service.XmTaskExecuserService; -import com.qqkj.xm.core.vo.XmProjectGroupVo; -import com.qqkj.xm.core.entity.XmProjectGroupUser; -import com.qqkj.xm.core.entity.XmTaskExecuser; /** * url编制采用rest风格,如对XM.xm_task_execuser xm_task_execuser的操作有增删改查,对应的url分别为:
* 新增: xm/xmTaskExecuser/add
@@ -64,11 +48,11 @@ public class XmTaskExecuserController { private XmTaskExecuserService xmTaskExecuserService; @Autowired - XmProjectGroupUserService xmProjectGroupUserService; + XmProjectGroupUserService xmProjectGroupUserService; @Autowired - XmProjectGroupService groupService; + XmProjectGroupService groupService; @ApiOperation( value = "查询xm_task_execuser信息列表",notes="listXmTaskExecuser,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}") @ApiImplicitParams({ @@ -94,7 +78,7 @@ public class XmTaskExecuserController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmTaskExecuser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmTaskExecuser.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmTaskExecuser( @RequestParam Map xmTaskExecuser){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTaskSkillController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSkillController.java similarity index 83% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTaskSkillController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmTaskSkillController.java index e069916a..163334d2 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTaskSkillController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSkillController.java @@ -1,38 +1,22 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.qx.HasQx; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.mdp.qx.HasQx; +import com.xm.core.entity.XmTaskSkill; +import com.xm.core.service.XmTaskSkillService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmTaskSkillService; -import com.qqkj.xm.core.entity.XmTaskSkill; /** * url编制采用rest风格,如对XM.xm_task_skill xm_task_skill的操作有增删改查,对应的url分别为:
* 新增: xm/xmTaskSkill/add
@@ -71,7 +55,7 @@ public class XmTaskSkillController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmTaskSkill.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmTaskSkill.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmTaskSkill( @RequestParam Map xmTaskSkill){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTaskTemplateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskTemplateController.java similarity index 87% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTaskTemplateController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmTaskTemplateController.java index 6cdc78b6..98eb1a18 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTaskTemplateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskTemplateController.java @@ -1,37 +1,22 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.xm.core.entity.XmTaskTemplate; +import com.xm.core.service.XmTaskTemplateService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmTaskTemplateService; -import com.qqkj.xm.core.entity.XmTaskTemplate; /** * url编制采用rest风格,如对XM.xm_task_template xm_task_template的操作有增删改查,对应的url分别为:
* 新增: xm/xmTaskTemplate/add
@@ -88,7 +73,7 @@ public class XmTaskTemplateController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmTaskTemplate.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmTaskTemplate.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmTaskTemplate( @RequestParam Map xmTaskTemplate){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTestCaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java similarity index 84% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTestCaseController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java index a5ff8080..2ea03956 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTestCaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java @@ -1,38 +1,23 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.qx.HasQx; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.mdp.qx.HasQx; +import com.xm.core.entity.XmTestCase; +import com.xm.core.service.XmTestCaseService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmTestCaseService; -import com.qqkj.xm.core.entity.XmTestCase; /** * url编制采用rest风格,如对XM.xm_test_case 测试用例的操作有增删改查,对应的url分别为:
* 新增: core/xmTestCase/add
@@ -81,7 +66,7 @@ public class XmTestCaseController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmTestCase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmTestCase.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmTestCase( @RequestParam Map xmTestCase){ diff --git a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTestCaseExecController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseExecController.java similarity index 89% rename from xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTestCaseExecController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseExecController.java index 22a17689..5829aca5 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/ctrl/XmTestCaseExecController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseExecController.java @@ -1,38 +1,24 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.qx.HasQx; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.utils.RequestUtils; +import com.mdp.mybatis.PageUtils; +import com.mdp.qx.HasQx; +import com.xm.core.entity.XmTestCaseExec; +import com.xm.core.service.XmTestCaseExecService; +import io.swagger.annotations.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import com.qqkj.mdp.mybatis.PageUtils; -import com.qqkj.mdp.core.utils.RequestUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.service.XmTestCaseExecService; -import com.qqkj.xm.core.entity.XmTestCaseExec; /** * url编制采用rest风格,如对XM.xm_test_case_exec xm_test_case_exec的操作有增删改查,对应的url分别为:
* 新增: core/xmTestCaseExec/add
@@ -85,7 +71,7 @@ public class XmTestCaseExecController { @ApiImplicitParam(name="orderDirs",value="排序方式,与orderFields对应，升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']",required=false) }) @ApiResponses({ - @ApiResponse(code = 200,response=XmTestCaseExec.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmTestCaseExec.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmTestCaseExec( @RequestParam Map xmTestCaseExec){ diff --git a/xm-core/src/main/java/com/xm/core/ctrl/push/XmPushController.java b/xm-core/src/main/java/com/xm/core/ctrl/push/XmPushController.java new file mode 100644 index 00000000..f3a168d9 --- /dev/null +++ b/xm-core/src/main/java/com/xm/core/ctrl/push/XmPushController.java @@ -0,0 +1,30 @@ +package com.xm.core.ctrl.push; + + +import io.swagger.annotations.Api; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * url编制采用rest风格,如对XM.xm_branch_state 机构内所有项目指标汇总的操作有增删改查,对应的url分别为:
+ * 新增: core/xmBranchState/add
+ * 查询: core/xmBranchState/list
+ * 模糊查询: core/xmBranchState/listKey
+ * 修改: core/xmBranchState/edit
+ * 删除: core/xmBranchState/del
+ * 批量删除: core/xmBranchState/batchDel
+ * 组织 com.qqkj 顶级模块 xm 大模块 core 小模块
+ * 实体 XmBranchState 表 XM.xm_branch_state 当前主键(包括多主键): id; + ***/ +@RestController("xm.core.push.xmPushController") +@RequestMapping(value="/**/core/push") +@Api(tags={"消息推送接口"}) +public class XmPushController { + + static Log logger=LogFactory.getLog(XmPushController.class); + + + +} diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmAttachment.java b/xm-core/src/main/java/com/xm/core/entity/XmAttachment.java similarity index 98% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmAttachment.java rename to xm-core/src/main/java/com/xm/core/entity/XmAttachment.java index 122a56c5..5ab2ccd1 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmAttachment.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmAttachment.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmBranchState.java b/xm-core/src/main/java/com/xm/core/entity/XmBranchState.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmBranchState.java rename to xm-core/src/main/java/com/xm/core/entity/XmBranchState.java index 6671fba8..1cfd253d 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmBranchState.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmBranchState.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmBranchTaskTypeState.java b/xm-core/src/main/java/com/xm/core/entity/XmBranchTaskTypeState.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmBranchTaskTypeState.java rename to xm-core/src/main/java/com/xm/core/entity/XmBranchTaskTypeState.java index d8c12a0b..77df8b14 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmBranchTaskTypeState.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmBranchTaskTypeState.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmEnvList.java b/xm-core/src/main/java/com/xm/core/entity/XmEnvList.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmEnvList.java rename to xm-core/src/main/java/com/xm/core/entity/XmEnvList.java index d8153270..f1ec8b87 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmEnvList.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmEnvList.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmExchange.java b/xm-core/src/main/java/com/xm/core/entity/XmExchange.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmExchange.java rename to xm-core/src/main/java/com/xm/core/entity/XmExchange.java index 36fa5f93..7e154a64 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmExchange.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmExchange.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmFile.java b/xm-core/src/main/java/com/xm/core/entity/XmFile.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmFile.java rename to xm-core/src/main/java/com/xm/core/entity/XmFile.java index 3e47f4d1..dc340264 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmFile.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmFile.java @@ -1,7 +1,8 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.util.Date; /** diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmIteration.java b/xm-core/src/main/java/com/xm/core/entity/XmIteration.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmIteration.java rename to xm-core/src/main/java/com/xm/core/entity/XmIteration.java index a22d6f24..e445cdc0 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmIteration.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmIteration.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmIterationMenu.java b/xm-core/src/main/java/com/xm/core/entity/XmIterationMenu.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmIterationMenu.java rename to xm-core/src/main/java/com/xm/core/entity/XmIterationMenu.java index b205919a..7f91b164 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmIterationMenu.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmIterationMenu.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmIterationState.java b/xm-core/src/main/java/com/xm/core/entity/XmIterationState.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmIterationState.java rename to xm-core/src/main/java/com/xm/core/entity/XmIterationState.java index 287ddbf7..5f5dba56 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmIterationState.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmIterationState.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmMenu.java b/xm-core/src/main/java/com/xm/core/entity/XmMenu.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmMenu.java rename to xm-core/src/main/java/com/xm/core/entity/XmMenu.java index 33b0d69b..8af98c09 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmMenu.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmMenu.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmMenuExchange.java b/xm-core/src/main/java/com/xm/core/entity/XmMenuExchange.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmMenuExchange.java rename to xm-core/src/main/java/com/xm/core/entity/XmMenuExchange.java index 7fc6d240..d86c57de 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmMenuExchange.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmMenuExchange.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmMenuPlan.java b/xm-core/src/main/java/com/xm/core/entity/XmMenuPlan.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmMenuPlan.java rename to xm-core/src/main/java/com/xm/core/entity/XmMenuPlan.java index d1dcf808..7f903a2d 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmMenuPlan.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmMenuPlan.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmMenuState.java b/xm-core/src/main/java/com/xm/core/entity/XmMenuState.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmMenuState.java rename to xm-core/src/main/java/com/xm/core/entity/XmMenuState.java index 49d6a85f..1d37e88c 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmMenuState.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmMenuState.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmMenuTemplate.java b/xm-core/src/main/java/com/xm/core/entity/XmMenuTemplate.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmMenuTemplate.java rename to xm-core/src/main/java/com/xm/core/entity/XmMenuTemplate.java index 3a8f20df..566e1187 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmMenuTemplate.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmMenuTemplate.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmMyFocus.java b/xm-core/src/main/java/com/xm/core/entity/XmMyFocus.java similarity index 98% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmMyFocus.java rename to xm-core/src/main/java/com/xm/core/entity/XmMyFocus.java index 7e9955fe..dc1a2cf7 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmMyFocus.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmMyFocus.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProduct.java b/xm-core/src/main/java/com/xm/core/entity/XmProduct.java similarity index 98% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProduct.java rename to xm-core/src/main/java/com/xm/core/entity/XmProduct.java index 8e57a2d8..4b6d65fb 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProduct.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProduct.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProductState.java b/xm-core/src/main/java/com/xm/core/entity/XmProductState.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProductState.java rename to xm-core/src/main/java/com/xm/core/entity/XmProductState.java index 60562824..c40004e0 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProductState.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProductState.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProductTemplate.java b/xm-core/src/main/java/com/xm/core/entity/XmProductTemplate.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProductTemplate.java rename to xm-core/src/main/java/com/xm/core/entity/XmProductTemplate.java index 927ce382..28380b4d 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProductTemplate.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProductTemplate.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProject.java b/xm-core/src/main/java/com/xm/core/entity/XmProject.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProject.java rename to xm-core/src/main/java/com/xm/core/entity/XmProject.java index e7e33e2d..b0911ffc 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProject.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProject.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectBaseline.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectBaseline.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectBaseline.java rename to xm-core/src/main/java/com/xm/core/entity/XmProjectBaseline.java index 96ed3243..7032bbab 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectBaseline.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectBaseline.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectContract.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectContract.java similarity index 97% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectContract.java rename to xm-core/src/main/java/com/xm/core/entity/XmProjectContract.java index b9cb490d..7b2b0a5c 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectContract.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectContract.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectEnvList.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectEnvList.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectEnvList.java rename to xm-core/src/main/java/com/xm/core/entity/XmProjectEnvList.java index 6fb7762a..13168ee3 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectEnvList.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectEnvList.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectGroup.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroup.java similarity index 98% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectGroup.java rename to xm-core/src/main/java/com/xm/core/entity/XmProjectGroup.java index 0abe549a..42ec16a1 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectGroup.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroup.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectGroupFormwork.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupFormwork.java similarity index 98% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectGroupFormwork.java rename to xm-core/src/main/java/com/xm/core/entity/XmProjectGroupFormwork.java index 0bb760ea..2e85d76a 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectGroupFormwork.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupFormwork.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectGroupState.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupState.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectGroupState.java rename to xm-core/src/main/java/com/xm/core/entity/XmProjectGroupState.java index 3489741a..10a75b59 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectGroupState.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupState.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectGroupUser.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupUser.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectGroupUser.java rename to xm-core/src/main/java/com/xm/core/entity/XmProjectGroupUser.java index 2708c351..9641e65d 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectGroupUser.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupUser.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectKpi.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectKpi.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectKpi.java rename to xm-core/src/main/java/com/xm/core/entity/XmProjectKpi.java index ba8f7af0..beb8e28e 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectKpi.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectKpi.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectKpiHis.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectKpiHis.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectKpiHis.java rename to xm-core/src/main/java/com/xm/core/entity/XmProjectKpiHis.java index 4d4117ba..4e14ea39 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectKpiHis.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectKpiHis.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectMBudgetCostNouser.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostNouser.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectMBudgetCostNouser.java rename to xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostNouser.java index 2310a566..7ec7a7f8 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectMBudgetCostNouser.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostNouser.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectMBudgetCostUser.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostUser.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectMBudgetCostUser.java rename to xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostUser.java index 85355688..7336d3b1 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectMBudgetCostUser.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostUser.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectMCostNouser.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostNouser.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectMCostNouser.java rename to xm-core/src/main/java/com/xm/core/entity/XmProjectMCostNouser.java index bdc9363a..c6607e64 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectMCostNouser.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostNouser.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectMCostUser.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostUser.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectMCostUser.java rename to xm-core/src/main/java/com/xm/core/entity/XmProjectMCostUser.java index 48a963c7..46273093 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectMCostUser.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostUser.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectOptions.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectOptions.java similarity index 98% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectOptions.java rename to xm-core/src/main/java/com/xm/core/entity/XmProjectOptions.java index 24e84df3..09ea112d 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectOptions.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectOptions.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectPhase.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectPhase.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectPhase.java rename to xm-core/src/main/java/com/xm/core/entity/XmProjectPhase.java index 29c3f343..6e3593ad 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectPhase.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectPhase.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectPhaseBaseline.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectPhaseBaseline.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectPhaseBaseline.java rename to xm-core/src/main/java/com/xm/core/entity/XmProjectPhaseBaseline.java index 44dae42a..99a69e90 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectPhaseBaseline.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectPhaseBaseline.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectPhaseTemplate.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectPhaseTemplate.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectPhaseTemplate.java rename to xm-core/src/main/java/com/xm/core/entity/XmProjectPhaseTemplate.java index 92a60ee5..868efd18 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectPhaseTemplate.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectPhaseTemplate.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectState.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectState.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectState.java rename to xm-core/src/main/java/com/xm/core/entity/XmProjectState.java index e5f7a63c..cceaf2a1 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectState.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectState.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectStateHis.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectStateHis.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectStateHis.java rename to xm-core/src/main/java/com/xm/core/entity/XmProjectStateHis.java index ce60d8a9..488f821d 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectStateHis.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectStateHis.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectTaskTypeState.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectTaskTypeState.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectTaskTypeState.java rename to xm-core/src/main/java/com/xm/core/entity/XmProjectTaskTypeState.java index 9bea10eb..b60842bd 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectTaskTypeState.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectTaskTypeState.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectTemplate.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectTemplate.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectTemplate.java rename to xm-core/src/main/java/com/xm/core/entity/XmProjectTemplate.java index 346cc774..3f362572 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmProjectTemplate.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectTemplate.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmQuestion.java b/xm-core/src/main/java/com/xm/core/entity/XmQuestion.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmQuestion.java rename to xm-core/src/main/java/com/xm/core/entity/XmQuestion.java index 0cdf4791..969d1d30 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmQuestion.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmQuestion.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmQuestionHandle.java b/xm-core/src/main/java/com/xm/core/entity/XmQuestionHandle.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmQuestionHandle.java rename to xm-core/src/main/java/com/xm/core/entity/XmQuestionHandle.java index f5a1109b..4af31110 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmQuestionHandle.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmQuestionHandle.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmQuestionTag.java b/xm-core/src/main/java/com/xm/core/entity/XmQuestionTag.java similarity index 98% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmQuestionTag.java rename to xm-core/src/main/java/com/xm/core/entity/XmQuestionTag.java index ce7c5dd5..586860de 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmQuestionTag.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmQuestionTag.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmRecord.java b/xm-core/src/main/java/com/xm/core/entity/XmRecord.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmRecord.java rename to xm-core/src/main/java/com/xm/core/entity/XmRecord.java index e51caa13..d6237b4d 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmRecord.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmRecord.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmTask.java b/xm-core/src/main/java/com/xm/core/entity/XmTask.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmTask.java rename to xm-core/src/main/java/com/xm/core/entity/XmTask.java index b4ec0dab..3d65e0cd 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmTask.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmTask.java @@ -1,9 +1,10 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; + import java.math.BigDecimal; +import java.util.Date; /** * 组织 com.qqkj 顶级模块 xm 大模块 core 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmTaskExecuser.java b/xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmTaskExecuser.java rename to xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java index ce90b90d..82a387fc 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmTaskExecuser.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmTaskSkill.java b/xm-core/src/main/java/com/xm/core/entity/XmTaskSkill.java similarity index 98% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmTaskSkill.java rename to xm-core/src/main/java/com/xm/core/entity/XmTaskSkill.java index 91a75296..93cfc418 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmTaskSkill.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmTaskSkill.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmTaskTemplate.java b/xm-core/src/main/java/com/xm/core/entity/XmTaskTemplate.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmTaskTemplate.java rename to xm-core/src/main/java/com/xm/core/entity/XmTaskTemplate.java index 2fb9addb..dc669e93 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmTaskTemplate.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmTaskTemplate.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmTestCase.java b/xm-core/src/main/java/com/xm/core/entity/XmTestCase.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmTestCase.java rename to xm-core/src/main/java/com/xm/core/entity/XmTestCase.java index eb9a8396..ca1d1e23 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmTestCase.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmTestCase.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmTestCaseExec.java b/xm-core/src/main/java/com/xm/core/entity/XmTestCaseExec.java similarity index 99% rename from xm-core/src/main/java/com/qqkj/xm/core/entity/XmTestCaseExec.java rename to xm-core/src/main/java/com/xm/core/entity/XmTestCaseExec.java index a0f055ff..c7be653c 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/entity/XmTestCaseExec.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmTestCaseExec.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmAttachmentService.java b/xm-core/src/main/java/com/xm/core/service/XmAttachmentService.java similarity index 89% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmAttachmentService.java rename to xm-core/src/main/java/com/xm/core/service/XmAttachmentService.java index b55c82aa..e180ef97 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmAttachmentService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmAttachmentService.java @@ -1,7 +1,7 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmAttachment; +import com.mdp.core.service.BaseService; +import com.xm.core.entity.XmAttachment; import org.springframework.stereotype.Service; import java.util.List; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmBranchStateService.java b/xm-core/src/main/java/com/xm/core/service/XmBranchStateService.java similarity index 78% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmBranchStateService.java rename to xm-core/src/main/java/com/xm/core/service/XmBranchStateService.java index eea5c21a..cded597c 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmBranchStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmBranchStateService.java @@ -1,10 +1,8 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; -import java.util.List; -import java.util.Map; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmBranchState; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 xm 大模块 core 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmBranchTaskTypeStateService.java b/xm-core/src/main/java/com/xm/core/service/XmBranchTaskTypeStateService.java similarity index 79% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmBranchTaskTypeStateService.java rename to xm-core/src/main/java/com/xm/core/service/XmBranchTaskTypeStateService.java index b96a8d66..d9db7074 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmBranchTaskTypeStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmBranchTaskTypeStateService.java @@ -1,10 +1,8 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; -import java.util.List; -import java.util.Map; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmBranchTaskTypeState; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 xm 大模块 core 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmEnvListService.java b/xm-core/src/main/java/com/xm/core/service/XmEnvListService.java similarity index 94% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmEnvListService.java rename to xm-core/src/main/java/com/xm/core/service/XmEnvListService.java index 7ee18e77..c45b5d0f 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmEnvListService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmEnvListService.java @@ -1,17 +1,17 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.qqkj.mdp.safe.common.entity.User; -import com.qqkj.mdp.safe.common.utils.LoginUtils; +import com.mdp.safe.common.entity.User; +import com.mdp.safe.common.utils.LoginUtils; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmEnvList; +import com.mdp.core.err.BizException; +import com.mdp.core.service.BaseService; +import com.xm.core.entity.XmEnvList; import org.springframework.util.StringUtils; /** diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmExchangeService.java b/xm-core/src/main/java/com/xm/core/service/XmExchangeService.java similarity index 73% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmExchangeService.java rename to xm-core/src/main/java/com/xm/core/service/XmExchangeService.java index ab324601..78707cf8 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmExchangeService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmExchangeService.java @@ -1,10 +1,8 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; -import java.util.List; -import java.util.Map; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmExchange; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmFileService.java b/xm-core/src/main/java/com/xm/core/service/XmFileService.java similarity index 95% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmFileService.java rename to xm-core/src/main/java/com/xm/core/service/XmFileService.java index 51fe9735..f9177d2e 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmFileService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmFileService.java @@ -1,17 +1,18 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.safe.common.entity.User; -import com.qqkj.mdp.safe.common.utils.LoginUtils; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.safe.common.entity.User; +import com.mdp.safe.common.utils.LoginUtils; import com.qqkj.xm.core.entity.*; -import com.qqkj.xm.core.vo.XmFileVo; +import com.xm.core.entity.XmFile; +import com.xm.core.vo.XmFileVo; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; +import com.mdp.core.service.BaseService; import org.springframework.util.StringUtils; /** diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmIterationMenuService.java b/xm-core/src/main/java/com/xm/core/service/XmIterationMenuService.java similarity index 73% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmIterationMenuService.java rename to xm-core/src/main/java/com/xm/core/service/XmIterationMenuService.java index 6edbcb8b..db50eca4 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmIterationMenuService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmIterationMenuService.java @@ -1,10 +1,8 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; -import java.util.List; -import java.util.Map; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmIterationMenu; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmIterationService.java b/xm-core/src/main/java/com/xm/core/service/XmIterationService.java similarity index 89% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmIterationService.java rename to xm-core/src/main/java/com/xm/core/service/XmIterationService.java index e3b45e9c..c16f3ede 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmIterationService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmIterationService.java @@ -1,10 +1,10 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.List; import java.util.Map; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmIteration; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmIterationStateService.java b/xm-core/src/main/java/com/xm/core/service/XmIterationStateService.java similarity index 80% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmIterationStateService.java rename to xm-core/src/main/java/com/xm/core/service/XmIterationStateService.java index a684312e..c8020777 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmIterationStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmIterationStateService.java @@ -1,10 +1,8 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; -import java.util.List; -import java.util.Map; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmIterationState; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 xm 大模块 core 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmMenuExchangeService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuExchangeService.java similarity index 73% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmMenuExchangeService.java rename to xm-core/src/main/java/com/xm/core/service/XmMenuExchangeService.java index 8a5a23b9..68941c06 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmMenuExchangeService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuExchangeService.java @@ -1,10 +1,8 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; -import java.util.List; -import java.util.Map; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmMenuExchange; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmMenuPlanService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuPlanService.java similarity index 89% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmMenuPlanService.java rename to xm-core/src/main/java/com/xm/core/service/XmMenuPlanService.java index 706fbe12..f93433d9 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmMenuPlanService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuPlanService.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.ArrayList; import java.util.Date; @@ -9,12 +9,12 @@ import java.util.Map; import org.springframework.util.StringUtils; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.mdp.safe.common.entity.User; -import com.qqkj.mdp.safe.common.utils.LoginUtils; -import com.qqkj.xm.core.entity.XmMenu; -import com.qqkj.xm.core.entity.XmMenuPlan; +import com.mdp.core.entity.Tips; +import com.mdp.core.service.BaseService; +import com.mdp.safe.common.entity.User; +import com.mdp.safe.common.utils.LoginUtils; +import com.xm.core.entity.XmMenu; +import com.xm.core.entity.XmMenuPlan; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmMenuService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuService.java similarity index 91% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmMenuService.java rename to xm-core/src/main/java/com/xm/core/service/XmMenuService.java index 7b0f042f..afd29046 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmMenuService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuService.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.ArrayList; import java.util.List; @@ -6,9 +6,8 @@ import java.util.Map; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmMenu; -import com.qqkj.xm.core.vo.XmMenuVo; +import com.mdp.core.service.BaseService; +import com.xm.core.vo.XmMenuVo; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmMenuStateService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java similarity index 89% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmMenuStateService.java rename to xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java index d44e138c..cf9cbe15 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmMenuStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java @@ -1,11 +1,11 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.mdp.safe.common.entity.User; -import com.qqkj.mdp.safe.common.utils.LoginUtils; -import com.qqkj.xm.core.entity.XmMenu; -import com.qqkj.xm.core.entity.XmMenuState; +import com.mdp.core.entity.Tips; +import com.mdp.core.service.BaseService; +import com.mdp.safe.common.entity.User; +import com.mdp.safe.common.utils.LoginUtils; +import com.xm.core.entity.XmMenu; +import com.xm.core.entity.XmMenuState; import org.springframework.util.StringUtils; import org.springframework.stereotype.Service; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmMenuTemplateService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuTemplateService.java similarity index 74% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmMenuTemplateService.java rename to xm-core/src/main/java/com/xm/core/service/XmMenuTemplateService.java index 0d1836b7..15fb2731 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmMenuTemplateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuTemplateService.java @@ -1,10 +1,8 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; -import java.util.List; -import java.util.Map; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmMenuTemplate; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmMyFocusService.java b/xm-core/src/main/java/com/xm/core/service/XmMyFocusService.java similarity index 96% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmMyFocusService.java rename to xm-core/src/main/java/com/xm/core/service/XmMyFocusService.java index 398b715e..752782c1 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmMyFocusService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMyFocusService.java @@ -1,15 +1,14 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.List; -import java.util.Map; import org.springframework.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmMyFocus; +import com.mdp.core.err.BizException; +import com.mdp.core.service.BaseService; +import com.xm.core.entity.XmMyFocus; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProductService.java b/xm-core/src/main/java/com/xm/core/service/XmProductService.java similarity index 86% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProductService.java rename to xm-core/src/main/java/com/xm/core/service/XmProductService.java index 74017824..a451a099 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProductService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProductService.java @@ -1,14 +1,13 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.List; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmProject; -import com.qqkj.xm.core.entity.XmMenu; -import com.qqkj.xm.core.entity.XmProduct; +import com.mdp.core.service.BaseService; +import com.xm.core.entity.XmMenu; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProductStateService.java b/xm-core/src/main/java/com/xm/core/service/XmProductStateService.java similarity index 79% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProductStateService.java rename to xm-core/src/main/java/com/xm/core/service/XmProductStateService.java index 2eb1846b..a63cec7c 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProductStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProductStateService.java @@ -1,10 +1,8 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; -import java.util.List; -import java.util.Map; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmProductState; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 xm 大模块 core 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProductTemplateService.java b/xm-core/src/main/java/com/xm/core/service/XmProductTemplateService.java similarity index 74% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProductTemplateService.java rename to xm-core/src/main/java/com/xm/core/service/XmProductTemplateService.java index 3305bfb7..b4853986 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProductTemplateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProductTemplateService.java @@ -1,10 +1,8 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; -import java.util.List; -import java.util.Map; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmProductTemplate; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectBaselineService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectBaselineService.java similarity index 84% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectBaselineService.java rename to xm-core/src/main/java/com/xm/core/service/XmProjectBaselineService.java index 869d00a6..99566687 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectBaselineService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectBaselineService.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.Date; @@ -6,10 +6,10 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.xm.core.entity.XmProject; -import com.qqkj.xm.core.entity.XmProjectBaseline; +import com.mdp.core.service.BaseService; +import com.mdp.core.service.SequenceService; +import com.xm.core.entity.XmProject; +import com.xm.core.entity.XmProjectBaseline; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectContractService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectContractService.java similarity index 97% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectContractService.java rename to xm-core/src/main/java/com/xm/core/service/XmProjectContractService.java index acb14c3a..da39cc8c 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectContractService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectContractService.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.HashMap; import java.util.List; @@ -7,8 +7,8 @@ import java.util.Map; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.BaseService; +import com.mdp.core.err.BizException; +import com.mdp.core.service.BaseService; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectEnvListService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectEnvListService.java similarity index 94% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectEnvListService.java rename to xm-core/src/main/java/com/xm/core/service/XmProjectEnvListService.java index 441499be..bf51e07c 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectEnvListService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectEnvListService.java @@ -1,20 +1,20 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.qqkj.mdp.safe.common.entity.User; -import com.qqkj.mdp.safe.common.utils.LoginUtils; +import com.mdp.safe.common.entity.User; +import com.mdp.safe.common.utils.LoginUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmProjectEnvList; +import com.mdp.core.err.BizException; +import com.mdp.core.service.BaseService; +import com.xm.core.entity.XmProjectEnvList; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectGroupFormworkService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectGroupFormworkService.java similarity index 86% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectGroupFormworkService.java rename to xm-core/src/main/java/com/xm/core/service/XmProjectGroupFormworkService.java index f3610f2b..48d2fada 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectGroupFormworkService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectGroupFormworkService.java @@ -1,12 +1,12 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.List; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmProjectGroupFormwork; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectGroupService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectGroupService.java similarity index 97% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectGroupService.java rename to xm-core/src/main/java/com/xm/core/service/XmProjectGroupService.java index 2438a0ce..e8560341 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectGroupService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectGroupService.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.ArrayList; import java.util.Date; @@ -10,20 +10,20 @@ import java.util.function.Predicate; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.common.util.concurrent.Monitor.Guard; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.xm.core.entity.XmProjectGroupUser; -import com.qqkj.xm.core.service.cache.XmProjectGroupCacheService; -import com.qqkj.xm.core.service.push.XmPushMsgService; -import com.qqkj.xm.core.vo.XmProjectGroupVo; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.xm.core.entity.XmProjectGroupUser; +import com.xm.core.service.cache.XmProjectGroupCacheService; +import com.xm.core.service.push.XmPushMsgService; +import com.xm.core.vo.XmProjectGroupVo; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.mdp.safe.common.entity.User; -import com.qqkj.mdp.safe.common.utils.LoginUtils; -import com.qqkj.xm.core.entity.XmProject; -import com.qqkj.xm.core.entity.XmProjectGroup; +import com.mdp.core.service.BaseService; +import com.mdp.safe.common.entity.User; +import com.mdp.safe.common.utils.LoginUtils; +import com.xm.core.entity.XmProject; +import com.xm.core.entity.XmProjectGroup; import org.springframework.util.StringUtils; /** @@ -45,14 +45,14 @@ public class XmProjectGroupService extends BaseService { XmProjectGroupUserService xmProjectGroupUserService; @Autowired - XmProjectGroupCacheService groupCacheService; + XmProjectGroupCacheService groupCacheService; @Autowired private XmProjectService xmProjectService; @Autowired - XmPushMsgService pushMsgService; + XmPushMsgService pushMsgService; /** 请在此类添加自定义函数 */ public List getProjectGroupVoList(String projectId) { diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectGroupStateService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectGroupStateService.java similarity index 79% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectGroupStateService.java rename to xm-core/src/main/java/com/xm/core/service/XmProjectGroupStateService.java index d0f6e3b7..9a18c984 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectGroupStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectGroupStateService.java @@ -1,10 +1,8 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; -import java.util.List; -import java.util.Map; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmProjectGroupState; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 xm 大模块 core 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectGroupUserService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectGroupUserService.java similarity index 83% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectGroupUserService.java rename to xm-core/src/main/java/com/xm/core/service/XmProjectGroupUserService.java index 57191e54..2299e84f 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectGroupUserService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectGroupUserService.java @@ -1,12 +1,11 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.List; -import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmProjectGroupUser; +import com.mdp.core.service.BaseService; +import com.xm.core.entity.XmProjectGroupUser; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectKpiHisService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectKpiHisService.java similarity index 74% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectKpiHisService.java rename to xm-core/src/main/java/com/xm/core/service/XmProjectKpiHisService.java index ad0bc108..713ee01c 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectKpiHisService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectKpiHisService.java @@ -1,10 +1,8 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; -import java.util.List; -import java.util.Map; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmProjectKpiHis; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectKpiService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectKpiService.java similarity index 77% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectKpiService.java rename to xm-core/src/main/java/com/xm/core/service/XmProjectKpiService.java index e7f08fc4..efba02f9 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectKpiService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectKpiService.java @@ -1,12 +1,9 @@ -package com.qqkj.xm.core.service; - -import java.util.List; -import java.util.Map; +package com.xm.core.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmProjectKpi; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectMBudgetCostNouserService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectMBudgetCostNouserService.java similarity index 96% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectMBudgetCostNouserService.java rename to xm-core/src/main/java/com/xm/core/service/XmProjectMBudgetCostNouserService.java index 73008cc7..158a6af7 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectMBudgetCostNouserService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectMBudgetCostNouserService.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.math.BigDecimal; import java.util.HashMap; @@ -9,10 +9,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.mdp.core.utils.NumberUtil; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.service.BaseService; +import com.mdp.core.utils.NumberUtil; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectMBudgetCostUserService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectMBudgetCostUserService.java similarity index 96% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectMBudgetCostUserService.java rename to xm-core/src/main/java/com/xm/core/service/XmProjectMBudgetCostUserService.java index f47f34d8..3154cb42 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectMBudgetCostUserService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectMBudgetCostUserService.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.math.BigDecimal; import java.util.HashMap; @@ -9,11 +9,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.mdp.core.utils.NumberUtil; -import com.qqkj.xm.core.entity.XmProjectMBudgetCostUser; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.service.BaseService; +import com.mdp.core.utils.NumberUtil; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectMCostNouserService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectMCostNouserService.java similarity index 95% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectMCostNouserService.java rename to xm-core/src/main/java/com/xm/core/service/XmProjectMCostNouserService.java index 7ccf5d81..4316d3a2 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectMCostNouserService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectMCostNouserService.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.math.BigDecimal; import java.util.HashMap; @@ -9,11 +9,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.mdp.core.utils.NumberUtil; -import com.qqkj.xm.core.entity.XmProjectMCostNouser; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.service.BaseService; +import com.mdp.core.utils.NumberUtil; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectMCostUserService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectMCostUserService.java similarity index 96% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectMCostUserService.java rename to xm-core/src/main/java/com/xm/core/service/XmProjectMCostUserService.java index 8a973d8d..a744bfd7 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectMCostUserService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectMCostUserService.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.math.BigDecimal; import java.util.HashMap; @@ -9,11 +9,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.mdp.core.utils.NumberUtil; -import com.qqkj.xm.core.entity.XmProjectMCostUser; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.service.BaseService; +import com.mdp.core.utils.NumberUtil; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectOptionsService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectOptionsService.java similarity index 73% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectOptionsService.java rename to xm-core/src/main/java/com/xm/core/service/XmProjectOptionsService.java index d2ef3078..7f9596c2 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectOptionsService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectOptionsService.java @@ -1,10 +1,8 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; -import java.util.List; -import java.util.Map; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmProjectOptions; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectPhaseBaselineService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseBaselineService.java similarity index 74% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectPhaseBaselineService.java rename to xm-core/src/main/java/com/xm/core/service/XmProjectPhaseBaselineService.java index 52c12083..e2d7d829 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectPhaseBaselineService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseBaselineService.java @@ -1,10 +1,8 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; -import java.util.List; -import java.util.Map; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmProjectPhaseBaseline; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectPhaseService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java similarity index 95% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectPhaseService.java rename to xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java index 27602e47..75668796 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectPhaseService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.math.BigDecimal; import java.util.ArrayList; @@ -10,11 +10,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.mdp.core.utils.NumberUtil; -import com.qqkj.xm.core.entity.XmProjectPhase; -import com.qqkj.xm.core.vo.XmProjectPhaseVo; +import com.mdp.core.entity.Tips; +import com.mdp.core.service.BaseService; +import com.mdp.core.utils.NumberUtil; +import com.xm.core.entity.XmProjectPhase; +import com.xm.core.vo.XmProjectPhaseVo; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectPhaseTemplateService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseTemplateService.java similarity index 74% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectPhaseTemplateService.java rename to xm-core/src/main/java/com/xm/core/service/XmProjectPhaseTemplateService.java index 198f2692..f9309223 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectPhaseTemplateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseTemplateService.java @@ -1,10 +1,8 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; -import java.util.List; -import java.util.Map; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmProjectPhaseTemplate; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java similarity index 96% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectService.java rename to xm-core/src/main/java/com/xm/core/service/XmProjectService.java index c656886a..1be0e60b 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.math.BigDecimal; import java.util.Date; @@ -13,18 +13,17 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; import com.alibaba.fastjson.JSONObject; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.mdp.core.service.SequenceService; -import com.qqkj.mdp.core.utils.BaseUtils; -import com.qqkj.mdp.core.utils.DateUtils; -import com.qqkj.mdp.safe.common.entity.User; -import com.qqkj.mdp.safe.common.utils.LoginUtils; -import com.qqkj.xm.core.entity.XmProject; -import com.qqkj.xm.core.service.cache.XmProjectCacheService; -import com.qqkj.xm.core.vo.XmProjectGroupVo; -import com.qqkj.xm.core.vo.XmProjectVo; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.service.BaseService; +import com.mdp.core.service.SequenceService; +import com.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.DateUtils; +import com.mdp.safe.common.entity.User; +import com.mdp.safe.common.utils.LoginUtils; +import com.xm.core.entity.XmProject; +import com.xm.core.service.cache.XmProjectCacheService; +import com.xm.core.vo.XmProjectVo; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectStateHisService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectStateHisService.java similarity index 74% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectStateHisService.java rename to xm-core/src/main/java/com/xm/core/service/XmProjectStateHisService.java index 658feabf..85e5c860 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectStateHisService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectStateHisService.java @@ -1,10 +1,8 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; -import java.util.List; -import java.util.Map; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmProjectStateHis; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectStateService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectStateService.java similarity index 83% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectStateService.java rename to xm-core/src/main/java/com/xm/core/service/XmProjectStateService.java index bffccc52..0fa098d7 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectStateService.java @@ -1,12 +1,9 @@ -package com.qqkj.xm.core.service; - -import java.util.List; -import java.util.Map; +package com.xm.core.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmProjectState; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectTaskTypeStateService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectTaskTypeStateService.java similarity index 78% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectTaskTypeStateService.java rename to xm-core/src/main/java/com/xm/core/service/XmProjectTaskTypeStateService.java index 6b12b136..946dc6d7 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectTaskTypeStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectTaskTypeStateService.java @@ -1,10 +1,8 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; -import java.util.List; -import java.util.Map; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmProjectTaskTypeState; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 xm 大模块 core 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectTemplateService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectTemplateService.java similarity index 74% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectTemplateService.java rename to xm-core/src/main/java/com/xm/core/service/XmProjectTemplateService.java index 646118b2..539e35cc 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmProjectTemplateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectTemplateService.java @@ -1,10 +1,8 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; -import java.util.List; -import java.util.Map; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmProjectTemplate; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmQuestionHandleService.java b/xm-core/src/main/java/com/xm/core/service/XmQuestionHandleService.java similarity index 73% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmQuestionHandleService.java rename to xm-core/src/main/java/com/xm/core/service/XmQuestionHandleService.java index 9f3469d4..941079a1 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmQuestionHandleService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmQuestionHandleService.java @@ -1,10 +1,8 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; -import java.util.List; -import java.util.Map; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmQuestionHandle; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmQuestionService.java b/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java similarity index 93% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmQuestionService.java rename to xm-core/src/main/java/com/xm/core/service/XmQuestionService.java index 95d62d56..36a4a5cd 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmQuestionService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java @@ -1,21 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.xm.core.entity.XmAttachment; -import com.qqkj.xm.core.entity.XmProject; -import com.qqkj.xm.core.vo.XmQuestionVo; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.xm.core.vo.XmQuestionVo; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.mdp.core.utils.BaseUtils; -import com.qqkj.mdp.safe.common.entity.User; -import com.qqkj.mdp.safe.common.utils.LoginUtils; -import com.qqkj.xm.core.entity.XmQuestion; -import com.qqkj.xm.core.entity.XmQuestionHandle; +import com.mdp.core.service.BaseService; +import com.mdp.core.utils.BaseUtils; +import com.mdp.safe.common.entity.User; +import com.mdp.safe.common.utils.LoginUtils; +import com.xm.core.entity.XmQuestion; +import com.xm.core.entity.XmQuestionHandle; import org.springframework.util.StringUtils; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmQuestionTagService.java b/xm-core/src/main/java/com/xm/core/service/XmQuestionTagService.java similarity index 73% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmQuestionTagService.java rename to xm-core/src/main/java/com/xm/core/service/XmQuestionTagService.java index 52f9be6e..caaf1225 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmQuestionTagService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmQuestionTagService.java @@ -1,10 +1,8 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; -import java.util.List; -import java.util.Map; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmQuestionTag; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmRecordService.java b/xm-core/src/main/java/com/xm/core/service/XmRecordService.java similarity index 97% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmRecordService.java rename to xm-core/src/main/java/com/xm/core/service/XmRecordService.java index e01efe00..7b8cb12b 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmRecordService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmRecordService.java @@ -1,16 +1,14 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.Date; -import java.util.List; -import java.util.Map; import org.slf4j.MDC; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.mdp.safe.common.entity.User; -import com.qqkj.mdp.safe.common.utils.LoginUtils; -import com.qqkj.xm.core.entity.XmRecord; +import com.mdp.core.service.BaseService; +import com.mdp.safe.common.entity.User; +import com.mdp.safe.common.utils.LoginUtils; +import com.xm.core.entity.XmRecord; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmTaskExecuserService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java similarity index 97% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmTaskExecuserService.java rename to xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java index ba146ea4..5a54fd29 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmTaskExecuserService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.math.BigDecimal; import java.util.ArrayList; @@ -7,24 +7,23 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.xm.core.service.push.XmPushMsgService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import com.alibaba.fastjson.JSONObject; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.mdp.core.utils.BaseUtils; -import com.qqkj.mdp.core.utils.DateUtils; -import com.qqkj.mdp.core.utils.NumberUtil; -import com.qqkj.mdp.safe.common.entity.User; -import com.qqkj.mdp.safe.common.utils.LoginUtils; -import com.qqkj.xm.core.entity.XmProjectGroupUser; -import com.qqkj.xm.core.entity.XmProjectMCostUser; -import com.qqkj.xm.core.entity.XmTask; -import com.qqkj.xm.core.entity.XmTaskExecuser; -import com.qqkj.xm.core.service.push.XmPushMsgService; -import com.qqkj.xm.core.vo.XmProjectGroupVo; +import com.mdp.core.err.BizException; +import com.mdp.core.service.BaseService; +import com.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.DateUtils; +import com.mdp.core.utils.NumberUtil; +import com.mdp.safe.common.entity.User; +import com.mdp.safe.common.utils.LoginUtils; +import com.xm.core.entity.XmProjectMCostUser; +import com.xm.core.entity.XmTask; +import com.xm.core.entity.XmTaskExecuser; +import com.xm.core.vo.XmProjectGroupVo; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
@@ -50,7 +49,7 @@ public class XmTaskExecuserService extends BaseService { XmProjectMCostUserService xmProjectMCostUserService; @Autowired - XmPushMsgService pushMsgService ; + XmPushMsgService pushMsgService ; public void addExecuser(XmTaskExecuser xmTaskExecuser){ User user = LoginUtils.getCurrentUserInfo(); diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmTaskService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java similarity index 95% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmTaskService.java rename to xm-core/src/main/java/com/xm/core/service/XmTaskService.java index dd6fc13c..85a2f38c 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmTaskService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.math.BigDecimal; import java.util.ArrayList; @@ -15,18 +15,16 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; import com.alibaba.fastjson.JSONObject; -import com.qqkj.mdp.core.entity.Tips; -import com.qqkj.mdp.core.err.BizException; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.mdp.core.utils.BaseUtils; -import com.qqkj.mdp.core.utils.NumberUtil; -import com.qqkj.mdp.safe.common.entity.User; -import com.qqkj.mdp.safe.common.utils.LoginUtils; -import com.qqkj.xm.core.entity.XmProject; -import com.qqkj.xm.core.entity.XmTask; -import com.qqkj.xm.core.entity.XmTaskSkill; -import com.qqkj.xm.core.vo.XmTaskVo; -import com.qqkj.xm.core.vo.XmTaskVo; +import com.mdp.core.entity.Tips; +import com.mdp.core.err.BizException; +import com.mdp.core.service.BaseService; +import com.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.NumberUtil; +import com.mdp.safe.common.entity.User; +import com.mdp.safe.common.utils.LoginUtils; +import com.xm.core.entity.XmTask; +import com.xm.core.entity.XmTaskSkill; +import com.xm.core.vo.XmTaskVo; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmTaskSkillService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskSkillService.java similarity index 93% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmTaskSkillService.java rename to xm-core/src/main/java/com/xm/core/service/XmTaskSkillService.java index e7df62d1..6569efb6 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmTaskSkillService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskSkillService.java @@ -1,18 +1,16 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.qqkj.xm.core.entity.XmTask; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmTaskSkill; +import com.mdp.core.service.BaseService; +import com.xm.core.entity.XmTaskSkill; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmTaskTemplateService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskTemplateService.java similarity index 73% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmTaskTemplateService.java rename to xm-core/src/main/java/com/xm/core/service/XmTaskTemplateService.java index 19895302..fce44233 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmTaskTemplateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskTemplateService.java @@ -1,10 +1,8 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; -import java.util.List; -import java.util.Map; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmTaskTemplate; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmTestCaseExecService.java b/xm-core/src/main/java/com/xm/core/service/XmTestCaseExecService.java similarity index 87% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmTestCaseExecService.java rename to xm-core/src/main/java/com/xm/core/service/XmTestCaseExecService.java index c5e023e2..dc1bfc3e 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmTestCaseExecService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTestCaseExecService.java @@ -1,11 +1,11 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.HashMap; import java.util.List; import java.util.Map; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmTestCaseExec; +import com.mdp.core.service.BaseService; +import com.xm.core.entity.XmTestCaseExec; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 xm 大模块 core 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/XmTestCaseService.java b/xm-core/src/main/java/com/xm/core/service/XmTestCaseService.java similarity index 73% rename from xm-core/src/main/java/com/qqkj/xm/core/service/XmTestCaseService.java rename to xm-core/src/main/java/com/xm/core/service/XmTestCaseService.java index 5b06426b..c77b2e0f 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/XmTestCaseService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTestCaseService.java @@ -1,10 +1,8 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; -import java.util.List; -import java.util.Map; import org.springframework.stereotype.Service; -import com.qqkj.mdp.core.service.BaseService; -import com.qqkj.xm.core.entity.XmTestCase; +import com.mdp.core.service.BaseService; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 xm 大模块 core 小模块
diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/cache/XmProjectCacheService.java b/xm-core/src/main/java/com/xm/core/service/cache/XmProjectCacheService.java similarity index 90% rename from xm-core/src/main/java/com/qqkj/xm/core/service/cache/XmProjectCacheService.java rename to xm-core/src/main/java/com/xm/core/service/cache/XmProjectCacheService.java index ea989987..667ee02c 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/cache/XmProjectCacheService.java +++ b/xm-core/src/main/java/com/xm/core/service/cache/XmProjectCacheService.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.service.cache; +package com.xm.core.service.cache; import java.util.concurrent.TimeUnit; @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; -import com.qqkj.xm.core.entity.XmProject; +import com.xm.core.entity.XmProject; @Service public class XmProjectCacheService { diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/cache/XmProjectGroupCacheService.java b/xm-core/src/main/java/com/xm/core/service/cache/XmProjectGroupCacheService.java similarity index 91% rename from xm-core/src/main/java/com/qqkj/xm/core/service/cache/XmProjectGroupCacheService.java rename to xm-core/src/main/java/com/xm/core/service/cache/XmProjectGroupCacheService.java index c7ff8a36..591ee041 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/cache/XmProjectGroupCacheService.java +++ b/xm-core/src/main/java/com/xm/core/service/cache/XmProjectGroupCacheService.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.service.cache; +package com.xm.core.service.cache; import java.util.List; import java.util.concurrent.TimeUnit; @@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; -import com.qqkj.xm.core.vo.XmProjectGroupVo; +import com.xm.core.vo.XmProjectGroupVo; @Service public class XmProjectGroupCacheService { diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/push/XmMenuPushMsgService.java b/xm-core/src/main/java/com/xm/core/service/push/XmMenuPushMsgService.java similarity index 90% rename from xm-core/src/main/java/com/qqkj/xm/core/service/push/XmMenuPushMsgService.java rename to xm-core/src/main/java/com/xm/core/service/push/XmMenuPushMsgService.java index 63eab9a4..6e4fd3d8 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/push/XmMenuPushMsgService.java +++ b/xm-core/src/main/java/com/xm/core/service/push/XmMenuPushMsgService.java @@ -1,17 +1,16 @@ -package com.qqkj.xm.core.service.push; +package com.xm.core.service.push; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.qqkj.mdp.msg.client.PushMsgService; +import com.mdp.msg.client.PushMsgService; import org.springframework.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import com.qqkj.xm.core.service.XmMenuExchangeService; -import com.qqkj.xm.core.service.XmMenuService; +import com.xm.core.service.XmMenuService; @Service public class XmMenuPushMsgService extends PushMsgService { diff --git a/xm-core/src/main/java/com/qqkj/xm/core/service/push/XmPushMsgService.java b/xm-core/src/main/java/com/xm/core/service/push/XmPushMsgService.java similarity index 93% rename from xm-core/src/main/java/com/qqkj/xm/core/service/push/XmPushMsgService.java rename to xm-core/src/main/java/com/xm/core/service/push/XmPushMsgService.java index 4fe443fe..21d8e455 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/service/push/XmPushMsgService.java +++ b/xm-core/src/main/java/com/xm/core/service/push/XmPushMsgService.java @@ -1,11 +1,11 @@ -package com.qqkj.xm.core.service.push; +package com.xm.core.service.push; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.qqkj.mdp.msg.client.PushMsgService; +import com.mdp.msg.client.PushMsgService; import org.springframework.util.StringUtils; import org.springframework.stereotype.Service; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/vo/CalcActPhaseDataVo.java b/xm-core/src/main/java/com/xm/core/vo/CalcActPhaseDataVo.java similarity index 92% rename from xm-core/src/main/java/com/qqkj/xm/core/vo/CalcActPhaseDataVo.java rename to xm-core/src/main/java/com/xm/core/vo/CalcActPhaseDataVo.java index c8f3ec99..48319d77 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/vo/CalcActPhaseDataVo.java +++ b/xm-core/src/main/java/com/xm/core/vo/CalcActPhaseDataVo.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.core.vo; +package com.xm.core.vo; import java.util.List; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/vo/XmExchangeVo.java b/xm-core/src/main/java/com/xm/core/vo/XmExchangeVo.java similarity index 85% rename from xm-core/src/main/java/com/qqkj/xm/core/vo/XmExchangeVo.java rename to xm-core/src/main/java/com/xm/core/vo/XmExchangeVo.java index 83b234d2..4cfd1f44 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/vo/XmExchangeVo.java +++ b/xm-core/src/main/java/com/xm/core/vo/XmExchangeVo.java @@ -1,8 +1,8 @@ -package com.qqkj.xm.core.vo; +package com.xm.core.vo; -import java.util.List; +import com.xm.core.entity.XmExchange; -import com.qqkj.xm.core.entity.XmExchange; +import java.util.List; public class XmExchangeVo extends XmExchange { XmExchange quote; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/vo/XmFileVo.java b/xm-core/src/main/java/com/xm/core/vo/XmFileVo.java similarity index 76% rename from xm-core/src/main/java/com/qqkj/xm/core/vo/XmFileVo.java rename to xm-core/src/main/java/com/xm/core/vo/XmFileVo.java index 2ad96857..ad0d0064 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/vo/XmFileVo.java +++ b/xm-core/src/main/java/com/xm/core/vo/XmFileVo.java @@ -1,12 +1,11 @@ -package com.qqkj.xm.core.vo; - -import java.util.List; - -import com.qqkj.xm.core.entity.XmAttachment; -import com.qqkj.xm.core.entity.XmFile; +package com.xm.core.vo; +import com.xm.core.entity.XmAttachment; +import com.xm.core.entity.XmFile; import io.swagger.annotations.ApiModel; +import java.util.List; + @ApiModel(description="xm_task") public class XmFileVo extends XmFile { List attachment; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/vo/XmIterationVo.java b/xm-core/src/main/java/com/xm/core/vo/XmIterationVo.java similarity index 66% rename from xm-core/src/main/java/com/qqkj/xm/core/vo/XmIterationVo.java rename to xm-core/src/main/java/com/xm/core/vo/XmIterationVo.java index a2f489b8..53c6f354 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/vo/XmIterationVo.java +++ b/xm-core/src/main/java/com/xm/core/vo/XmIterationVo.java @@ -1,8 +1,8 @@ -package com.qqkj.xm.core.vo; +package com.xm.core.vo; -import com.qqkj.xm.core.entity.XmIteration; +import com.xm.core.entity.XmIteration; -public class XmIterationVo extends XmIteration{ +public class XmIterationVo extends XmIteration { private static final long serialVersionUID = 1534268338972176747L; /** diff --git a/xm-core/src/main/java/com/qqkj/xm/core/vo/XmMenuPlanVo.java b/xm-core/src/main/java/com/xm/core/vo/XmMenuPlanVo.java similarity index 88% rename from xm-core/src/main/java/com/qqkj/xm/core/vo/XmMenuPlanVo.java rename to xm-core/src/main/java/com/xm/core/vo/XmMenuPlanVo.java index 179000bf..63526e05 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/vo/XmMenuPlanVo.java +++ b/xm-core/src/main/java/com/xm/core/vo/XmMenuPlanVo.java @@ -1,8 +1,8 @@ -package com.qqkj.xm.core.vo; +package com.xm.core.vo; -import java.util.List; +import com.xm.core.entity.XmMenu; -import com.qqkj.xm.core.entity.XmMenu; +import java.util.List; public class XmMenuPlanVo { String projectId; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/vo/XmMenuStateVo.java b/xm-core/src/main/java/com/xm/core/vo/XmMenuStateVo.java similarity index 88% rename from xm-core/src/main/java/com/qqkj/xm/core/vo/XmMenuStateVo.java rename to xm-core/src/main/java/com/xm/core/vo/XmMenuStateVo.java index a57305bb..aac82cd5 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/vo/XmMenuStateVo.java +++ b/xm-core/src/main/java/com/xm/core/vo/XmMenuStateVo.java @@ -1,8 +1,8 @@ -package com.qqkj.xm.core.vo; +package com.xm.core.vo; -import java.util.List; +import com.xm.core.entity.XmMenu; -import com.qqkj.xm.core.entity.XmMenu; +import java.util.List; public class XmMenuStateVo { String productId; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/vo/XmMenuVo.java b/xm-core/src/main/java/com/xm/core/vo/XmMenuVo.java similarity index 69% rename from xm-core/src/main/java/com/qqkj/xm/core/vo/XmMenuVo.java rename to xm-core/src/main/java/com/xm/core/vo/XmMenuVo.java index dcf36824..3d4e99a7 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/vo/XmMenuVo.java +++ b/xm-core/src/main/java/com/xm/core/vo/XmMenuVo.java @@ -1,8 +1,8 @@ -package com.qqkj.xm.core.vo; +package com.xm.core.vo; -import com.qqkj.xm.core.entity.XmMenu; +import com.xm.core.entity.XmMenu; -public class XmMenuVo extends XmMenu{ +public class XmMenuVo extends XmMenu { private static final long serialVersionUID = 1534268338972176747L; /** diff --git a/xm-core/src/main/java/com/qqkj/xm/core/vo/XmProjectGroupVo.java b/xm-core/src/main/java/com/xm/core/vo/XmProjectGroupVo.java similarity index 74% rename from xm-core/src/main/java/com/qqkj/xm/core/vo/XmProjectGroupVo.java rename to xm-core/src/main/java/com/xm/core/vo/XmProjectGroupVo.java index ce22c4e0..c7a84983 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/vo/XmProjectGroupVo.java +++ b/xm-core/src/main/java/com/xm/core/vo/XmProjectGroupVo.java @@ -1,12 +1,11 @@ -package com.qqkj.xm.core.vo; - -import java.util.List; - -import com.qqkj.xm.core.entity.XmProjectGroup; -import com.qqkj.xm.core.entity.XmProjectGroupUser; +package com.xm.core.vo; +import com.xm.core.entity.XmProjectGroup; +import com.xm.core.entity.XmProjectGroupUser; import io.swagger.annotations.ApiModel; +import java.util.List; + @ApiModel(description="xm_project_group") public class XmProjectGroupVo extends XmProjectGroup { List groupUsers; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/vo/XmProjectPhaseVo.java b/xm-core/src/main/java/com/xm/core/vo/XmProjectPhaseVo.java similarity index 64% rename from xm-core/src/main/java/com/qqkj/xm/core/vo/XmProjectPhaseVo.java rename to xm-core/src/main/java/com/xm/core/vo/XmProjectPhaseVo.java index 0762a43d..16285d6c 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/vo/XmProjectPhaseVo.java +++ b/xm-core/src/main/java/com/xm/core/vo/XmProjectPhaseVo.java @@ -1,8 +1,8 @@ -package com.qqkj.xm.core.vo; +package com.xm.core.vo; -import com.qqkj.xm.core.entity.XmProjectPhase; +import com.xm.core.entity.XmProjectPhase; -public class XmProjectPhaseVo extends XmProjectPhase{ +public class XmProjectPhaseVo extends XmProjectPhase { private static final long serialVersionUID = 1534268338972176747L; /** diff --git a/xm-core/src/main/java/com/qqkj/xm/core/vo/XmProjectVo.java b/xm-core/src/main/java/com/xm/core/vo/XmProjectVo.java similarity index 78% rename from xm-core/src/main/java/com/qqkj/xm/core/vo/XmProjectVo.java rename to xm-core/src/main/java/com/xm/core/vo/XmProjectVo.java index 0d9f5c64..278e78af 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/vo/XmProjectVo.java +++ b/xm-core/src/main/java/com/xm/core/vo/XmProjectVo.java @@ -1,8 +1,8 @@ -package com.qqkj.xm.core.vo; +package com.xm.core.vo; -import java.util.List; +import com.xm.core.entity.XmProject; -import com.qqkj.xm.core.entity.XmProject; +import java.util.List; public class XmProjectVo extends XmProject { diff --git a/xm-core/src/main/java/com/qqkj/xm/core/vo/XmQuestionVo.java b/xm-core/src/main/java/com/xm/core/vo/XmQuestionVo.java similarity index 86% rename from xm-core/src/main/java/com/qqkj/xm/core/vo/XmQuestionVo.java rename to xm-core/src/main/java/com/xm/core/vo/XmQuestionVo.java index fe43e556..d7a8cff4 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/vo/XmQuestionVo.java +++ b/xm-core/src/main/java/com/xm/core/vo/XmQuestionVo.java @@ -1,12 +1,11 @@ -package com.qqkj.xm.core.vo; - -import java.util.List; - -import com.qqkj.xm.core.entity.XmAttachment; -import com.qqkj.xm.core.entity.XmQuestion; +package com.xm.core.vo; +import com.xm.core.entity.XmAttachment; +import com.xm.core.entity.XmQuestion; import io.swagger.annotations.ApiModel; +import java.util.List; + @ApiModel(description="xm_task") public class XmQuestionVo extends XmQuestion { List attachment; diff --git a/xm-core/src/main/java/com/qqkj/xm/core/vo/XmTaskVo.java b/xm-core/src/main/java/com/xm/core/vo/XmTaskVo.java similarity index 69% rename from xm-core/src/main/java/com/qqkj/xm/core/vo/XmTaskVo.java rename to xm-core/src/main/java/com/xm/core/vo/XmTaskVo.java index 5db7a10a..f3228f7d 100644 --- a/xm-core/src/main/java/com/qqkj/xm/core/vo/XmTaskVo.java +++ b/xm-core/src/main/java/com/xm/core/vo/XmTaskVo.java @@ -1,11 +1,10 @@ -package com.qqkj.xm.core.vo; - -import com.qqkj.xm.core.entity.XmTask; +package com.xm.core.vo; +import com.xm.core.entity.XmTask; import io.swagger.annotations.ApiModel; @ApiModel(description="xm_task") -public class XmTaskVo extends XmTask { +public class XmTaskVo extends XmTask { /** * addSub,edit,delete diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmAttachmentMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmAttachmentMapper.xml index 13d494ee..4aeff5c2 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmAttachmentMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmAttachmentMapper.xml @@ -1,11 +1,11 @@ - + - + delete from XM.xm_attachment where origin_id = #{originId} and origin_type = #{originType} @@ -30,7 +30,7 @@ - select * from XM.xm_attachment res @@ -38,7 +38,7 @@ - select * from XM.xm_attachment res where res.id = #{id} @@ -51,14 +51,14 @@ res.id = #{id} - select count(1) from XM.xm_attachment res - + insert into XM.xm_attachment( ) values ( @@ -67,7 +67,7 @@ - + delete from XM.xm_attachment res @@ -75,13 +75,13 @@ - + delete from XM.xm_attachment where id = #{id} - + update XM.xm_attachment @@ -90,7 +90,7 @@ - + update XM.xm_attachment diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml index d5176795..6ddaa930 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml @@ -1,6 +1,6 @@ - + @@ -32,7 +32,7 @@ - select * from XM.xm_branch_state res @@ -40,7 +40,7 @@ - select * from XM.xm_branch_state res where res.id = #{id} @@ -53,14 +53,14 @@ res.id = #{id} - select count(1) from XM.xm_branch_state res - + insert into XM.xm_branch_state( ) values ( @@ -69,7 +69,7 @@ - + delete from XM.xm_branch_state res @@ -77,13 +77,13 @@ - + delete from XM.xm_branch_state where id = #{id} - + update XM.xm_branch_state @@ -92,7 +92,7 @@ - + update XM.xm_branch_state diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchTaskTypeStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchTaskTypeStateMapper.xml index 11464b85..309a85c4 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchTaskTypeStateMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchTaskTypeStateMapper.xml @@ -1,6 +1,6 @@ - + @@ -31,7 +31,7 @@ - select * from XM.xm_branch_task_type_state res @@ -39,7 +39,7 @@ - select * from XM.xm_branch_task_type_state res where res.id = #{id} @@ -52,14 +52,14 @@ res.id = #{id} - select count(1) from XM.xm_branch_task_type_state res - + insert into XM.xm_branch_task_type_state( ) values ( @@ -68,7 +68,7 @@ - + delete from XM.xm_branch_task_type_state res @@ -76,13 +76,13 @@ - + delete from XM.xm_branch_task_type_state where id = #{id} - + update XM.xm_branch_task_type_state @@ -91,7 +91,7 @@ - + update XM.xm_branch_task_type_state diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmEnvListMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmEnvListMapper.xml index cad7e4ab..b4a5e74e 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmEnvListMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmEnvListMapper.xml @@ -1,6 +1,6 @@ - + @@ -77,7 +77,7 @@ - select * from XM.xm_env_list res @@ -85,7 +85,7 @@ - select * from XM.xm_env_list res where res.id = #{id} @@ -98,14 +98,14 @@ res.id = #{id} - select count(1) from XM.xm_env_list res - + insert into XM.xm_env_list( ) values ( @@ -114,7 +114,7 @@ - + delete from XM.xm_env_list res @@ -122,13 +122,13 @@ - + delete from XM.xm_env_list where id = #{id} - + update XM.xm_env_list @@ -137,7 +137,7 @@ - + update XM.xm_env_list diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmExchangeMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmExchangeMapper.xml index 2633eb84..2e2ec414 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmExchangeMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmExchangeMapper.xml @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ - select * from XM.xm_exchange res @@ -36,7 +36,7 @@ - select * from XM.xm_exchange res where res.id = #{id} @@ -49,14 +49,14 @@ res.id = #{id} - select count(1) from XM.xm_exchange res - + insert into XM.xm_exchange( ) values ( @@ -65,7 +65,7 @@ - + delete from XM.xm_exchange res @@ -73,13 +73,13 @@ - + delete from XM.xm_exchange where id = #{id} - + update XM.xm_exchange @@ -88,7 +88,7 @@ - + update XM.xm_exchange diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmFileMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmFileMapper.xml index 99d72c9c..f6ed19aa 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmFileMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmFileMapper.xml @@ -1,6 +1,6 @@ - + @@ -74,7 +74,7 @@ - select * from XM.xm_file res @@ -82,7 +82,7 @@ - select * from XM.xm_file res where res.id = #{id} @@ -95,14 +95,14 @@ res.id = #{id} - select count(1) from XM.xm_file res - + insert into XM.xm_file( ) values ( @@ -111,7 +111,7 @@ - + delete from XM.xm_file res @@ -119,13 +119,13 @@ - + delete from XM.xm_file where id = #{id} - + update XM.xm_file @@ -134,7 +134,7 @@ - + update XM.xm_file diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMapper.xml index 3767c7ce..1fba804c 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMapper.xml @@ -1,6 +1,6 @@ - + @@ -57,7 +57,7 @@ - select * from XM.xm_iteration res @@ -65,7 +65,7 @@ - select * from XM.xm_iteration res where res.id = #{id} @@ -78,14 +78,14 @@ res.id = #{id} - select count(1) from XM.xm_iteration res - + insert into XM.xm_iteration( ) values ( @@ -94,7 +94,7 @@ - + delete from XM.xm_iteration res @@ -102,13 +102,13 @@ - + delete from XM.xm_iteration where id = #{id} - + update XM.xm_iteration @@ -117,7 +117,7 @@ - + update XM.xm_iteration diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMenuMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMenuMapper.xml index 43eb1a97..2b3d194d 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMenuMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMenuMapper.xml @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ - select * from XM.xm_iteration_menu res @@ -36,7 +36,7 @@ - select * from XM.xm_iteration_menu res where res.id = #{id} @@ -49,14 +49,14 @@ res.id = #{id} - select count(1) from XM.xm_iteration_menu res - + insert into XM.xm_iteration_menu( ) values ( @@ -65,7 +65,7 @@ - + delete from XM.xm_iteration_menu res @@ -73,13 +73,13 @@ - + delete from XM.xm_iteration_menu where id = #{id} - + update XM.xm_iteration_menu @@ -88,7 +88,7 @@ - + update XM.xm_iteration_menu diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationStateMapper.xml index 61339b23..4a64fc1c 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationStateMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationStateMapper.xml @@ -1,6 +1,6 @@ - + @@ -31,7 +31,7 @@ - select * from XM.xm_iteration_state res @@ -39,7 +39,7 @@ - select * from XM.xm_iteration_state res where res.id = #{id} @@ -52,14 +52,14 @@ res.id = #{id} - select count(1) from XM.xm_iteration_state res - + insert into XM.xm_iteration_state( ) values ( @@ -68,7 +68,7 @@ - + delete from XM.xm_iteration_state res @@ -76,13 +76,13 @@ - + delete from XM.xm_iteration_state where id = #{id} - + update XM.xm_iteration_state @@ -91,7 +91,7 @@ - + update XM.xm_iteration_state diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuExchangeMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuExchangeMapper.xml index e4c67049..08dfbf5d 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuExchangeMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuExchangeMapper.xml @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ - select * from XM.xm_menu_exchange res @@ -36,7 +36,7 @@ - select * from XM.xm_menu_exchange res where res.id = #{id} @@ -49,14 +49,14 @@ res.id = #{id} - select count(1) from XM.xm_menu_exchange res - + insert into XM.xm_menu_exchange( ) values ( @@ -65,7 +65,7 @@ - + delete from XM.xm_menu_exchange res @@ -73,13 +73,13 @@ - + delete from XM.xm_menu_exchange where id = #{id} - + update XM.xm_menu_exchange @@ -88,7 +88,7 @@ - + update XM.xm_menu_exchange diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml index 343289ce..46ac0c3f 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml @@ -1,6 +1,6 @@ - + @@ -68,7 +68,7 @@ - select * from XM.xm_menu res @@ -76,7 +76,7 @@ - select * from XM.xm_menu res where res.menu_id = #{menuId} @@ -89,14 +89,14 @@ res.menu_id = #{menuId} - select count(1) from XM.xm_menu res - + insert into XM.xm_menu( ) values ( @@ -105,7 +105,7 @@ - + delete from XM.xm_menu res @@ -113,13 +113,13 @@ - + delete from XM.xm_menu where menu_id = #{menuId} - + update XM.xm_menu @@ -128,7 +128,7 @@ - + update XM.xm_menu diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuPlanMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuPlanMapper.xml index 6de91ce0..6f1705d8 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuPlanMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuPlanMapper.xml @@ -1,6 +1,6 @@ - + @@ -30,7 +30,7 @@ - select * from XM.xm_menu_plan res @@ -38,7 +38,7 @@ - select * from XM.xm_menu_plan res where res.id = #{id} @@ -51,14 +51,14 @@ res.id = #{id} - select count(1) from XM.xm_menu_plan res - + insert into XM.xm_menu_plan( ) values ( @@ -67,7 +67,7 @@ - + delete from XM.xm_menu_plan res @@ -75,13 +75,13 @@ - + delete from XM.xm_menu_plan where id = #{id} - + update XM.xm_menu_plan @@ -90,7 +90,7 @@ - + update XM.xm_menu_plan diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuStateMapper.xml index 4a04c26f..87740983 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuStateMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuStateMapper.xml @@ -1,6 +1,6 @@ - + @@ -31,7 +31,7 @@ - select * from XM.xm_menu_state res @@ -39,7 +39,7 @@ - select * from XM.xm_menu_state res where res.id = #{id} @@ -52,14 +52,14 @@ res.id = #{id} - select count(1) from XM.xm_menu_state res - + insert into XM.xm_menu_state( ) values ( @@ -68,7 +68,7 @@ - + delete from XM.xm_menu_state res @@ -76,13 +76,13 @@ - + delete from XM.xm_menu_state where id = #{id} - + update XM.xm_menu_state @@ -91,7 +91,7 @@ - + update XM.xm_menu_state diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuTemplateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuTemplateMapper.xml index 38cc0719..753d2e2b 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuTemplateMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuTemplateMapper.xml @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ - select * from XM.xm_menu_template res @@ -36,7 +36,7 @@ - select * from XM.xm_menu_template res where res.menu_id = #{menuId} @@ -49,14 +49,14 @@ res.menu_id = #{menuId} - select count(1) from XM.xm_menu_template res - + insert into XM.xm_menu_template( ) values ( @@ -65,7 +65,7 @@ - + delete from XM.xm_menu_template res @@ -73,13 +73,13 @@ - + delete from XM.xm_menu_template where menu_id = #{menuId} - + update XM.xm_menu_template @@ -88,7 +88,7 @@ - + update XM.xm_menu_template diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMyFocusMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMyFocusMapper.xml index 7f584cf4..8aabe4b9 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMyFocusMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMyFocusMapper.xml @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ - select * from XM.xm_my_focus res @@ -36,7 +36,7 @@ - select * from XM.xm_my_focus res where res.id = #{id} @@ -49,14 +49,14 @@ res.id = #{id} - select count(1) from XM.xm_my_focus res - + insert into XM.xm_my_focus( ) values ( @@ -65,7 +65,7 @@ - + delete from XM.xm_my_focus and userid = #{userid} @@ -77,13 +77,13 @@ - + delete from XM.xm_my_focus where id = #{id} - + update XM.xm_my_focus @@ -92,7 +92,7 @@ - + update XM.xm_my_focus diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml index 59347131..a4491e21 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml @@ -1,6 +1,6 @@ - + @@ -44,7 +44,7 @@ - select * from XM.xm_product res @@ -52,7 +52,7 @@ - select * from XM.xm_product res where res.id = #{id} @@ -65,14 +65,14 @@ res.id = #{id} - select count(1) from XM.xm_product res - + insert into XM.xm_product( ) values ( @@ -81,7 +81,7 @@ - + delete from XM.xm_product res @@ -89,13 +89,13 @@ - + delete from XM.xm_product where id = #{id} - + update XM.xm_product @@ -104,7 +104,7 @@ - + update XM.xm_product diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductStateMapper.xml index ca87ea8d..627c6448 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductStateMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductStateMapper.xml @@ -1,6 +1,6 @@ - + @@ -31,7 +31,7 @@ - select * from XM.xm_product_state res @@ -39,7 +39,7 @@ - select * from XM.xm_product_state res where res.id = #{id} @@ -52,14 +52,14 @@ res.id = #{id} - select count(1) from XM.xm_product_state res - + insert into XM.xm_product_state( ) values ( @@ -68,7 +68,7 @@ - + delete from XM.xm_product_state res @@ -76,13 +76,13 @@ - + delete from XM.xm_product_state where id = #{id} - + update XM.xm_product_state @@ -91,7 +91,7 @@ - + update XM.xm_product_state diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductTemplateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductTemplateMapper.xml index dd463585..5db16fde 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductTemplateMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductTemplateMapper.xml @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ - select * from XM.xm_product_template res @@ -36,7 +36,7 @@ - select * from XM.xm_product_template res where res.id = #{id} @@ -49,14 +49,14 @@ res.id = #{id} - select count(1) from XM.xm_product_template res - + insert into XM.xm_product_template( ) values ( @@ -65,7 +65,7 @@ - + delete from XM.xm_product_template res @@ -73,13 +73,13 @@ - + delete from XM.xm_product_template where id = #{id} - + update XM.xm_product_template @@ -88,7 +88,7 @@ - + update XM.xm_product_template diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectBaselineMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectBaselineMapper.xml index b7f691d9..6139fb83 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectBaselineMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectBaselineMapper.xml @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ - select * from XM.xm_project_baseline res @@ -36,7 +36,7 @@ - select * from XM.xm_project_baseline res where res.id = #{id} @@ -49,14 +49,14 @@ res.id = #{id} - select count(1) from XM.xm_project_baseline res - + insert into XM.xm_project_baseline( ) values ( @@ -65,7 +65,7 @@ - + delete from XM.xm_project_baseline res @@ -73,13 +73,13 @@ - + delete from XM.xm_project_baseline where id = #{id} - + update XM.xm_project_baseline @@ -88,7 +88,7 @@ - + update XM.xm_project_baseline diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectEnvListMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectEnvListMapper.xml index 9b510f1d..a4f44db4 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectEnvListMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectEnvListMapper.xml @@ -1,6 +1,6 @@ - + @@ -80,7 +80,7 @@ - select * from XM.xm_project_env_list res @@ -88,7 +88,7 @@ - select * from XM.xm_project_env_list res where res.id = #{id} @@ -101,14 +101,14 @@ res.id = #{id} - select count(1) from XM.xm_project_env_list res - + insert into XM.xm_project_env_list( ) values ( @@ -117,7 +117,7 @@ - + delete from XM.xm_project_env_list res @@ -125,13 +125,13 @@ - + delete from XM.xm_project_env_list where id = #{id} - + update XM.xm_project_env_list @@ -140,7 +140,7 @@ - + update XM.xm_project_env_list diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupFormworkMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupFormworkMapper.xml index ba952dc8..96ca7b30 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupFormworkMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupFormworkMapper.xml @@ -1,6 +1,6 @@ - + @@ -35,7 +35,7 @@ - select * from XM.xm_project_group_formwork res @@ -43,7 +43,7 @@ - select * from XM.xm_project_group_formwork res where res.id = #{id} @@ -56,14 +56,14 @@ res.id = #{id} - select count(1) from XM.xm_project_group_formwork res - + insert into XM.xm_project_group_formwork( ) values ( @@ -72,7 +72,7 @@ - + delete from XM.xm_project_group_formwork res @@ -80,13 +80,13 @@ - + delete from XM.xm_project_group_formwork where id = #{id} - + update XM.xm_project_group_formwork @@ -95,7 +95,7 @@ - + update XM.xm_project_group_formwork diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupMapper.xml index 6cb79828..f16fad69 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupMapper.xml @@ -1,11 +1,11 @@ - + - + delete from XM.xm_project_group where project_id = #{projectId} @@ -31,7 +31,7 @@ - select * from XM.xm_project_group res @@ -39,7 +39,7 @@ - select * from XM.xm_project_group res where res.id = #{id} @@ -52,14 +52,14 @@ res.id = #{id} - select count(1) from XM.xm_project_group res - + insert into XM.xm_project_group( ) values ( @@ -68,7 +68,7 @@ - + delete from XM.xm_project_group res @@ -76,13 +76,13 @@ - + delete from XM.xm_project_group where id = #{id} - + update XM.xm_project_group @@ -91,7 +91,7 @@ - + update XM.xm_project_group diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupStateMapper.xml index 99a84466..da695657 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupStateMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupStateMapper.xml @@ -1,6 +1,6 @@ - + @@ -31,7 +31,7 @@ - select * from XM.xm_project_group_state res @@ -39,7 +39,7 @@ - select * from XM.xm_project_group_state res where res.id = #{id} @@ -52,14 +52,14 @@ res.id = #{id} - select count(1) from XM.xm_project_group_state res - + insert into XM.xm_project_group_state( ) values ( @@ -68,7 +68,7 @@ - + delete from XM.xm_project_group_state res @@ -76,13 +76,13 @@ - + delete from XM.xm_project_group_state where id = #{id} - + update XM.xm_project_group_state @@ -91,7 +91,7 @@ - + update XM.xm_project_group_state diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupUserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupUserMapper.xml index 6530e02d..5245593a 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupUserMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupUserMapper.xml @@ -1,15 +1,15 @@ - + - + delete from XM.xm_project_group_user where group_id = #{groupId} - select * from XM.xm_project_group_user res @@ -18,7 +18,7 @@ - select * from XM.xm_project_group_user res exists( select 1 from XM.xm_project_group g where g.id=res.group_id and g.project_id=#{projectId}) @@ -45,7 +45,7 @@ - select * from XM.xm_project_group_user res @@ -53,7 +53,7 @@ - select * from XM.xm_project_group_user res where res.id = #{id} @@ -66,14 +66,14 @@ res.id = #{id} - select count(1) from XM.xm_project_group_user res - + insert into XM.xm_project_group_user( ) values ( @@ -82,7 +82,7 @@ - + delete from XM.xm_project_group_user res @@ -90,13 +90,13 @@ - + delete from XM.xm_project_group_user where id = #{id} - + update XM.xm_project_group_user @@ -105,7 +105,7 @@ - + update XM.xm_project_group_user diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectKpiHisMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectKpiHisMapper.xml index 1f34235b..11fe3922 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectKpiHisMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectKpiHisMapper.xml @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ - select * from XM.xm_project_kpi_his res @@ -36,7 +36,7 @@ - select * from XM.xm_project_kpi_his res where res.kpi_id = #{kpiId} @@ -49,14 +49,14 @@ res.kpi_id = #{kpiId} - select count(1) from XM.xm_project_kpi_his res - + insert into XM.xm_project_kpi_his( ) values ( @@ -65,7 +65,7 @@ - + delete from XM.xm_project_kpi_his res @@ -73,13 +73,13 @@ - + delete from XM.xm_project_kpi_his where kpi_id = #{kpiId} - + update XM.xm_project_kpi_his @@ -88,7 +88,7 @@ - + update XM.xm_project_kpi_his diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectKpiMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectKpiMapper.xml index 00332cf0..86b0ee6f 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectKpiMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectKpiMapper.xml @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ - select * from XM.xm_project_kpi res @@ -36,7 +36,7 @@ - select * from XM.xm_project_kpi res where res.id = #{id} @@ -49,14 +49,14 @@ res.id = #{id} - select count(1) from XM.xm_project_kpi res - + insert into XM.xm_project_kpi( ) values ( @@ -65,7 +65,7 @@ - + delete from XM.xm_project_kpi res @@ -73,13 +73,13 @@ - + delete from XM.xm_project_kpi where id = #{id} - + update XM.xm_project_kpi @@ -88,7 +88,7 @@ - + update XM.xm_project_kpi diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMBudgetCostNouserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMBudgetCostNouserMapper.xml index a24bf66b..7fa96783 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMBudgetCostNouserMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMBudgetCostNouserMapper.xml @@ -1,6 +1,6 @@ - + @@ -110,7 +110,7 @@ - select * from XM.xm_project_m_budget_cost_nouser res @@ -118,7 +118,7 @@ - select * from XM.xm_project_m_budget_cost_nouser res where res.id = #{id} @@ -131,14 +131,14 @@ res.id = #{id} - select count(1) from XM.xm_project_m_budget_cost_nouser res - + insert into XM.xm_project_m_budget_cost_nouser( ) values ( @@ -147,7 +147,7 @@ - + delete from XM.xm_project_m_budget_cost_nouser res @@ -155,13 +155,13 @@ - + delete from XM.xm_project_m_budget_cost_nouser where id = #{id} - + update XM.xm_project_m_budget_cost_nouser @@ -170,7 +170,7 @@ - + update XM.xm_project_m_budget_cost_nouser diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMBudgetCostUserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMBudgetCostUserMapper.xml index 62d6658f..1976fcf0 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMBudgetCostUserMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMBudgetCostUserMapper.xml @@ -1,6 +1,6 @@ - + @@ -112,7 +112,7 @@ - select * from XM.xm_project_m_budget_cost_user res @@ -120,7 +120,7 @@ - select * from XM.xm_project_m_budget_cost_user res where res.id = #{id} @@ -133,14 +133,14 @@ res.id = #{id} - select count(1) from XM.xm_project_m_budget_cost_user res - + insert into XM.xm_project_m_budget_cost_user( ) values ( @@ -149,7 +149,7 @@ - + delete from XM.xm_project_m_budget_cost_user res @@ -157,13 +157,13 @@ - + delete from XM.xm_project_m_budget_cost_user where id = #{id} - + update XM.xm_project_m_budget_cost_user @@ -172,7 +172,7 @@ - + update XM.xm_project_m_budget_cost_user diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostNouserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostNouserMapper.xml index a65c56e9..703dee42 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostNouserMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostNouserMapper.xml @@ -1,6 +1,6 @@ - + @@ -110,7 +110,7 @@ - select * from XM.xm_project_m_cost_nouser res @@ -118,7 +118,7 @@ - select * from XM.xm_project_m_cost_nouser res where res.id = #{id} @@ -131,14 +131,14 @@ res.id = #{id} - select count(1) from XM.xm_project_m_cost_nouser res - + insert into XM.xm_project_m_cost_nouser( ) values ( @@ -147,7 +147,7 @@ - + delete from XM.xm_project_m_cost_nouser res @@ -155,13 +155,13 @@ - + delete from XM.xm_project_m_cost_nouser where id = #{id} - + update XM.xm_project_m_cost_nouser @@ -170,7 +170,7 @@ - + update XM.xm_project_m_cost_nouser diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostUserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostUserMapper.xml index 47b7512f..21e5b33e 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostUserMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostUserMapper.xml @@ -1,6 +1,6 @@ - + @@ -137,7 +137,7 @@ - select * from XM.xm_project_m_cost_user res @@ -145,7 +145,7 @@ - select * from XM.xm_project_m_cost_user res where res.id = #{id} @@ -158,14 +158,14 @@ res.id = #{id} - select count(1) from XM.xm_project_m_cost_user res - + insert into XM.xm_project_m_cost_user( ) values ( @@ -174,7 +174,7 @@ - + delete from XM.xm_project_m_cost_user res @@ -182,13 +182,13 @@ - + delete from XM.xm_project_m_cost_user where id = #{id} - + update XM.xm_project_m_cost_user @@ -197,7 +197,7 @@ - + update XM.xm_project_m_cost_user diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml index cc2413e5..1bcec508 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml @@ -1,6 +1,6 @@ - + @@ -117,7 +117,7 @@ - select * from XM.xm_project res @@ -125,7 +125,7 @@ - select * from XM.xm_project res where res.id = #{id} @@ -138,14 +138,14 @@ res.id = #{id} - select count(1) from XM.xm_project res - + insert into XM.xm_project( ) values ( @@ -154,7 +154,7 @@ - + delete from XM.xm_project res @@ -162,13 +162,13 @@ - + delete from XM.xm_project where id = #{id} - + update XM.xm_project @@ -177,7 +177,7 @@ - + update XM.xm_project diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseBaselineMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseBaselineMapper.xml index d5bc25fb..9d16adcc 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseBaselineMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseBaselineMapper.xml @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ - select * from XM.xm_project_phase_baseline res @@ -36,7 +36,7 @@ - select * from XM.xm_project_phase_baseline res where res.id = #{id} @@ -49,14 +49,14 @@ res.id = #{id} - select count(1) from XM.xm_project_phase_baseline res - + insert into XM.xm_project_phase_baseline( ) values ( @@ -65,7 +65,7 @@ - + delete from XM.xm_project_phase_baseline res @@ -73,13 +73,13 @@ - + delete from XM.xm_project_phase_baseline where id = #{id} - + update XM.xm_project_phase_baseline @@ -88,7 +88,7 @@ - + update XM.xm_project_phase_baseline diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml index cb6467ce..e3098d4e 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml @@ -1,6 +1,6 @@ - + @@ -70,7 +70,7 @@ - select * from XM.xm_project_phase res @@ -78,7 +78,7 @@ - select * from XM.xm_project_phase res where res.id = #{id} @@ -91,14 +91,14 @@ res.id = #{id} - select count(1) from XM.xm_project_phase res - + insert into XM.xm_project_phase( ) values ( @@ -107,7 +107,7 @@ - + delete from XM.xm_project_phase res @@ -115,13 +115,13 @@ - + delete from XM.xm_project_phase where id = #{id} - + update XM.xm_project_phase @@ -130,7 +130,7 @@ - + update XM.xm_project_phase diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseTemplateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseTemplateMapper.xml index f97aa0a4..8fcb20b3 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseTemplateMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseTemplateMapper.xml @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ - select * from XM.xm_project_phase_template res @@ -36,7 +36,7 @@ - select * from XM.xm_project_phase_template res where res.id = #{id} @@ -49,14 +49,14 @@ res.id = #{id} - select count(1) from XM.xm_project_phase_template res - + insert into XM.xm_project_phase_template( ) values ( @@ -65,7 +65,7 @@ - + delete from XM.xm_project_phase_template res @@ -73,13 +73,13 @@ - + delete from XM.xm_project_phase_template where id = #{id} - + update XM.xm_project_phase_template @@ -88,7 +88,7 @@ - + update XM.xm_project_phase_template diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateHisMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateHisMapper.xml index 13f4703f..25e3b309 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateHisMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateHisMapper.xml @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ - select * from XM.xm_project_state_his res @@ -36,7 +36,7 @@ - select * from XM.xm_project_state_his res where res.id = #{id} @@ -49,14 +49,14 @@ res.id = #{id} - select count(1) from XM.xm_project_state_his res - + insert into XM.xm_project_state_his( ) values ( @@ -65,7 +65,7 @@ - + delete from XM.xm_project_state_his res @@ -73,13 +73,13 @@ - + delete from XM.xm_project_state_his where id = #{id} - + update XM.xm_project_state_his @@ -88,7 +88,7 @@ - + update XM.xm_project_state_his diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateMapper.xml index 9968cf9d..f5a959d3 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectStateMapper.xml @@ -1,6 +1,6 @@ - + @@ -35,7 +35,7 @@ - select * from XM.xm_project_state res @@ -43,7 +43,7 @@ - select * from XM.xm_project_state res where res.id = #{id} @@ -56,14 +56,14 @@ res.id = #{id} - select count(1) from XM.xm_project_state res - + insert into XM.xm_project_state( ) values ( @@ -72,7 +72,7 @@ - + delete from XM.xm_project_state res @@ -80,13 +80,13 @@ - + delete from XM.xm_project_state where id = #{id} - + update XM.xm_project_state @@ -95,7 +95,7 @@ - + update XM.xm_project_state diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectTaskTypeStateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectTaskTypeStateMapper.xml index c2311a65..46686fea 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectTaskTypeStateMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectTaskTypeStateMapper.xml @@ -1,6 +1,6 @@ - + @@ -30,7 +30,7 @@ - select * from XM.xm_project_task_type_state res @@ -38,7 +38,7 @@ - select * from XM.xm_project_task_type_state res where res.id = #{id} @@ -51,14 +51,14 @@ res.id = #{id} - select count(1) from XM.xm_project_task_type_state res - + insert into XM.xm_project_task_type_state( ) values ( @@ -67,7 +67,7 @@ - + delete from XM.xm_project_task_type_state res @@ -75,13 +75,13 @@ - + delete from XM.xm_project_task_type_state where id = #{id} - + update XM.xm_project_task_type_state @@ -90,7 +90,7 @@ - + update XM.xm_project_task_type_state diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectTemplateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectTemplateMapper.xml index 1ee8e271..03f9c499 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectTemplateMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectTemplateMapper.xml @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ - select * from XM.xm_project_template res @@ -36,7 +36,7 @@ - select * from XM.xm_project_template res where res.id = #{id} @@ -49,14 +49,14 @@ res.id = #{id} - select count(1) from XM.xm_project_template res - + insert into XM.xm_project_template( ) values ( @@ -65,7 +65,7 @@ - + delete from XM.xm_project_template res @@ -73,13 +73,13 @@ - + delete from XM.xm_project_template where id = #{id} - + update XM.xm_project_template @@ -88,7 +88,7 @@ - + update XM.xm_project_template diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionHandleMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionHandleMapper.xml index 6127768e..3303d4ea 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionHandleMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionHandleMapper.xml @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ - select * from XM.xm_question_handle res @@ -36,7 +36,7 @@ - select * from XM.xm_question_handle res where res.id = #{id} @@ -49,14 +49,14 @@ res.id = #{id} - select count(1) from XM.xm_question_handle res - + insert into XM.xm_question_handle( ) values ( @@ -65,7 +65,7 @@ - + delete from XM.xm_question_handle res @@ -73,13 +73,13 @@ - + delete from XM.xm_question_handle where id = #{id} - + update XM.xm_question_handle @@ -88,7 +88,7 @@ - + update XM.xm_question_handle diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml index 3a1eb080..5cf0d794 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml @@ -1,6 +1,6 @@ - + @@ -74,7 +74,7 @@ - select * from XM.xm_question res @@ -82,7 +82,7 @@ - select * from XM.xm_question res where res.id = #{id} @@ -95,14 +95,14 @@ res.id = #{id} - select count(1) from XM.xm_question res - + insert into XM.xm_question( ) values ( @@ -111,7 +111,7 @@ - + delete from XM.xm_question res @@ -119,13 +119,13 @@ - + delete from XM.xm_question where id = #{id} - + update XM.xm_question @@ -134,7 +134,7 @@ - + update XM.xm_question diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionTagMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionTagMapper.xml index 80f5ca08..ce8da1cd 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionTagMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionTagMapper.xml @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ - select * from XM.xm_question_tag res @@ -36,7 +36,7 @@ - select * from XM.xm_question_tag res where res.id = #{id} @@ -49,14 +49,14 @@ res.id = #{id} - select count(1) from XM.xm_question_tag res - + insert into XM.xm_question_tag( ) values ( @@ -65,7 +65,7 @@ - + delete from XM.xm_question_tag res @@ -73,13 +73,13 @@ - + delete from XM.xm_question_tag where id = #{id} - + update XM.xm_question_tag @@ -88,7 +88,7 @@ - + update XM.xm_question_tag diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmRecordMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmRecordMapper.xml index f5a2f2f4..039488c0 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmRecordMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmRecordMapper.xml @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ - select * from XM.xm_record res @@ -36,7 +36,7 @@ - select * from XM.xm_record res where res.id = #{id} @@ -49,14 +49,14 @@ res.id = #{id} - select count(1) from XM.xm_record res - + insert into XM.xm_record( ) values ( @@ -65,7 +65,7 @@ - + delete from XM.xm_record res @@ -73,13 +73,13 @@ - + delete from XM.xm_record where id = #{id} - + update XM.xm_record @@ -88,7 +88,7 @@ - + update XM.xm_record diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml index d263bd92..fe843894 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml @@ -1,6 +1,6 @@ - + @@ -140,7 +140,7 @@ - select * from XM.xm_task_execuser res @@ -148,7 +148,7 @@ - select * from XM.xm_task_execuser res where res.id = #{id} @@ -161,14 +161,14 @@ res.id = #{id} - select count(1) from XM.xm_task_execuser res - + insert into XM.xm_task_execuser( ) values ( @@ -177,7 +177,7 @@ - + delete from XM.xm_task_execuser res @@ -185,13 +185,13 @@ - + delete from XM.xm_task_execuser where id = #{id} - + update XM.xm_task_execuser @@ -200,7 +200,7 @@ - + update XM.xm_task_execuser diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml index cfec0a1b..bbacb5a2 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml @@ -1,6 +1,6 @@ - + @@ -19,7 +19,7 @@ update XM.xm_task set pre_taskid = NULL,pre_taskname = NULL where pre_taskid = #{id} - + update XM.xm_task set menu_id = #{menuId}, menu_name = #{menuName},product_id=#{productId},product_name=#{productName} where id = #{id} @@ -128,7 +128,7 @@ - select * from XM.xm_task res @@ -136,7 +136,7 @@ - select * from XM.xm_task res where res.id = #{id} @@ -149,14 +149,14 @@ res.id = #{id} - select count(1) from XM.xm_task res - + insert into XM.xm_task( ) values ( @@ -165,7 +165,7 @@ - + delete from XM.xm_task res @@ -173,13 +173,13 @@ - + delete from XM.xm_task where id = #{id} - + update XM.xm_task @@ -188,7 +188,7 @@ - + update XM.xm_task diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSkillMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSkillMapper.xml index 2fef3876..e9badc11 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSkillMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSkillMapper.xml @@ -1,6 +1,6 @@ - + @@ -35,7 +35,7 @@ - select * from XM.xm_task_skill res @@ -43,7 +43,7 @@ - select * from XM.xm_task_skill res where res.id = #{id} @@ -56,14 +56,14 @@ res.id = #{id} - select count(1) from XM.xm_task_skill res - + insert into XM.xm_task_skill( ) values ( @@ -72,7 +72,7 @@ - + delete from XM.xm_task_skill res @@ -80,13 +80,13 @@ - + delete from XM.xm_task_skill where id = #{id} - + update XM.xm_task_skill @@ -95,7 +95,7 @@ - + update XM.xm_task_skill diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskTemplateMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskTemplateMapper.xml index c0dd1c59..07074337 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskTemplateMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskTemplateMapper.xml @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ - select * from XM.xm_task_template res @@ -36,7 +36,7 @@ - select * from XM.xm_task_template res where res.id = #{id} @@ -49,14 +49,14 @@ res.id = #{id} - select count(1) from XM.xm_task_template res - + insert into XM.xm_task_template( ) values ( @@ -65,7 +65,7 @@ - + delete from XM.xm_task_template res @@ -73,13 +73,13 @@ - + delete from XM.xm_task_template where id = #{id} - + update XM.xm_task_template @@ -88,7 +88,7 @@ - + update XM.xm_task_template diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseExecMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseExecMapper.xml index d24133ad..3a51a9e2 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseExecMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseExecMapper.xml @@ -1,12 +1,12 @@ - + - select * from XM.xm_test_case_exec res and res.project_id=#{projectId} @@ -39,7 +39,7 @@ - select * from XM.xm_test_case_exec res @@ -47,7 +47,7 @@ - select * from XM.xm_test_case_exec res where res.id = #{id} @@ -60,14 +60,14 @@ res.id = #{id} - select count(1) from XM.xm_test_case_exec res - + insert into XM.xm_test_case_exec( ) values ( @@ -76,7 +76,7 @@ - + delete from XM.xm_test_case_exec res @@ -84,13 +84,13 @@ - + delete from XM.xm_test_case_exec where id = #{id} - + update XM.xm_test_case_exec @@ -99,7 +99,7 @@ - + update XM.xm_test_case_exec diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml index 6d59d196..c9ce5b88 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ - select * from XM.xm_test_case res @@ -36,7 +36,7 @@ - select * from XM.xm_test_case res where res.id = #{id} @@ -49,14 +49,14 @@ res.id = #{id} - select count(1) from XM.xm_test_case res - + insert into XM.xm_test_case( ) values ( @@ -65,7 +65,7 @@ - + delete from XM.xm_test_case res @@ -73,13 +73,13 @@ - + delete from XM.xm_test_case where id = #{id} - + update XM.xm_test_case @@ -88,7 +88,7 @@ - + update XM.xm_test_case diff --git a/xm-core/src/main/resources/mybatis/mybatis-config.xml b/xm-core/src/main/resources/mybatis/mybatis-config.xml index 285d0159..6dbc255a 100644 --- a/xm-core/src/main/resources/mybatis/mybatis-config.xml +++ b/xm-core/src/main/resources/mybatis/mybatis-config.xml @@ -15,7 +15,7 @@ - + diff --git a/xm-core/src/test/java/com/qqkj/WebSecurityConfig.java b/xm-core/src/test/java/com/qqkj/WebSecurityConfig.java index 1bb8e8ea..dd511860 100644 --- a/xm-core/src/test/java/com/qqkj/WebSecurityConfig.java +++ b/xm-core/src/test/java/com/qqkj/WebSecurityConfig.java @@ -30,17 +30,17 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic import org.springframework.security.web.authentication.logout.HttpStatusReturningLogoutSuccessHandler; import org.springframework.web.cors.CorsUtils; -import com.qqkj.mdp.core.log.MdpLogFilter; -import com.qqkj.mdp.safe.common.entrypoint.SafeAuthenticationEntryPoint; -import com.qqkj.mdp.safe.common.expression.DbPermissionEvaluator; -import com.qqkj.mdp.safe.common.filter.MdpApiAuthorizationFilter; -import com.qqkj.mdp.safe.common.filter.MdpUserAuthenticationFilter; -import com.qqkj.mdp.safe.common.filter.MdpUserAuthorizationFilter; -import com.qqkj.mdp.safe.common.handle.SafeAccessDeniedHandler; -import com.qqkj.mdp.safe.common.handle.SafeAuthenticationFailureHandler; -import com.qqkj.mdp.safe.common.handle.SafeAuthenticationSuccessHandler; -import com.qqkj.mdp.safe.common.pwd.SafePasswordEncoder; -import com.qqkj.mdp.safe.common.service.SafeUserService; +import com.mdp.core.log.MdpLogFilter; +import com.mdp.safe.common.entrypoint.SafeAuthenticationEntryPoint; +import com.mdp.safe.common.expression.DbPermissionEvaluator; +import com.mdp.safe.common.filter.MdpApiAuthorizationFilter; +import com.mdp.safe.common.filter.MdpUserAuthenticationFilter; +import com.mdp.safe.common.filter.MdpUserAuthorizationFilter; +import com.mdp.safe.common.handle.SafeAccessDeniedHandler; +import com.mdp.safe.common.handle.SafeAuthenticationFailureHandler; +import com.mdp.safe.common.handle.SafeAuthenticationSuccessHandler; +import com.mdp.safe.common.pwd.SafePasswordEncoder; +import com.mdp.safe.common.service.SafeUserService; @Configuration @EnableWebSecurity diff --git a/xm-core/src/test/java/com/qqkj/XmApplication.java b/xm-core/src/test/java/com/qqkj/XmApplication.java index efbb8012..cef39b42 100644 --- a/xm-core/src/test/java/com/qqkj/XmApplication.java +++ b/xm-core/src/test/java/com/qqkj/XmApplication.java @@ -7,8 +7,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.http.client.SimpleClientHttpRequestFactory; import org.springframework.web.client.RestTemplate; -import com.qqkj.mdp.core.entity.AppAuth; -import com.qqkj.mdp.safe.common.rest.MdpRestTemplate; +import com.mdp.core.entity.AppAuth; +import com.mdp.safe.common.rest.MdpRestTemplate; @SpringBootApplication //@SpringCloudApplication public class XmApplication { diff --git a/xm-core/src/test/java/com/qqkj/mdp/ImgCompressTest.java b/xm-core/src/test/java/com/qqkj/mdp/ImgCompressTest.java index 070a58a6..01c2e650 100644 --- a/xm-core/src/test/java/com/qqkj/mdp/ImgCompressTest.java +++ b/xm-core/src/test/java/com/qqkj/mdp/ImgCompressTest.java @@ -1,4 +1,4 @@ -package com.qqkj.mdp; +package com.mdp; import java.io.IOException; diff --git a/xm-core/src/test/java/com/qqkj/xm/push/TestXmPushMsgService.java b/xm-core/src/test/java/com/qqkj/xm/push/TestXmPushMsgService.java index c6324e25..7cabbf59 100644 --- a/xm-core/src/test/java/com/qqkj/xm/push/TestXmPushMsgService.java +++ b/xm-core/src/test/java/com/qqkj/xm/push/TestXmPushMsgService.java @@ -1,20 +1,18 @@ package com.qqkj.xm.push; import java.util.*; -import java.text.SimpleDateFormat; + import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmProjectStateService; -import com.qqkj.xm.core.service.push.XmPushMsgService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.xm.core.service.push.XmPushMsgService; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectState; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectStateService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/TestXmProjectStateService.java b/xm-core/src/test/java/com/xm/core/TestXmProjectStateService.java similarity index 91% rename from xm-core/src/test/java/com/qqkj/xm/core/TestXmProjectStateService.java rename to xm-core/src/test/java/com/xm/core/TestXmProjectStateService.java index d4051fd7..dcf61492 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/TestXmProjectStateService.java +++ b/xm-core/src/test/java/com/xm/core/TestXmProjectStateService.java @@ -1,19 +1,16 @@ -package com.qqkj.xm.core; +package com.xm.core; -import java.util.*; -import java.text.SimpleDateFormat; +import com.xm.core.service.XmProjectStateService; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmProjectStateService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectState; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectStateService的测试案例 @@ -37,7 +34,7 @@ import org.springframework.boot.test.context.SpringBootTest; public class TestXmProjectStateService { @Autowired - XmProjectStateService xmProjectStateService; + XmProjectStateService xmProjectStateService; @Test public void loadTasksToXmProjectState( ) { String projectId="qqkj-test-001"; diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmBranchStateController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmBranchStateController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmBranchStateController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmBranchStateController.java index 5e052aee..3aa66f05 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmBranchStateController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmBranchStateController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmBranchState; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmBranchState; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 xm
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmBranchTaskTypeStateController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmBranchTaskTypeStateController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmBranchTaskTypeStateController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmBranchTaskTypeStateController.java index ee876106..5f7da1cf 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmBranchTaskTypeStateController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmBranchTaskTypeStateController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmBranchTaskTypeState; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmBranchTaskTypeState; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 xm
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmExchangeController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmExchangeController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmExchangeController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmExchangeController.java index 50897272..5b135f89 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmExchangeController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmExchangeController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmExchange; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmExchange; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 oa
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmFileController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmFileController.java similarity index 97% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmFileController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmFileController.java index 9f704b64..ace1ffbe 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmFileController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmFileController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmFile; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmFile; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 oa
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmIterationController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmIterationController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmIterationController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmIterationController.java index df18febe..d919d10a 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmIterationController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmIterationController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmIteration; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmIteration; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 oa
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmIterationMenuController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmIterationMenuController.java similarity index 97% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmIterationMenuController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmIterationMenuController.java index 5df9b46b..ce0e513f 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmIterationMenuController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmIterationMenuController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmIterationMenu; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmIterationMenu; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 oa
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmIterationStateController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmIterationStateController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmIterationStateController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmIterationStateController.java index 6a068913..f540df01 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmIterationStateController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmIterationStateController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmIterationState; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmIterationState; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 xm
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmMenuController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmMenuController.java similarity index 96% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmMenuController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmMenuController.java index 20a6ad4d..484630c6 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmMenuController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmMenuController.java @@ -1,12 +1,12 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmMenu; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +25,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmMenu; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 xm
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmMenuPlanController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmMenuPlanController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmMenuPlanController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmMenuPlanController.java index 95536180..4c3663fc 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmMenuPlanController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmMenuPlanController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmMenuPlan; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmMenuPlan; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 xm
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmMenuStateController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmMenuStateController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmMenuStateController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmMenuStateController.java index 3d39ef28..ef73063a 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmMenuStateController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmMenuStateController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmMenuState; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmMenuState; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 xm
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmMyFocusController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmMyFocusController.java similarity index 97% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmMyFocusController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmMyFocusController.java index 2bfb2d49..e202ecfb 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmMyFocusController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmMyFocusController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmMyFocus; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmMyFocus; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 oa
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProductController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProductController.java similarity index 96% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProductController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmProductController.java index b3a42b8d..43ce7d27 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProductController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProductController.java @@ -1,12 +1,12 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; -import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmProduct; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +25,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmProduct; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 xm
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProductStateController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProductStateController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProductStateController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmProductStateController.java index 0b83d35f..ff8ed407 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProductStateController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProductStateController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmProductState; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmProductState; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 xm
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectBaselineController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectBaselineController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectBaselineController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectBaselineController.java index 0d571064..fc4a1427 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectBaselineController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectBaselineController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmProjectBaseline; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmProjectBaseline; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 oa
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectController.java index 1eb54ac5..b40a2f24 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmProject; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmProject; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 oa
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectEnvListController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectEnvListController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectEnvListController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectEnvListController.java index 96a16bde..28e8ba6c 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectEnvListController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectEnvListController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmProjectEnvList; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmProjectEnvList; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 oa
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectGroupController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectGroupController.java similarity index 97% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectGroupController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectGroupController.java index 53b877c9..0b39b074 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectGroupController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectGroupController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmProjectGroup; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmProjectGroup; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 oa
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectGroupFormworkController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectGroupFormworkController.java similarity index 97% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectGroupFormworkController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectGroupFormworkController.java index 90d277e2..91274dcb 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectGroupFormworkController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectGroupFormworkController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmProjectGroupFormwork; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmProjectGroupFormwork; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 oa
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectGroupStateController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectGroupStateController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectGroupStateController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectGroupStateController.java index 710f9896..49b1ca99 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectGroupStateController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectGroupStateController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmProjectGroupState; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmProjectGroupState; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 xm
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectGroupUserController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectGroupUserController.java similarity index 97% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectGroupUserController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectGroupUserController.java index 7ffdd6f5..e68e5add 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectGroupUserController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectGroupUserController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmProjectGroupUser; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmProjectGroupUser; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 xm
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectKpiController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectKpiController.java similarity index 97% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectKpiController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectKpiController.java index 806cd668..dcb35b65 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectKpiController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectKpiController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmProjectKpi; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmProjectKpi; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 oa
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectKpiHisController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectKpiHisController.java similarity index 97% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectKpiHisController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectKpiHisController.java index 95e3c0b1..18087587 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectKpiHisController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectKpiHisController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmProjectKpiHis; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmProjectKpiHis; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 oa
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectMBudgetCostNouserController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectMBudgetCostNouserController.java similarity index 97% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectMBudgetCostNouserController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectMBudgetCostNouserController.java index 2ec16fea..7a1e7527 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectMBudgetCostNouserController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectMBudgetCostNouserController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmProjectMBudgetCostNouser; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmProjectMBudgetCostNouser; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 oa
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectMBudgetCostUserController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectMBudgetCostUserController.java similarity index 97% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectMBudgetCostUserController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectMBudgetCostUserController.java index 1387f79c..89940c5d 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectMBudgetCostUserController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectMBudgetCostUserController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmProjectMBudgetCostUser; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmProjectMBudgetCostUser; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 oa
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectMCostNouserController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectMCostNouserController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectMCostNouserController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectMCostNouserController.java index a6e67efc..7de9028d 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectMCostNouserController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectMCostNouserController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmProjectMCostNouser; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmProjectMCostNouser; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 oa
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectMCostUserController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectMCostUserController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectMCostUserController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectMCostUserController.java index baaa5341..e8764fa8 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectMCostUserController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectMCostUserController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmProjectMCostUser; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmProjectMCostUser; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 oa
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectPhaseBaselineController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectPhaseBaselineController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectPhaseBaselineController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectPhaseBaselineController.java index a30fffbd..61e7c5f5 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectPhaseBaselineController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectPhaseBaselineController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmProjectPhaseBaseline; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmProjectPhaseBaseline; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 oa
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectPhaseController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectPhaseController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectPhaseController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectPhaseController.java index eb2c4033..ebc75934 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectPhaseController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectPhaseController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmProjectPhase; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmProjectPhase; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 xm
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectPhaseTemplateController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectPhaseTemplateController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectPhaseTemplateController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectPhaseTemplateController.java index 0b699852..f35ce917 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectPhaseTemplateController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectPhaseTemplateController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmProjectPhaseTemplate; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmProjectPhaseTemplate; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 oa
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectStateController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectStateController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectStateController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectStateController.java index d0602795..12aec6ff 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectStateController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectStateController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmProjectState; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmProjectState; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 xm
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectStateHisController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectStateHisController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectStateHisController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectStateHisController.java index 139c5b7c..bd84d6e8 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectStateHisController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectStateHisController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmProjectStateHis; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmProjectStateHis; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 xm
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectTaskTypeStateController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectTaskTypeStateController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectTaskTypeStateController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectTaskTypeStateController.java index 08fe8f4a..adebe855 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectTaskTypeStateController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectTaskTypeStateController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmProjectTaskTypeState; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmProjectTaskTypeState; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 xm
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectTemplateController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectTemplateController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectTemplateController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectTemplateController.java index 2e08a57f..4b95b744 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmProjectTemplateController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmProjectTemplateController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmProjectTemplate; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmProjectTemplate; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 oa
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmQuestionController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmQuestionController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmQuestionController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmQuestionController.java index 3d62aaae..a3b69944 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmQuestionController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmQuestionController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmQuestion; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmQuestion; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 xm
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmQuestionHandleController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmQuestionHandleController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmQuestionHandleController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmQuestionHandleController.java index a4753659..356734d1 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmQuestionHandleController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmQuestionHandleController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmQuestionHandle; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmQuestionHandle; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 oa
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmQuestionTagController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmQuestionTagController.java similarity index 97% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmQuestionTagController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmQuestionTagController.java index 585e2f3b..04518a7b 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmQuestionTagController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmQuestionTagController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmQuestionTag; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmQuestionTag; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 oa
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmTaskController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmTaskController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmTaskController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmTaskController.java index b5b85046..0644058c 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmTaskController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmTaskController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmTask; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmTask; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 xm
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmTaskExecuserController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmTaskExecuserController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmTaskExecuserController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmTaskExecuserController.java index f77e66d0..10832815 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmTaskExecuserController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmTaskExecuserController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmTaskExecuser; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmTaskExecuser; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 xm
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmTaskTemplateController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmTaskTemplateController.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmTaskTemplateController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmTaskTemplateController.java index ec538889..1e457c15 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmTaskTemplateController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmTaskTemplateController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmTaskTemplate; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmTaskTemplate; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 oa
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmTestCaseController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmTestCaseController.java similarity index 97% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmTestCaseController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmTestCaseController.java index 16c44b24..b07e81f9 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmTestCaseController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmTestCaseController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmTestCase; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmTestCase; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 xm
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmTestCaseExecController.java b/xm-core/src/test/java/com/xm/core/ctrl/TestXmTestCaseExecController.java similarity index 97% rename from xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmTestCaseExecController.java rename to xm-core/src/test/java/com/xm/core/ctrl/TestXmTestCaseExecController.java index 61422574..1447444d 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/ctrl/TestXmTestCaseExecController.java +++ b/xm-core/src/test/java/com/xm/core/ctrl/TestXmTestCaseExecController.java @@ -1,12 +1,13 @@ -package com.qqkj.xm.core.ctrl; +package com.xm.core.ctrl; import java.text.SimpleDateFormat; import java.util.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import com.xm.core.entity.XmTestCaseExec; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,8 +26,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.boot.test.context.SpringBootTest; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.http.MediaType; -import com.qqkj.xm.core.entity.XmTestCaseExec; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; /** * 组织 com.qqkj
* 顶级模块 xm
diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmBranchStateDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmBranchStateDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmBranchStateDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmBranchStateDao.java index fd954df8..331e8505 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmBranchStateDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmBranchStateDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmBranchState; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmBranchState; import org.springframework.boot.test.context.SpringBootTest; /** * XmBranchStateDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmBranchTaskTypeStateDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmBranchTaskTypeStateDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmBranchTaskTypeStateDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmBranchTaskTypeStateDao.java index f1079edb..35721ca8 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmBranchTaskTypeStateDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmBranchTaskTypeStateDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmBranchTaskTypeState; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmBranchTaskTypeState; import org.springframework.boot.test.context.SpringBootTest; /** * XmBranchTaskTypeStateDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmExchangeDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmExchangeDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmExchangeDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmExchangeDao.java index 31a824f7..d575bcf7 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmExchangeDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmExchangeDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmExchange; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmExchange; import org.springframework.boot.test.context.SpringBootTest; /** * XmExchangeDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmFileDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmFileDao.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmFileDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmFileDao.java index 91fc0fc4..0628de35 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmFileDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmFileDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmFile; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmFile; import org.springframework.boot.test.context.SpringBootTest; /** * XmFileDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmIterationDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmIterationDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmIterationDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmIterationDao.java index 1b9410a7..512090de 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmIterationDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmIterationDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmIteration; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmIteration; import org.springframework.boot.test.context.SpringBootTest; /** * XmIterationDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmIterationMenuDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmIterationMenuDao.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmIterationMenuDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmIterationMenuDao.java index 3ef775df..03483576 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmIterationMenuDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmIterationMenuDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmIterationMenu; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmIterationMenu; import org.springframework.boot.test.context.SpringBootTest; /** * XmIterationMenuDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmIterationStateDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmIterationStateDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmIterationStateDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmIterationStateDao.java index f0c4a362..7062b3e0 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmIterationStateDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmIterationStateDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmIterationState; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmIterationState; import org.springframework.boot.test.context.SpringBootTest; /** * XmIterationStateDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmMenuDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmMenuDao.java similarity index 86% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmMenuDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmMenuDao.java index c58970a5..a2d79c8c 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmMenuDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmMenuDao.java @@ -1,20 +1,20 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; -import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmMenu; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmMenu; import org.springframework.boot.test.context.SpringBootTest; /** * XmMenuDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmMenuPlanDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmMenuPlanDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmMenuPlanDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmMenuPlanDao.java index f4e4421a..0d179ac7 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmMenuPlanDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmMenuPlanDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmMenuPlan; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmMenuPlan; import org.springframework.boot.test.context.SpringBootTest; /** * XmMenuPlanDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmMenuStateDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmMenuStateDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmMenuStateDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmMenuStateDao.java index c3aeeabf..451c9df6 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmMenuStateDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmMenuStateDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmMenuState; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmMenuState; import org.springframework.boot.test.context.SpringBootTest; /** * XmMenuStateDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmMyFocusDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmMyFocusDao.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmMyFocusDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmMyFocusDao.java index 3002041b..17653fc9 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmMyFocusDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmMyFocusDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmMyFocus; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmMyFocus; import org.springframework.boot.test.context.SpringBootTest; /** * XmMyFocusDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProductDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmProductDao.java similarity index 84% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProductDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmProductDao.java index 3d087e92..b1152bbb 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProductDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmProductDao.java @@ -1,20 +1,20 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; -import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProduct; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProduct; import org.springframework.boot.test.context.SpringBootTest; /** * XmProductDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProductStateDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmProductStateDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProductStateDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmProductStateDao.java index da014474..5361e437 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProductStateDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmProductStateDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProductState; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProductState; import org.springframework.boot.test.context.SpringBootTest; /** * XmProductStateDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectBaselineDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectBaselineDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectBaselineDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmProjectBaselineDao.java index 0c8806d8..dffa5a3e 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectBaselineDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectBaselineDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectBaseline; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectBaseline; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectBaselineDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmProjectDao.java index 4efbd3c5..cb8b30a3 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProject; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProject; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectEnvListDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectEnvListDao.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectEnvListDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmProjectEnvListDao.java index d0af9751..8cd62d48 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectEnvListDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectEnvListDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectEnvList; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectEnvList; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectEnvListDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectGroupDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectGroupDao.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectGroupDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmProjectGroupDao.java index ba5f9160..80178a6c 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectGroupDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectGroupDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectGroup; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectGroup; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectGroupDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectGroupFormworkDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectGroupFormworkDao.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectGroupFormworkDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmProjectGroupFormworkDao.java index 53cf2936..5217c947 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectGroupFormworkDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectGroupFormworkDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectGroupFormwork; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectGroupFormwork; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectGroupFormworkDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectGroupStateDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectGroupStateDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectGroupStateDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmProjectGroupStateDao.java index 28cba86a..7cfa9bd5 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectGroupStateDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectGroupStateDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectGroupState; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectGroupState; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectGroupStateDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectGroupUserDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectGroupUserDao.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectGroupUserDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmProjectGroupUserDao.java index 73ea4d01..fa855878 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectGroupUserDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectGroupUserDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectGroupUser; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectGroupUser; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectGroupUserDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectKpiDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectKpiDao.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectKpiDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmProjectKpiDao.java index 70257a35..4c939231 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectKpiDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectKpiDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectKpi; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectKpi; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectKpiDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectKpiHisDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectKpiHisDao.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectKpiHisDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmProjectKpiHisDao.java index f4f2f62e..54f5d443 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectKpiHisDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectKpiHisDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectKpiHis; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectKpiHis; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectKpiHisDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectMBudgetCostNouserDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectMBudgetCostNouserDao.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectMBudgetCostNouserDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmProjectMBudgetCostNouserDao.java index 2f0a95cd..29fd64e5 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectMBudgetCostNouserDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectMBudgetCostNouserDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectMBudgetCostNouser; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectMBudgetCostNouser; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectMBudgetCostNouserDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectMBudgetCostUserDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectMBudgetCostUserDao.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectMBudgetCostUserDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmProjectMBudgetCostUserDao.java index 4eafb8b4..48611905 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectMBudgetCostUserDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectMBudgetCostUserDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectMBudgetCostUser; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectMBudgetCostUser; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectMBudgetCostUserDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectMCostNouserDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectMCostNouserDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectMCostNouserDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmProjectMCostNouserDao.java index 6012ee68..e2eef698 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectMCostNouserDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectMCostNouserDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectMCostNouser; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectMCostNouser; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectMCostNouserDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectMCostUserDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectMCostUserDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectMCostUserDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmProjectMCostUserDao.java index d5ee144d..1bc95e79 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectMCostUserDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectMCostUserDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectMCostUser; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectMCostUser; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectMCostUserDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectPhaseBaselineDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectPhaseBaselineDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectPhaseBaselineDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmProjectPhaseBaselineDao.java index d733e50b..aa88169e 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectPhaseBaselineDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectPhaseBaselineDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectPhaseBaseline; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectPhaseBaseline; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectPhaseBaselineDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectPhaseDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectPhaseDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectPhaseDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmProjectPhaseDao.java index 49fc6279..70ffb8c4 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectPhaseDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectPhaseDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectPhase; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectPhase; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectPhaseDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectPhaseTemplateDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectPhaseTemplateDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectPhaseTemplateDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmProjectPhaseTemplateDao.java index 93bf0ad5..ccafd3f3 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectPhaseTemplateDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectPhaseTemplateDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectPhaseTemplate; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectPhaseTemplate; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectPhaseTemplateDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectStateDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectStateDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectStateDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmProjectStateDao.java index 73df351a..62789122 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectStateDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectStateDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectState; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectState; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectStateDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectStateHisDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectStateHisDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectStateHisDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmProjectStateHisDao.java index 522ba542..05150386 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectStateHisDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectStateHisDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectStateHis; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectStateHis; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectStateHisDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectTaskTypeStateDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectTaskTypeStateDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectTaskTypeStateDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmProjectTaskTypeStateDao.java index ee938b89..2e1334b1 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectTaskTypeStateDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectTaskTypeStateDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectTaskTypeState; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectTaskTypeState; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectTaskTypeStateDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectTemplateDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectTemplateDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectTemplateDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmProjectTemplateDao.java index abf840da..ebe9c08b 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmProjectTemplateDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectTemplateDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectTemplate; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectTemplate; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectTemplateDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmQuestionDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmQuestionDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmQuestionDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmQuestionDao.java index 7dd84aba..0c4462a9 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmQuestionDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmQuestionDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmQuestion; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmQuestion; import org.springframework.boot.test.context.SpringBootTest; /** * XmQuestionDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmQuestionHandleDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmQuestionHandleDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmQuestionHandleDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmQuestionHandleDao.java index b576037c..89342d48 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmQuestionHandleDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmQuestionHandleDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmQuestionHandle; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmQuestionHandle; import org.springframework.boot.test.context.SpringBootTest; /** * XmQuestionHandleDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmQuestionTagDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmQuestionTagDao.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmQuestionTagDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmQuestionTagDao.java index 03f17fa5..f0d87160 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmQuestionTagDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmQuestionTagDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmQuestionTag; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmQuestionTag; import org.springframework.boot.test.context.SpringBootTest; /** * XmQuestionTagDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmTaskDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmTaskDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmTaskDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmTaskDao.java index 4945d44e..91a3e480 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmTaskDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmTaskDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmTask; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmTask; import org.springframework.boot.test.context.SpringBootTest; /** * XmTaskDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmTaskExecuserDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmTaskExecuserDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmTaskExecuserDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmTaskExecuserDao.java index 6a6d2f06..0e4ac3ec 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmTaskExecuserDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmTaskExecuserDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmTaskExecuser; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmTaskExecuser; import org.springframework.boot.test.context.SpringBootTest; /** * XmTaskExecuserDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmTaskTemplateDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmTaskTemplateDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmTaskTemplateDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmTaskTemplateDao.java index d76f9997..7d38fd77 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmTaskTemplateDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmTaskTemplateDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmTaskTemplate; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmTaskTemplate; import org.springframework.boot.test.context.SpringBootTest; /** * XmTaskTemplateDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmTestCaseDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmTestCaseDao.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmTestCaseDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmTestCaseDao.java index 3f6fa350..53cbc872 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmTestCaseDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmTestCaseDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmTestCase; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmTestCase; import org.springframework.boot.test.context.SpringBootTest; /** * XmTestCaseDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmTestCaseExecDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmTestCaseExecDao.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmTestCaseExecDao.java rename to xm-core/src/test/java/com/xm/core/dao/TestXmTestCaseExecDao.java index b6320a0f..efdea06b 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/dao/TestXmTestCaseExecDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmTestCaseExecDao.java @@ -1,20 +1,21 @@ -package com.qqkj.xm.core.dao; +package com.xm.core.dao; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmTestCaseExec; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; +import com.mdp.core.utils.BaseUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.mdp.core.dao.BaseDao; -import com.qqkj.mdp.core.context.ContextHolder; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.dao.BaseDao; + +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmTestCaseExec; import org.springframework.boot.test.context.SpringBootTest; /** * XmTestCaseExecDao的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmBranchStateService.java b/xm-core/src/test/java/com/xm/core/service/TestXmBranchStateService.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmBranchStateService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmBranchStateService.java index 3e10e922..fbdfc227 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmBranchStateService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmBranchStateService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmBranchState; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmBranchStateService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmBranchState; import org.springframework.boot.test.context.SpringBootTest; /** * XmBranchStateService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmBranchTaskTypeStateService.java b/xm-core/src/test/java/com/xm/core/service/TestXmBranchTaskTypeStateService.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmBranchTaskTypeStateService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmBranchTaskTypeStateService.java index 1a151611..0b4c3d56 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmBranchTaskTypeStateService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmBranchTaskTypeStateService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmBranchTaskTypeState; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmBranchTaskTypeStateService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmBranchTaskTypeState; import org.springframework.boot.test.context.SpringBootTest; /** * XmBranchTaskTypeStateService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmExchangeService.java b/xm-core/src/test/java/com/xm/core/service/TestXmExchangeService.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmExchangeService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmExchangeService.java index 2a263e2b..e3182969 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmExchangeService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmExchangeService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmExchange; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmExchangeService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmExchange; import org.springframework.boot.test.context.SpringBootTest; /** * XmExchangeService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmFileService.java b/xm-core/src/test/java/com/xm/core/service/TestXmFileService.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmFileService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmFileService.java index e31911f0..05c143f9 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmFileService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmFileService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmFile; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmFileService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmFile; import org.springframework.boot.test.context.SpringBootTest; /** * XmFileService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmIterationMenuService.java b/xm-core/src/test/java/com/xm/core/service/TestXmIterationMenuService.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmIterationMenuService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmIterationMenuService.java index 496d204f..55250f55 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmIterationMenuService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmIterationMenuService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmIterationMenu; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmIterationMenuService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmIterationMenu; import org.springframework.boot.test.context.SpringBootTest; /** * XmIterationMenuService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmIterationService.java b/xm-core/src/test/java/com/xm/core/service/TestXmIterationService.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmIterationService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmIterationService.java index 8783d3a9..c299cb0a 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmIterationService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmIterationService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmIteration; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmIterationService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmIteration; import org.springframework.boot.test.context.SpringBootTest; /** * XmIterationService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmIterationStateService.java b/xm-core/src/test/java/com/xm/core/service/TestXmIterationStateService.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmIterationStateService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmIterationStateService.java index c65d42bd..3708257f 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmIterationStateService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmIterationStateService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmIterationState; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmIterationStateService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmIterationState; import org.springframework.boot.test.context.SpringBootTest; /** * XmIterationStateService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmMenuPlanService.java b/xm-core/src/test/java/com/xm/core/service/TestXmMenuPlanService.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmMenuPlanService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmMenuPlanService.java index 493abfbf..f7aac3ce 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmMenuPlanService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmMenuPlanService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmMenuPlan; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmMenuPlanService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmMenuPlan; import org.springframework.boot.test.context.SpringBootTest; /** * XmMenuPlanService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmMenuService.java b/xm-core/src/test/java/com/xm/core/service/TestXmMenuService.java similarity index 84% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmMenuService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmMenuService.java index 297203a5..a339f942 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmMenuService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmMenuService.java @@ -1,19 +1,18 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; -import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmMenu; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmMenuService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmMenu; import org.springframework.boot.test.context.SpringBootTest; /** * XmMenuService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmMenuStateService.java b/xm-core/src/test/java/com/xm/core/service/TestXmMenuStateService.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmMenuStateService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmMenuStateService.java index 05ae2667..3508d024 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmMenuStateService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmMenuStateService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmMenuState; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmMenuStateService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmMenuState; import org.springframework.boot.test.context.SpringBootTest; /** * XmMenuStateService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmMyFocusService.java b/xm-core/src/test/java/com/xm/core/service/TestXmMyFocusService.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmMyFocusService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmMyFocusService.java index 4b5305be..2f6e4f07 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmMyFocusService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmMyFocusService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmMyFocus; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmMyFocusService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmMyFocus; import org.springframework.boot.test.context.SpringBootTest; /** * XmMyFocusService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProductService.java b/xm-core/src/test/java/com/xm/core/service/TestXmProductService.java similarity index 82% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProductService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmProductService.java index e953a13c..8129d0d1 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProductService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmProductService.java @@ -1,19 +1,18 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; -import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProduct; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmProductService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProduct; import org.springframework.boot.test.context.SpringBootTest; /** * XmProductService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProductStateService.java b/xm-core/src/test/java/com/xm/core/service/TestXmProductStateService.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProductStateService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmProductStateService.java index 20704c44..abc0b71c 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProductStateService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmProductStateService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProductState; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmProductStateService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProductState; import org.springframework.boot.test.context.SpringBootTest; /** * XmProductStateService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectBaselineService.java b/xm-core/src/test/java/com/xm/core/service/TestXmProjectBaselineService.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectBaselineService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmProjectBaselineService.java index 10dc2cc4..d21a0bbb 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectBaselineService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmProjectBaselineService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectBaseline; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmProjectBaselineService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectBaseline; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectBaselineService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectEnvListService.java b/xm-core/src/test/java/com/xm/core/service/TestXmProjectEnvListService.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectEnvListService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmProjectEnvListService.java index 80dfc20b..aef2ddab 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectEnvListService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmProjectEnvListService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectEnvList; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmProjectEnvListService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectEnvList; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectEnvListService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectGroupFormworkService.java b/xm-core/src/test/java/com/xm/core/service/TestXmProjectGroupFormworkService.java similarity index 97% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectGroupFormworkService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmProjectGroupFormworkService.java index bb7ece0f..6802e239 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectGroupFormworkService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmProjectGroupFormworkService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectGroupFormwork; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmProjectGroupFormworkService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectGroupFormwork; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectGroupFormworkService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectGroupService.java b/xm-core/src/test/java/com/xm/core/service/TestXmProjectGroupService.java similarity index 81% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectGroupService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmProjectGroupService.java index 97281ec6..bdae7bf2 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectGroupService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmProjectGroupService.java @@ -1,22 +1,21 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; -import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProject; +import com.xm.core.entity.XmProjectGroup; +import com.xm.core.entity.XmProjectGroupUser; +import com.xm.core.vo.XmProjectGroupVo; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmProjectGroupService; -import com.qqkj.xm.core.vo.XmProjectGroupVo; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProject; -import com.qqkj.xm.core.entity.XmProjectGroup; -import com.qqkj.xm.core.entity.XmProjectGroupUser; import org.springframework.boot.test.context.SpringBootTest; /** @@ -62,7 +61,7 @@ public class TestXmProjectGroupService { List projects=xmProjectService.selectListByWhere(new XmProject()); String projectId=projects.get(0).getId(); - List xmProjectGroupVoList = xmProjectGroupService.getProjectGroupVoList(projectId); + List xmProjectGroupVoList = xmProjectGroupService.getProjectGroupVoList(projectId); XmProjectGroupVo gvo=new XmProjectGroupVo(); gvo.setId("xxxx3"); gvo.setGroupName("xxxx3_name"); diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectGroupStateService.java b/xm-core/src/test/java/com/xm/core/service/TestXmProjectGroupStateService.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectGroupStateService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmProjectGroupStateService.java index 95c352bf..dea15849 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectGroupStateService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmProjectGroupStateService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectGroupState; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmProjectGroupStateService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectGroupState; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectGroupStateService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectGroupUserService.java b/xm-core/src/test/java/com/xm/core/service/TestXmProjectGroupUserService.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectGroupUserService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmProjectGroupUserService.java index f4552fce..1cf6895a 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectGroupUserService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmProjectGroupUserService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectGroupUser; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmProjectGroupUserService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectGroupUser; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectGroupUserService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectKpiHisService.java b/xm-core/src/test/java/com/xm/core/service/TestXmProjectKpiHisService.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectKpiHisService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmProjectKpiHisService.java index a129bb0d..1cc750b4 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectKpiHisService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmProjectKpiHisService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectKpiHis; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmProjectKpiHisService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectKpiHis; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectKpiHisService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectKpiService.java b/xm-core/src/test/java/com/xm/core/service/TestXmProjectKpiService.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectKpiService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmProjectKpiService.java index 430a4912..906091b9 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectKpiService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmProjectKpiService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectKpi; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmProjectKpiService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectKpi; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectKpiService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectMBudgetCostNouserService.java b/xm-core/src/test/java/com/xm/core/service/TestXmProjectMBudgetCostNouserService.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectMBudgetCostNouserService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmProjectMBudgetCostNouserService.java index 702b10f8..e18a7328 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectMBudgetCostNouserService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmProjectMBudgetCostNouserService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectMBudgetCostNouser; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmProjectMBudgetCostNouserService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectMBudgetCostNouser; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectMBudgetCostNouserService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectMBudgetCostUserService.java b/xm-core/src/test/java/com/xm/core/service/TestXmProjectMBudgetCostUserService.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectMBudgetCostUserService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmProjectMBudgetCostUserService.java index 7e45d37e..59a3c375 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectMBudgetCostUserService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmProjectMBudgetCostUserService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectMBudgetCostUser; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmProjectMBudgetCostUserService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectMBudgetCostUser; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectMBudgetCostUserService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectMCostNouserService.java b/xm-core/src/test/java/com/xm/core/service/TestXmProjectMCostNouserService.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectMCostNouserService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmProjectMCostNouserService.java index d166ba6e..2e3e7370 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectMCostNouserService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmProjectMCostNouserService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectMCostNouser; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmProjectMCostNouserService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectMCostNouser; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectMCostNouserService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectMCostUserService.java b/xm-core/src/test/java/com/xm/core/service/TestXmProjectMCostUserService.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectMCostUserService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmProjectMCostUserService.java index ec45a556..7dd2e0f4 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectMCostUserService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmProjectMCostUserService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectMCostUser; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmProjectMCostUserService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectMCostUser; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectMCostUserService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectPhaseBaselineService.java b/xm-core/src/test/java/com/xm/core/service/TestXmProjectPhaseBaselineService.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectPhaseBaselineService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmProjectPhaseBaselineService.java index f5d43bc6..34496eff 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectPhaseBaselineService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmProjectPhaseBaselineService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectPhaseBaseline; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmProjectPhaseBaselineService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectPhaseBaseline; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectPhaseBaselineService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectPhaseService.java b/xm-core/src/test/java/com/xm/core/service/TestXmProjectPhaseService.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectPhaseService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmProjectPhaseService.java index fc9d7f67..4b1b398e 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectPhaseService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmProjectPhaseService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectPhase; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmProjectPhaseService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectPhase; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectPhaseService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectPhaseTemplateService.java b/xm-core/src/test/java/com/xm/core/service/TestXmProjectPhaseTemplateService.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectPhaseTemplateService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmProjectPhaseTemplateService.java index fdf0e8b0..05f8abb6 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectPhaseTemplateService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmProjectPhaseTemplateService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectPhaseTemplate; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmProjectPhaseTemplateService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectPhaseTemplate; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectPhaseTemplateService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectService.java b/xm-core/src/test/java/com/xm/core/service/TestXmProjectService.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmProjectService.java index 687d57cc..311bbcb6 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmProjectService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProject; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmProjectService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProject; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectStateHisService.java b/xm-core/src/test/java/com/xm/core/service/TestXmProjectStateHisService.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectStateHisService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmProjectStateHisService.java index 4fa23518..164dab7e 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectStateHisService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmProjectStateHisService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectStateHis; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmProjectStateHisService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectStateHis; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectStateHisService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectStateService.java b/xm-core/src/test/java/com/xm/core/service/TestXmProjectStateService.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectStateService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmProjectStateService.java index ff9cde82..a1d0f13a 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectStateService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmProjectStateService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectState; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmProjectStateService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectState; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectStateService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectTaskTypeStateService.java b/xm-core/src/test/java/com/xm/core/service/TestXmProjectTaskTypeStateService.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectTaskTypeStateService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmProjectTaskTypeStateService.java index 15686c88..7d4f46c1 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectTaskTypeStateService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmProjectTaskTypeStateService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectTaskTypeState; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmProjectTaskTypeStateService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectTaskTypeState; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectTaskTypeStateService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectTemplateService.java b/xm-core/src/test/java/com/xm/core/service/TestXmProjectTemplateService.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectTemplateService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmProjectTemplateService.java index 5dff529b..cdbb001b 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmProjectTemplateService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmProjectTemplateService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmProjectTemplate; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmProjectTemplateService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmProjectTemplate; import org.springframework.boot.test.context.SpringBootTest; /** * XmProjectTemplateService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmQuestionHandleService.java b/xm-core/src/test/java/com/xm/core/service/TestXmQuestionHandleService.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmQuestionHandleService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmQuestionHandleService.java index d2428000..80f66a96 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmQuestionHandleService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmQuestionHandleService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmQuestionHandle; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmQuestionHandleService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmQuestionHandle; import org.springframework.boot.test.context.SpringBootTest; /** * XmQuestionHandleService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmQuestionService.java b/xm-core/src/test/java/com/xm/core/service/TestXmQuestionService.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmQuestionService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmQuestionService.java index 3f5afe26..306d99f4 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmQuestionService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmQuestionService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmQuestion; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmQuestionService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmQuestion; import org.springframework.boot.test.context.SpringBootTest; /** * XmQuestionService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmQuestionTagService.java b/xm-core/src/test/java/com/xm/core/service/TestXmQuestionTagService.java similarity index 97% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmQuestionTagService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmQuestionTagService.java index 8f3c9e38..6fd2f7cd 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmQuestionTagService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmQuestionTagService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmQuestionTag; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmQuestionTagService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmQuestionTag; import org.springframework.boot.test.context.SpringBootTest; /** * XmQuestionTagService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmTaskExecuserService.java b/xm-core/src/test/java/com/xm/core/service/TestXmTaskExecuserService.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmTaskExecuserService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmTaskExecuserService.java index 4728492c..762e8cc7 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmTaskExecuserService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmTaskExecuserService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmTaskExecuser; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmTaskExecuserService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmTaskExecuser; import org.springframework.boot.test.context.SpringBootTest; /** * XmTaskExecuserService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmTaskService.java b/xm-core/src/test/java/com/xm/core/service/TestXmTaskService.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmTaskService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmTaskService.java index d4f57f3d..10ba5bfb 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmTaskService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmTaskService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmTask; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmTaskService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmTask; import org.springframework.boot.test.context.SpringBootTest; /** * XmTaskService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmTaskTemplateService.java b/xm-core/src/test/java/com/xm/core/service/TestXmTaskTemplateService.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmTaskTemplateService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmTaskTemplateService.java index 1890c6e6..3155b718 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmTaskTemplateService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmTaskTemplateService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmTaskTemplate; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmTaskTemplateService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmTaskTemplate; import org.springframework.boot.test.context.SpringBootTest; /** * XmTaskTemplateService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmTestCaseExecService.java b/xm-core/src/test/java/com/xm/core/service/TestXmTestCaseExecService.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmTestCaseExecService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmTestCaseExecService.java index db945a91..0a0e7bdc 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmTestCaseExecService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmTestCaseExecService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmTestCaseExec; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmTestCaseExecService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmTestCaseExec; import org.springframework.boot.test.context.SpringBootTest; /** * XmTestCaseExecService的测试案例 diff --git a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmTestCaseService.java b/xm-core/src/test/java/com/xm/core/service/TestXmTestCaseService.java similarity index 98% rename from xm-core/src/test/java/com/qqkj/xm/core/service/TestXmTestCaseService.java rename to xm-core/src/test/java/com/xm/core/service/TestXmTestCaseService.java index 678a0e93..3152c4f1 100644 --- a/xm-core/src/test/java/com/qqkj/xm/core/service/TestXmTestCaseService.java +++ b/xm-core/src/test/java/com/xm/core/service/TestXmTestCaseService.java @@ -1,19 +1,19 @@ -package com.qqkj.xm.core.service; +package com.xm.core.service; import java.util.*; import java.text.SimpleDateFormat; + +import com.xm.core.entity.XmTestCase; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.qqkj.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.qqkj.xm.core.service.XmTestCaseService; -import com.qqkj.mdp.mybatis.PageUtils; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.mybatis.PageUtils; import com.github.pagehelper.Page; -import com.qqkj.xm.core.entity.XmTestCase; import org.springframework.boot.test.context.SpringBootTest; /** * XmTestCaseService的测试案例 diff --git a/xm-core/xm-core.iml b/xm-core/xm-core.iml index a527fe7e..32fa1600 100644 --- a/xm-core/xm-core.iml +++ b/xm-core/xm-core.iml @@ -13,7 +13,7 @@ - + @@ -23,103 +23,156 @@ - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - @@ -128,7 +181,7 @@ - + @@ -136,15 +189,12 @@ - + - - - - - + + - + \ No newline at end of file diff --git a/xm-starter/xm-starter.iml b/xm-starter/xm-starter.iml deleted file mode 100644 index fca528f4..00000000 --- a/xm-starter/xm-starter.iml +++ /dev/null @@ -1,255 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file