diff --git a/orange-demo-multi-service-for-app/.idea/.name b/orange-demo-multi-service-for-app/.idea/.name
deleted file mode 100644
index eaf507fb..00000000
--- a/orange-demo-multi-service-for-app/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-OrangeMultiDemo
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/.idea/compiler.xml b/orange-demo-multi-service-for-app/.idea/compiler.xml
index e490c836..2d58d5b1 100644
--- a/orange-demo-multi-service-for-app/.idea/compiler.xml
+++ b/orange-demo-multi-service-for-app/.idea/compiler.xml
@@ -6,18 +6,19 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -29,6 +30,7 @@
+
diff --git a/orange-demo-multi-service-for-app/.idea/encodings.xml b/orange-demo-multi-service-for-app/.idea/encodings.xml
index 0b38991f..a957d8ba 100644
--- a/orange-demo-multi-service-for-app/.idea/encodings.xml
+++ b/orange-demo-multi-service-for-app/.idea/encodings.xml
@@ -18,6 +18,8 @@
+
+
diff --git a/orange-demo-multi-service-for-app/.idea/inspectionProfiles/Project_Default.xml b/orange-demo-multi-service-for-app/.idea/inspectionProfiles/Project_Default.xml
index fc8488e1..c562afbb 100644
--- a/orange-demo-multi-service-for-app/.idea/inspectionProfiles/Project_Default.xml
+++ b/orange-demo-multi-service-for-app/.idea/inspectionProfiles/Project_Default.xml
@@ -14,6 +14,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/orange-demo-multi-service/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_0.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_3_2.xml
similarity index 62%
rename from orange-demo-multi-service/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_0.xml
rename to orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_3_2.xml
index 93b26b4d..7c0b8e6b 100644
--- a/orange-demo-multi-service/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_0.xml
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_3_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_11.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_2_0.xml
similarity index 60%
rename from orange-demo-multi-service/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_11.xml
rename to orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_2_0.xml
index 9760f7bd..b877688d 100644
--- a/orange-demo-multi-service/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_11.xml
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_2_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_13.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_3_0.xml
similarity index 54%
rename from orange-demo-multi-service/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_13.xml
rename to orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_3_0.xml
index c66c0cbd..f870e68c 100644
--- a/orange-demo-multi-service/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_13.xml
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_3_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_13.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_3_0.xml
similarity index 57%
rename from orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_13.xml
rename to orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_3_0.xml
index f482d3cb..64a8fe7e 100644
--- a/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_13.xml
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_3_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_xiaoymin_knife4j_annotations_2_0_5.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_xiaoymin_knife4j_annotations_2_0_5.xml
new file mode 100644
index 00000000..1f9c628c
--- /dev/null
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_xiaoymin_knife4j_annotations_2_0_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_xiaoymin_knife4j_core_2_0_5.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_xiaoymin_knife4j_core_2_0_5.xml
new file mode 100644
index 00000000..177365d1
--- /dev/null
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_xiaoymin_knife4j_core_2_0_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_xiaoymin_knife4j_micro_spring_boot_starter_2_0_5.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_xiaoymin_knife4j_micro_spring_boot_starter_2_0_5.xml
new file mode 100644
index 00000000..2e57265a
--- /dev/null
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_xiaoymin_knife4j_micro_spring_boot_starter_2_0_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_2_0_5.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_2_0_5.xml
new file mode 100644
index 00000000..664ba028
--- /dev/null
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_2_0_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_autoconfigure_2_0_5.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_autoconfigure_2_0_5.xml
new file mode 100644
index 00000000..1fee9449
--- /dev/null
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_autoconfigure_2_0_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_ui_2_0_5.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_ui_2_0_5.xml
new file mode 100644
index 00000000..da9242d4
--- /dev/null
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_ui_2_0_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_bean_validators_2_9_2.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_bean_validators_2_9_2.xml
new file mode 100644
index 00000000..fd547760
--- /dev/null
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_bean_validators_2_9_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml
new file mode 100644
index 00000000..03588dc9
--- /dev/null
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml
new file mode 100644
index 00000000..4a47148b
--- /dev/null
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml
new file mode 100644
index 00000000..f934649a
--- /dev/null
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml
new file mode 100644
index 00000000..7898a19c
--- /dev/null
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml
new file mode 100644
index 00000000..4ed7d0d2
--- /dev/null
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml
new file mode 100644
index 00000000..c40ef9ff
--- /dev/null
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml
new file mode 100644
index 00000000..1c4a6212
--- /dev/null
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_22.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_22.xml
new file mode 100644
index 00000000..b4e45d34
--- /dev/null
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_22.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_swagger_swagger_models_1_5_21.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_swagger_swagger_models_1_5_21.xml
new file mode 100644
index 00000000..9b3959ab
--- /dev/null
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_swagger_swagger_models_1_5_21.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_swagger_swagger_models_1_5_22.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_swagger_swagger_models_1_5_22.xml
new file mode 100644
index 00000000..9d254f74
--- /dev/null
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_swagger_swagger_models_1_5_22.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/.idea/libraries/Maven__org_javassist_javassist_3_25_0_GA.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__org_javassist_javassist_3_25_0_GA.xml
new file mode 100644
index 00000000..a24c34c9
--- /dev/null
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__org_javassist_javassist_3_25_0_GA.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_1.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_3.xml
similarity index 55%
rename from orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_1.xml
rename to orange-demo-multi-service-for-app/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_3.xml
index cbb713ac..dc3ed940 100644
--- a/orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_1.xml
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_3.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_1.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_3.xml
similarity index 59%
rename from orange-demo-multi-service-for-app/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_1.xml
rename to orange-demo-multi-service-for-app/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_3.xml
index eb12c3f8..93042377 100644
--- a/orange-demo-multi-service-for-app/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_1.xml
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_3.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml
new file mode 100644
index 00000000..fbc04529
--- /dev/null
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml b/orange-demo-multi-service-for-app/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml
new file mode 100644
index 00000000..7e6f096b
--- /dev/null
+++ b/orange-demo-multi-service-for-app/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/.idea/modules.xml b/orange-demo-multi-service-for-app/.idea/modules.xml
index 50af0a81..6144c4af 100644
--- a/orange-demo-multi-service-for-app/.idea/modules.xml
+++ b/orange-demo-multi-service-for-app/.idea/modules.xml
@@ -10,6 +10,7 @@
+
diff --git a/orange-demo-multi-service-for-app/.idea/workspace.xml b/orange-demo-multi-service-for-app/.idea/workspace.xml
index 833389ab..6840b8d1 100644
--- a/orange-demo-multi-service-for-app/.idea/workspace.xml
+++ b/orange-demo-multi-service-for-app/.idea/workspace.xml
@@ -1,7 +1,7 @@
-
+
@@ -13,7 +13,7 @@
-
+
@@ -36,7 +36,7 @@
-
+
@@ -83,12 +83,12 @@
-
- 1608300885867
+
+ 1609680782670
- 1608300885867
-
+ 1609680782670
+
diff --git a/orange-demo-multi-service-for-app/README.md b/orange-demo-multi-service-for-app/README.md
index e9deee26..5a9d9476 100644
--- a/orange-demo-multi-service-for-app/README.md
+++ b/orange-demo-multi-service-for-app/README.md
@@ -12,6 +12,8 @@
最后，我们真诚的希望能够得到您的反馈，并持续改进我们的产品、文档、服务和操作流程。
### 服务接口文档
---
+- Knife4j
+ - 服务启动后，Knife4j的文档入口地址 [http://localhost:8082/doc.html#/plus](http://localhost:8082/doc.html#/plus)
- Postman
- 无需启动服务，即可将当前工程的接口导出成Postman格式。在工程的common/common-tools/模块下，找到ExportApiApp文件，并执行main函数。
diff --git a/orange-demo-multi-service-for-app/application/application-common/application-common.iml b/orange-demo-multi-service-for-app/application/application-common/application-common.iml
index 5093ab5b..5218ae7d 100644
--- a/orange-demo-multi-service-for-app/application/application-common/application-common.iml
+++ b/orange-demo-multi-service-for-app/application/application-common/application-common.iml
@@ -84,12 +84,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/course-class-interface.iml b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/course-class-interface.iml
index 7ae6871c..422a6cd0 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/course-class-interface.iml
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/course-class-interface.iml
@@ -85,12 +85,30 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -247,7 +265,7 @@
-
+
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/pom.xml b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/pom.xml
index 4de79cbd..4d488707 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/pom.xml
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/pom.xml
@@ -26,5 +26,11 @@
common-core
1.0.0
+
+
+ com.orange.demo
+ common-swagger
+ 1.0.0
+
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/AreaCodeDto.java b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/AreaCodeDto.java
index fbf7db6d..acec0c2b 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/AreaCodeDto.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/AreaCodeDto.java
@@ -1,5 +1,7 @@
package com.orange.demo.courseclassinterface.dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -8,26 +10,31 @@ import lombok.Data;
* @author Jerry
* @date 2020-08-08
*/
+@ApiModel("行政区划实体对象")
@Data
public class AreaCodeDto {
/**
* 行政区划主键Id
*/
+ @ApiModelProperty(value = "行政区划主键Id", required = true)
private Long areaId;
/**
* 行政区划名称
*/
+ @ApiModelProperty(value = "行政区划名称")
private String areaName;
/**
* 行政区划级别 (1: 省级别 2: 市级别 3: 区级别)
*/
+ @ApiModelProperty(value = "行政区划级别")
private Integer areaLevel;
/**
* 父级行政区划Id
*/
+ @ApiModelProperty(value = "父级行政区划Id")
private Long parentId;
}
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/ClassCourseDto.java b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/ClassCourseDto.java
index d972b3ca..d90477e8 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/ClassCourseDto.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/ClassCourseDto.java
@@ -2,6 +2,8 @@ package com.orange.demo.courseclassinterface.dto;
import com.orange.demo.common.core.validator.UpdateGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
@@ -12,24 +14,28 @@ import javax.validation.constraints.*;
* @author Jerry
* @date 2020-08-08
*/
+@ApiModel("ClassCourseDto对象")
@Data
public class ClassCourseDto {
/**
* 班级Id。
*/
+ @ApiModelProperty(value = "班级Id", required = true)
@NotNull(message = "数据验证失败，班级Id不能为空！", groups = {UpdateGroup.class})
private Long classId;
/**
* 课程Id。
*/
+ @ApiModelProperty(value = "课程Id", required = true)
@NotNull(message = "数据验证失败，课程Id不能为空！", groups = {UpdateGroup.class})
private Long courseId;
/**
* 课程顺序(数值越小越靠前)。
*/
+ @ApiModelProperty(value = "课程顺序(数值越小越靠前)", required = true)
@NotNull(message = "数据验证失败，课程顺序(数值越小越靠前)不能为空！", groups = {UpdateGroup.class})
private Integer courseOrder;
}
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/ClassStudentDto.java b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/ClassStudentDto.java
index 565297b8..6e03c67a 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/ClassStudentDto.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/ClassStudentDto.java
@@ -2,6 +2,8 @@ package com.orange.demo.courseclassinterface.dto;
import com.orange.demo.common.core.validator.UpdateGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
@@ -12,18 +14,21 @@ import javax.validation.constraints.*;
* @author Jerry
* @date 2020-08-08
*/
+@ApiModel("ClassStudentDto对象")
@Data
public class ClassStudentDto {
/**
* 班级Id。
*/
+ @ApiModelProperty(value = "班级Id", required = true)
@NotNull(message = "数据验证失败，班级Id不能为空！", groups = {UpdateGroup.class})
private Long classId;
/**
* 学生Id。
*/
+ @ApiModelProperty(value = "学生Id", required = true)
@NotNull(message = "数据验证失败，学生Id不能为空！", groups = {UpdateGroup.class})
private Long studentId;
}
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/CourseDto.java b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/CourseDto.java
index 1033586b..24953962 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/CourseDto.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/CourseDto.java
@@ -5,12 +5,13 @@ import com.orange.demo.common.core.validator.ConstDictRef;
import com.orange.demo.courseclassinterface.constant.CourseDifficult;
import com.orange.demo.application.common.constant.Subject;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
import java.math.BigDecimal;
-import java.util.Date;
/**
* CourseDto对象。
@@ -18,35 +19,41 @@ import java.util.Date;
* @author Jerry
* @date 2020-08-08
*/
+@ApiModel("CourseDto对象")
@Data
public class CourseDto {
/**
* 主键Id。
*/
+ @ApiModelProperty(value = "主键Id", required = true)
@NotNull(message = "数据验证失败，主键Id不能为空！", groups = {UpdateGroup.class})
private Long courseId;
/**
* 课程名称。
*/
+ @ApiModelProperty(value = "课程名称", required = true)
@NotBlank(message = "数据验证失败，课程名称不能为空！")
private String courseName;
/**
* 课程价格。
*/
+ @ApiModelProperty(value = "课程价格", required = true)
@NotNull(message = "数据验证失败，课程价格不能为空！")
private BigDecimal price;
/**
* 课程描述。
*/
+ @ApiModelProperty(value = "课程描述")
private String description;
/**
* 课程难度(0: 容易 1: 普通 2: 很难)。
*/
+ @ApiModelProperty(value = "课程难度(0: 容易 1: 普通 2: 很难)", required = true)
@NotNull(message = "数据验证失败，课程难度不能为空！")
@ConstDictRef(constDictClass = CourseDifficult.class, message = "数据验证失败，课程难度为无效值！")
private Integer difficulty;
@@ -54,12 +61,14 @@ public class CourseDto {
/**
* 年级Id。
*/
+ @ApiModelProperty(value = "年级Id", required = true)
@NotNull(message = "数据验证失败，所属年级不能为空！")
private Integer gradeId;
/**
* 学科Id。
*/
+ @ApiModelProperty(value = "学科Id", required = true)
@NotNull(message = "数据验证失败，所属学科不能为空！")
@ConstDictRef(constDictClass = Subject.class, message = "数据验证失败，所属学科为无效值！")
private Integer subjectId;
@@ -67,57 +76,50 @@ public class CourseDto {
/**
* 课时数量。
*/
+ @ApiModelProperty(value = "课时数量", required = true)
@NotNull(message = "数据验证失败，课时数量不能为空！")
private Integer classHour;
/**
* 多张课程图片地址。
*/
+ @ApiModelProperty(value = "多张课程图片地址", required = true)
@NotBlank(message = "数据验证失败，课程图片不能为空！")
private String pictureUrl;
- /**
- * 创建用户Id。
- */
- private Long createUserId;
-
- /**
- * 创建时间。
- */
- private Date createTime;
-
- /**
- * 最后修改时间。
- */
- private Date updateTime;
-
/**
* price 范围过滤起始值(>=)。
*/
+ @ApiModelProperty(value = "price 范围过滤起始值(>=)")
private BigDecimal priceStart;
/**
* price 范围过滤结束值(<=)。
*/
+ @ApiModelProperty(value = "price 范围过滤结束值(<=)")
private BigDecimal priceEnd;
/**
* classHour 范围过滤起始值(>=)。
*/
+ @ApiModelProperty(value = "classHour 范围过滤起始值(>=)")
private Integer classHourStart;
/**
* classHour 范围过滤结束值(<=)。
*/
+ @ApiModelProperty(value = "classHour 范围过滤结束值(<=)")
private Integer classHourEnd;
/**
* updateTime 范围过滤起始值(>=)。
*/
+ @ApiModelProperty(value = "updateTime 范围过滤起始值(>=)")
private String updateTimeStart;
/**
* updateTime 范围过滤结束值(<=)。
*/
+ @ApiModelProperty(value = "updateTime 范围过滤结束值(<=)")
private String updateTimeEnd;
}
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/GradeDto.java b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/GradeDto.java
index 36fed0d7..f39cecc3 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/GradeDto.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/GradeDto.java
@@ -2,6 +2,8 @@ package com.orange.demo.courseclassinterface.dto;
import com.orange.demo.common.core.validator.UpdateGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
@@ -12,18 +14,21 @@ import javax.validation.constraints.*;
* @author Jerry
* @date 2020-08-08
*/
+@ApiModel("GradeDto对象")
@Data
public class GradeDto {
/**
* 主键Id。
*/
+ @ApiModelProperty(value = "主键Id", required = true)
@NotNull(message = "数据验证失败，主键Id不能为空！", groups = {UpdateGroup.class})
private Integer gradeId;
/**
* 年级名称。
*/
+ @ApiModelProperty(value = "年级名称", required = true)
@NotBlank(message = "数据验证失败，年级名称不能为空！")
private String gradeName;
}
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/SchoolInfoDto.java b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/SchoolInfoDto.java
index a42aaa9e..fd9afe09 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/SchoolInfoDto.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/SchoolInfoDto.java
@@ -2,41 +2,47 @@ package com.orange.demo.courseclassinterface.dto;
import com.orange.demo.common.core.validator.UpdateGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
-
/**
* SchoolInfoDto对象。
*
* @author Jerry
* @date 2020-08-08
*/
+@ApiModel("SchoolInfoDto对象")
@Data
public class SchoolInfoDto {
/**
* 学校Id。
*/
+ @ApiModelProperty(value = "学校Id", required = true)
@NotNull(message = "数据验证失败，学校Id不能为空！", groups = {UpdateGroup.class})
private Long schoolId;
/**
* 学校名称。
*/
+ @ApiModelProperty(value = "学校名称", required = true)
@NotBlank(message = "数据验证失败，学校名称不能为空！")
private String schoolName;
/**
* 所在省Id。
*/
+ @ApiModelProperty(value = "所在省Id", required = true)
@NotNull(message = "数据验证失败，所在省份不能为空！")
private Long provinceId;
/**
* 所在城市Id。
*/
+ @ApiModelProperty(value = "所在城市Id", required = true)
@NotNull(message = "数据验证失败，所在城市不能为空！")
private Long cityId;
}
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/StudentClassDto.java b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/StudentClassDto.java
index 499318fb..399a242d 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/StudentClassDto.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/StudentClassDto.java
@@ -4,65 +4,62 @@ import com.orange.demo.common.core.validator.UpdateGroup;
import com.orange.demo.common.core.validator.ConstDictRef;
import com.orange.demo.courseclassinterface.constant.ClassLevel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
-import java.util.Date;
-
/**
* StudentClassDto对象。
*
* @author Jerry
* @date 2020-08-08
*/
+@ApiModel("StudentClassDto对象")
@Data
public class StudentClassDto {
/**
* 班级Id。
*/
+ @ApiModelProperty(value = "班级Id", required = true)
@NotNull(message = "数据验证失败，班级Id不能为空！", groups = {UpdateGroup.class})
private Long classId;
/**
* 班级名称。
*/
+ @ApiModelProperty(value = "班级名称", required = true)
@NotBlank(message = "数据验证失败，班级名称不能为空！")
private String className;
/**
* 学校Id。
*/
+ @ApiModelProperty(value = "学校Id", required = true)
@NotNull(message = "数据验证失败，所属校区不能为空！")
private Long schoolId;
/**
* 学生班长Id。
*/
+ @ApiModelProperty(value = "学生班长Id", required = true)
@NotNull(message = "数据验证失败，班长不能为空！")
private Long leaderId;
/**
* 已完成课时数量。
*/
+ @ApiModelProperty(value = "已完成课时数量", required = true)
@NotNull(message = "数据验证失败，已完成课时不能为空！")
private Integer finishClassHour;
/**
* 班级级别(0: 初级班 1: 培优班 2: 冲刺提分班 3: 竞赛班)。
*/
+ @ApiModelProperty(value = "班级级别(0: 初级班 1: 培优班 2: 冲刺提分班 3: 竞赛班)", required = true)
@NotNull(message = "数据验证失败，班级级别不能为空！")
@ConstDictRef(constDictClass = ClassLevel.class, message = "数据验证失败，班级级别为无效值！")
private Integer classLevel;
-
- /**
- * 创建用户。
- */
- private Long createUserId;
-
- /**
- * 班级创建时间。
- */
- private Date createTime;
}
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/StudentDto.java b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/StudentDto.java
index 28dedfcf..5bb9e077 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/StudentDto.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/StudentDto.java
@@ -6,6 +6,8 @@ import com.orange.demo.application.common.constant.Gender;
import com.orange.demo.application.common.constant.ExpLevel;
import com.orange.demo.application.common.constant.StudentStatus;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.*;
@@ -18,48 +20,56 @@ import java.util.Date;
* @author Jerry
* @date 2020-08-08
*/
+@ApiModel("StudentDto对象")
@Data
public class StudentDto {
/**
* 学生Id。
*/
+ @ApiModelProperty(value = "学生Id", required = true)
@NotNull(message = "数据验证失败，学生Id不能为空！", groups = {UpdateGroup.class})
private Long studentId;
/**
* 登录手机。
*/
+ @ApiModelProperty(value = "登录手机", required = true)
@NotBlank(message = "数据验证失败，手机号码不能为空！")
private String loginMobile;
/**
* 学生姓名。
*/
+ @ApiModelProperty(value = "学生姓名", required = true)
@NotBlank(message = "数据验证失败，姓名不能为空！")
private String studentName;
/**
* 所在省份Id。
*/
+ @ApiModelProperty(value = "所在省份Id", required = true)
@NotNull(message = "数据验证失败，所在省份不能为空！")
private Long provinceId;
/**
* 所在城市Id。
*/
+ @ApiModelProperty(value = "所在城市Id", required = true)
@NotNull(message = "数据验证失败，所在城市不能为空！")
private Long cityId;
/**
* 区县Id。
*/
+ @ApiModelProperty(value = "区县Id", required = true)
@NotNull(message = "数据验证失败，所在区县不能为空！")
private Long districtId;
/**
* 学生性别 (0: 女生 1: 男生)。
*/
+ @ApiModelProperty(value = "学生性别 (0: 女生 1: 男生)", required = true)
@NotNull(message = "数据验证失败，性别不能为空！")
@ConstDictRef(constDictClass = Gender.class, message = "数据验证失败，性别为无效值！")
private Integer gender;
@@ -67,12 +77,14 @@ public class StudentDto {
/**
* 生日。
*/
+ @ApiModelProperty(value = "生日", required = true)
@NotNull(message = "数据验证失败，生日不能为空！")
private Date birthday;
/**
* 经验等级 (0: 初级 1: 中级 2: 高级 3: 资深)。
*/
+ @ApiModelProperty(value = "经验等级 (0: 初级 1: 中级 2: 高级 3: 资深)", required = true)
@NotNull(message = "数据验证失败，经验等级不能为空！")
@ConstDictRef(constDictClass = ExpLevel.class, message = "数据验证失败，经验等级为无效值！")
private Integer experienceLevel;
@@ -80,35 +92,35 @@ public class StudentDto {
/**
* 总共充值学币数量。
*/
+ @ApiModelProperty(value = "总共充值学币数量", required = true)
@NotNull(message = "数据验证失败，充值学币不能为空！", groups = {UpdateGroup.class})
private Integer totalCoin;
/**
* 可用学币数量。
*/
+ @ApiModelProperty(value = "可用学币数量", required = true)
@NotNull(message = "数据验证失败，剩余学币不能为空！", groups = {UpdateGroup.class})
private Integer leftCoin;
/**
* 年级Id。
*/
+ @ApiModelProperty(value = "年级Id", required = true)
@NotNull(message = "数据验证失败，年级不能为空！")
private Integer gradeId;
/**
* 校区Id。
*/
+ @ApiModelProperty(value = "校区Id", required = true)
@NotNull(message = "数据验证失败，所属校区不能为空！")
private Long schoolId;
- /**
- * 注册时间。
- */
- private Date registerTime;
-
/**
* 学生状态 (0: 正常 1: 锁定 2: 注销)。
*/
+ @ApiModelProperty(value = "学生状态 (0: 正常 1: 锁定 2: 注销)", required = true)
@NotNull(message = "数据验证失败，状态 不能为空！", groups = {UpdateGroup.class})
@ConstDictRef(constDictClass = StudentStatus.class, message = "数据验证失败，状态 为无效值！")
private Integer status;
@@ -116,25 +128,30 @@ public class StudentDto {
/**
* birthday 范围过滤起始值(>=)。
*/
+ @ApiModelProperty(value = "birthday 范围过滤起始值(>=)")
private String birthdayStart;
/**
* birthday 范围过滤结束值(<=)。
*/
+ @ApiModelProperty(value = "birthday 范围过滤结束值(<=)")
private String birthdayEnd;
/**
* registerTime 范围过滤起始值(>=)。
*/
+ @ApiModelProperty(value = "registerTime 范围过滤起始值(>=)")
private String registerTimeStart;
/**
* registerTime 范围过滤结束值(<=)。
*/
+ @ApiModelProperty(value = "registerTime 范围过滤结束值(<=)")
private String registerTimeEnd;
/**
* true LIKE搜索字符串。
*/
+ @ApiModelProperty(value = "LIKE模糊搜索字符串")
private String searchString;
}
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/AreaCodeVo.java b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/AreaCodeVo.java
index 275bcb2a..cf8f443a 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/AreaCodeVo.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/AreaCodeVo.java
@@ -1,5 +1,7 @@
package com.orange.demo.courseclassinterface.vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -8,26 +10,31 @@ import lombok.Data;
* @author Jerry
* @date 2020-08-08
*/
+@ApiModel("行政区划实体对象VO")
@Data
public class AreaCodeVo {
/**
* 行政区划主键Id
*/
+ @ApiModelProperty(value = "行政区划主键Id", required = true)
private Long areaId;
/**
* 行政区划名称
*/
+ @ApiModelProperty(value = "行政区划名称")
private String areaName;
/**
* 行政区划级别 (1: 省级别 2: 市级别 3: 区级别)
*/
+ @ApiModelProperty(value = "行政区划级别")
private Integer areaLevel;
/**
* 父级行政区划Id
*/
+ @ApiModelProperty(value = "父级行政区划Id")
private Long parentId;
}
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/ClassCourseVo.java b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/ClassCourseVo.java
index 07617396..c1d88e95 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/ClassCourseVo.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/ClassCourseVo.java
@@ -1,5 +1,7 @@
package com.orange.demo.courseclassinterface.vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -8,21 +10,25 @@ import lombok.Data;
* @author Jerry
* @date 2020-08-08
*/
+@ApiModel("ClassCourseVO实体对象")
@Data
public class ClassCourseVo {
/**
* 班级Id。
*/
+ @ApiModelProperty(value = "班级Id")
private Long classId;
/**
* 课程Id。
*/
+ @ApiModelProperty(value = "课程Id")
private Long courseId;
/**
* 课程顺序(数值越小越靠前)。
*/
+ @ApiModelProperty(value = "课程顺序(数值越小越靠前)")
private Integer courseOrder;
}
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/ClassStudentVo.java b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/ClassStudentVo.java
index 27b9cce9..21b9fad1 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/ClassStudentVo.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/ClassStudentVo.java
@@ -1,5 +1,7 @@
package com.orange.demo.courseclassinterface.vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -8,16 +10,19 @@ import lombok.Data;
* @author Jerry
* @date 2020-08-08
*/
+@ApiModel("ClassStudentVO实体对象")
@Data
public class ClassStudentVo {
/**
* 班级Id。
*/
+ @ApiModelProperty(value = "班级Id")
private Long classId;
/**
* 学生Id。
*/
+ @ApiModelProperty(value = "学生Id")
private Long studentId;
}
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/CourseVo.java b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/CourseVo.java
index 5a6d3208..3abd4cf3 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/CourseVo.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/CourseVo.java
@@ -1,5 +1,7 @@
package com.orange.demo.courseclassinterface.vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -12,86 +14,103 @@ import java.util.Map;
* @author Jerry
* @date 2020-08-08
*/
+@ApiModel("CourseVO实体对象")
@Data
public class CourseVo {
/**
* 主键Id。
*/
+ @ApiModelProperty(value = "主键Id")
private Long courseId;
/**
* 课程名称。
*/
+ @ApiModelProperty(value = "课程名称")
private String courseName;
/**
* 课程价格。
*/
+ @ApiModelProperty(value = "课程价格")
private BigDecimal price;
/**
* 课程描述。
*/
+ @ApiModelProperty(value = "课程描述")
private String description;
/**
* 课程难度(0: 容易 1: 普通 2: 很难)。
*/
+ @ApiModelProperty(value = "课程难度(0: 容易 1: 普通 2: 很难)")
private Integer difficulty;
/**
* 年级Id。
*/
+ @ApiModelProperty(value = "年级Id")
private Integer gradeId;
/**
* 学科Id。
*/
+ @ApiModelProperty(value = "学科Id")
private Integer subjectId;
/**
* 课时数量。
*/
+ @ApiModelProperty(value = "课时数量")
private Integer classHour;
/**
* 多张课程图片地址。
*/
+ @ApiModelProperty(value = "多张课程图片地址")
private String pictureUrl;
/**
* 创建用户Id。
*/
+ @ApiModelProperty(value = "创建用户Id")
private Long createUserId;
/**
* 创建时间。
*/
+ @ApiModelProperty(value = "创建时间")
private Date createTime;
/**
* 最后修改时间。
*/
+ @ApiModelProperty(value = "最后修改时间")
private Date updateTime;
/**
* courseId 的多对多关联表数据对象，数据对应类型为ClassCourseVo。
*/
+ @ApiModelProperty(value = "courseId 的多对多关联表数据对象，数据对应类型为ClassCourseVo")
private Map classCourse;
/**
* gradeId 字典关联数据。
*/
+ @ApiModelProperty(value = "gradeId 字典关联数据")
private Map gradeIdDictMap;
/**
* difficulty 常量字典关联数据。
*/
+ @ApiModelProperty(value = "difficulty 常量字典关联数据")
private Map difficultyDictMap;
/**
* subjectId 常量字典关联数据。
*/
+ @ApiModelProperty(value = "subjectId 常量字典关联数据")
private Map subjectIdDictMap;
}
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/GradeVo.java b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/GradeVo.java
index 42b57aca..cd76e999 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/GradeVo.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/GradeVo.java
@@ -1,5 +1,7 @@
package com.orange.demo.courseclassinterface.vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -8,16 +10,19 @@ import lombok.Data;
* @author Jerry
* @date 2020-08-08
*/
+@ApiModel("GradeVO实体对象")
@Data
public class GradeVo {
/**
* 主键Id。
*/
+ @ApiModelProperty(value = "主键Id")
private Integer gradeId;
/**
* 年级名称。
*/
+ @ApiModelProperty(value = "年级名称")
private String gradeName;
}
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/SchoolInfoVo.java b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/SchoolInfoVo.java
index 3dbbd71d..851c2ce4 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/SchoolInfoVo.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/SchoolInfoVo.java
@@ -1,5 +1,7 @@
package com.orange.demo.courseclassinterface.vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Map;
@@ -10,36 +12,43 @@ import java.util.Map;
* @author Jerry
* @date 2020-08-08
*/
+@ApiModel("SchoolInfoVO实体对象")
@Data
public class SchoolInfoVo {
/**
* 学校Id。
*/
+ @ApiModelProperty(value = "学校Id")
private Long schoolId;
/**
* 学校名称。
*/
+ @ApiModelProperty(value = "学校名称")
private String schoolName;
/**
* 所在省Id。
*/
+ @ApiModelProperty(value = "所在省Id")
private Long provinceId;
/**
* 所在城市Id。
*/
+ @ApiModelProperty(value = "所在城市Id")
private Long cityId;
/**
* provinceId 字典关联数据。
*/
+ @ApiModelProperty(value = "provinceId 字典关联数据")
private Map provinceIdDictMap;
/**
* cityId 字典关联数据。
*/
+ @ApiModelProperty(value = "cityId 字典关联数据")
private Map cityIdDictMap;
}
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/StudentClassVo.java b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/StudentClassVo.java
index 737ce628..8710516f 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/StudentClassVo.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/StudentClassVo.java
@@ -1,5 +1,7 @@
package com.orange.demo.courseclassinterface.vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@@ -11,61 +13,73 @@ import java.util.Map;
* @author Jerry
* @date 2020-08-08
*/
+@ApiModel("StudentClassVO实体对象")
@Data
public class StudentClassVo {
/**
* 班级Id。
*/
+ @ApiModelProperty(value = "班级Id")
private Long classId;
/**
* 班级名称。
*/
+ @ApiModelProperty(value = "班级名称")
private String className;
/**
* 学校Id。
*/
+ @ApiModelProperty(value = "学校Id")
private Long schoolId;
/**
* 学生班长Id。
*/
+ @ApiModelProperty(value = "学生班长Id")
private Long leaderId;
/**
* 已完成课时数量。
*/
+ @ApiModelProperty(value = "已完成课时数量")
private Integer finishClassHour;
/**
* 班级级别(0: 初级班 1: 培优班 2: 冲刺提分班 3: 竞赛班)。
*/
+ @ApiModelProperty(value = "班级级别(0: 初级班 1: 培优班 2: 冲刺提分班 3: 竞赛班)")
private Integer classLevel;
/**
* 创建用户。
*/
+ @ApiModelProperty(value = "创建用户")
private Long createUserId;
/**
* 班级创建时间。
*/
+ @ApiModelProperty(value = "班级创建时间")
private Date createTime;
/**
* schoolId 字典关联数据。
*/
+ @ApiModelProperty(value = "schoolId 字典关联数据")
private Map schoolIdDictMap;
/**
* leaderId 字典关联数据。
*/
+ @ApiModelProperty(value = "leaderId 字典关联数据")
private Map leaderIdDictMap;
/**
* classLevel 常量字典关联数据。
*/
+ @ApiModelProperty(value = "classLevel 常量字典关联数据")
private Map classLevelDictMap;
}
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/StudentVo.java b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/StudentVo.java
index 5981354f..f348fa3e 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/StudentVo.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/StudentVo.java
@@ -1,5 +1,7 @@
package com.orange.demo.courseclassinterface.vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@@ -11,121 +13,145 @@ import java.util.Map;
* @author Jerry
* @date 2020-08-08
*/
+@ApiModel("StudentVO实体对象")
@Data
public class StudentVo {
/**
* 学生Id。
*/
+ @ApiModelProperty(value = "学生Id")
private Long studentId;
/**
* 登录手机。
*/
+ @ApiModelProperty(value = "登录手机")
private String loginMobile;
/**
* 学生姓名。
*/
+ @ApiModelProperty(value = "学生姓名")
private String studentName;
/**
* 所在省份Id。
*/
+ @ApiModelProperty(value = "所在省份Id")
private Long provinceId;
/**
* 所在城市Id。
*/
+ @ApiModelProperty(value = "所在城市Id")
private Long cityId;
/**
* 区县Id。
*/
+ @ApiModelProperty(value = "区县Id")
private Long districtId;
/**
* 学生性别 (0: 女生 1: 男生)。
*/
+ @ApiModelProperty(value = "学生性别 (0: 女生 1: 男生)")
private Integer gender;
/**
* 生日。
*/
+ @ApiModelProperty(value = "生日")
private Date birthday;
/**
* 经验等级 (0: 初级 1: 中级 2: 高级 3: 资深)。
*/
+ @ApiModelProperty(value = "经验等级 (0: 初级 1: 中级 2: 高级 3: 资深)")
private Integer experienceLevel;
/**
* 总共充值学币数量。
*/
+ @ApiModelProperty(value = "总共充值学币数量")
private Integer totalCoin;
/**
* 可用学币数量。
*/
+ @ApiModelProperty(value = "可用学币数量")
private Integer leftCoin;
/**
* 年级Id。
*/
+ @ApiModelProperty(value = "年级Id")
private Integer gradeId;
/**
* 校区Id。
*/
+ @ApiModelProperty(value = "校区Id")
private Long schoolId;
/**
* 注册时间。
*/
+ @ApiModelProperty(value = "注册时间")
private Date registerTime;
/**
* 学生状态 (0: 正常 1: 锁定 2: 注销)。
*/
+ @ApiModelProperty(value = "学生状态 (0: 正常 1: 锁定 2: 注销)")
private Integer status;
/**
* provinceId 字典关联数据。
*/
+ @ApiModelProperty(value = "provinceId 字典关联数据")
private Map provinceIdDictMap;
/**
* cityId 字典关联数据。
*/
+ @ApiModelProperty(value = "cityId 字典关联数据")
private Map cityIdDictMap;
/**
* districtId 字典关联数据。
*/
+ @ApiModelProperty(value = "districtId 字典关联数据")
private Map districtIdDictMap;
/**
* gradeId 字典关联数据。
*/
+ @ApiModelProperty(value = "gradeId 字典关联数据")
private Map gradeIdDictMap;
/**
* schoolId 字典关联数据。
*/
+ @ApiModelProperty(value = "schoolId 字典关联数据")
private Map schoolIdDictMap;
/**
* gender 常量字典关联数据。
*/
+ @ApiModelProperty(value = "gender 常量字典关联数据")
private Map genderDictMap;
/**
* experienceLevel 常量字典关联数据。
*/
+ @ApiModelProperty(value = "experienceLevel 常量字典关联数据")
private Map experienceLevelDictMap;
/**
* status 常量字典关联数据。
*/
+ @ApiModelProperty(value = "status 常量字典关联数据")
private Map statusDictMap;
}
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-service/course-class-service.iml b/orange-demo-multi-service-for-app/application/course-class/course-class-service/course-class-service.iml
index 998afcc9..b5008a7c 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-service/course-class-service.iml
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-service/course-class-service.iml
@@ -83,12 +83,29 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/AreaCodeController.java b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/AreaCodeController.java
index 9a778716..b66e0ade 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/AreaCodeController.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/AreaCodeController.java
@@ -1,8 +1,9 @@
package com.orange.demo.courseclassservice.controller;
+import io.swagger.annotations.Api;
import cn.jimmyshi.beanquery.BeanQuery;
import com.orange.demo.common.core.base.controller.BaseController;
-import com.orange.demo.common.core.base.service.BaseService;
+import com.orange.demo.common.core.base.service.IBaseDictService;
import com.orange.demo.common.core.util.MyModelUtil;
import com.orange.demo.common.core.object.*;
import com.orange.demo.courseclassinterface.vo.AreaCodeVo;
@@ -20,6 +21,7 @@ import java.util.*;
* @author Jerry
* @date 2020-08-08
*/
+@Api(tags = "行政区划数据访问接口")
@RestController
@RequestMapping("/areaCode")
public class AreaCodeController extends BaseController {
@@ -28,7 +30,7 @@ public class AreaCodeController extends BaseController service() {
+ protected IBaseDictService service() {
return areaCodeService;
}
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/CourseController.java b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/CourseController.java
index d64775de..d8a88e8b 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/CourseController.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/CourseController.java
@@ -15,11 +15,13 @@ import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.*;
import com.orange.demo.common.core.constant.*;
import com.orange.demo.common.core.base.controller.BaseController;
-import com.orange.demo.common.core.base.service.BaseService;
+import com.orange.demo.common.core.base.service.IBaseService;
import com.orange.demo.common.core.annotation.MyRequestBody;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.orange.demo.common.redis.cache.SessionCacheHelper;
import com.orange.demo.courseclassservice.config.ApplicationConfig;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -35,6 +37,7 @@ import java.util.*;
* @author Jerry
* @date 2020-08-08
*/
+@Api(tags = "课程数据管理接口")
@Slf4j
@RestController
@RequestMapping("/course")
@@ -50,7 +53,7 @@ public class CourseController extends BaseController {
private UpDownloaderFactory upDownloaderFactory;
@Override
- protected BaseService service() {
+ protected IBaseService service() {
return courseService;
}
@@ -60,6 +63,14 @@ public class CourseController extends BaseController {
* @param courseDto 新增对象。
* @return 应答结果对象，包含新增对象主键Id。
*/
+ @ApiOperationSupport(ignoreParameters = {
+ "course.courseId",
+ "course.priceStart",
+ "course.priceEnd",
+ "course.classHourStart",
+ "course.classHourEnd",
+ "course.updateTimeStart",
+ "course.updateTimeEnd"})
@PostMapping("/add")
public ResponseResult add(@MyRequestBody("course") CourseDto courseDto) {
String errorMessage = MyCommonUtil.getModelValidationError(courseDto);
@@ -83,6 +94,13 @@ public class CourseController extends BaseController {
* @param courseDto 更新对象。
* @return 应答结果对象。
*/
+ @ApiOperationSupport(ignoreParameters = {
+ "course.priceStart",
+ "course.priceEnd",
+ "course.classHourStart",
+ "course.classHourEnd",
+ "course.updateTimeStart",
+ "course.updateTimeEnd"})
@PostMapping("/update")
public ResponseResult update(@MyRequestBody("course") CourseDto courseDto) {
String errorMessage = MyCommonUtil.getModelValidationError(courseDto, Default.class, UpdateGroup.class);
@@ -279,7 +297,7 @@ public class CourseController extends BaseController {
*/
@GetMapping("/listDict")
public ResponseResult>> listDict(Course filter) {
- List resultList = courseService.getListByFilter(filter, null);
+ List resultList = courseService.getListByFilter(filter);
return ResponseResult.success(
BeanQuery.select("courseId as id", "courseName as name").executeFrom(resultList));
}
@@ -291,6 +309,7 @@ public class CourseController extends BaseController {
* @param withDict 是否包含字典关联。
* @return 应答结果对象，包含主对象集合。
*/
+ @ApiOperation(hidden = true, value = "listByIds")
@PostMapping("/listByIds")
public ResponseResult> listByIds(
@RequestParam Set courseIds, @RequestParam Boolean withDict) {
@@ -304,6 +323,7 @@ public class CourseController extends BaseController {
* @param withDict 是否包含字典关联。
* @return 应答结果对象，包含主对象数据。
*/
+ @ApiOperation(hidden = true, value = "getById")
@PostMapping("/getById")
public ResponseResult getById(
@RequestParam Long courseId, @RequestParam Boolean withDict) {
@@ -316,6 +336,7 @@ public class CourseController extends BaseController {
* @param courseIds 主键Id集合。
* @return 应答结果对象，包含true全部存在，否则false。
*/
+ @ApiOperation(hidden = true, value = "existIds")
@PostMapping("/existIds")
public ResponseResult existIds(@RequestParam Set courseIds) {
return super.baseExistIds(courseIds);
@@ -327,6 +348,7 @@ public class CourseController extends BaseController {
* @param courseId 主键Id。
* @return 应答结果对象，包含true表示存在，否则false。
*/
+ @ApiOperation(hidden = true, value = "existId")
@PostMapping("/existId")
public ResponseResult existId(@RequestParam Long courseId) {
return super.baseExistId(courseId);
@@ -338,6 +360,7 @@ public class CourseController extends BaseController {
* @param filter 过滤对象。
* @return 删除数量。
*/
+ @ApiOperation(hidden = true, value = "deleteBy")
@PostMapping("/deleteBy")
public ResponseResult deleteBy(@RequestBody CourseDto filter) throws Exception {
return super.baseDeleteBy(MyModelUtil.copyTo(filter, Course.class));
@@ -349,6 +372,7 @@ public class CourseController extends BaseController {
* @param queryParam 查询参数。
* @return 分页数据集合对象。如MyQueryParam参数的分页属性为空，则不会执行分页操作，只是基于MyPageData对象返回数据结果。
*/
+ @ApiOperation(hidden = true, value = "listBy")
@PostMapping("/listBy")
public ResponseResult> listBy(@RequestBody MyQueryParam queryParam) {
return super.baseListBy(queryParam, Course.INSTANCE);
@@ -360,6 +384,7 @@ public class CourseController extends BaseController {
* @param queryParam 查询参数。
* @return 分页数据集合对象。如MyQueryParam参数的分页属性为空，则不会执行分页操作，只是基于MyPageData对象返回数据结果。
*/
+ @ApiOperation(hidden = true, value = "listMapBy")
@PostMapping("/listMapBy")
public ResponseResult>> listMapBy(@RequestBody MyQueryParam queryParam) {
return super.baseListMapBy(queryParam, Course.INSTANCE);
@@ -371,6 +396,7 @@ public class CourseController extends BaseController {
* @param queryParam 查询参数。
* @return 应答结果对象，包含符合查询过滤条件的对象结果集。
*/
+ @ApiOperation(hidden = true, value = "getBy")
@PostMapping("/getBy")
public ResponseResult getBy(@RequestBody MyQueryParam queryParam) {
return super.baseGetBy(queryParam, Course.INSTANCE);
@@ -382,6 +408,7 @@ public class CourseController extends BaseController {
* @param queryParam 查询参数。
* @return 应答结果对象，包含结果数量。
*/
+ @ApiOperation(hidden = true, value = "countBy")
@PostMapping("/countBy")
public ResponseResult countBy(@RequestBody MyQueryParam queryParam) {
return super.baseCountBy(queryParam);
@@ -393,6 +420,7 @@ public class CourseController extends BaseController {
* @param aggregationParam 聚合参数。
* @return 应该结果对象，包含聚合计算后的分组Map列表。
*/
+ @ApiOperation(hidden = true, value = "aggregateBy")
@PostMapping("/aggregateBy")
public ResponseResult>> aggregateBy(@RequestBody MyAggregationParam aggregationParam) {
return super.baseAggregateBy(aggregationParam);
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/GradeController.java b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/GradeController.java
index d0ebc95a..706dc4e7 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/GradeController.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/GradeController.java
@@ -1,9 +1,13 @@
package com.orange.demo.courseclassservice.controller;
+import com.alibaba.fastjson.JSONObject;
import cn.jimmyshi.beanquery.BeanQuery;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import com.orange.demo.common.core.base.controller.BaseController;
-import com.orange.demo.common.core.base.service.BaseDictService;
+import com.orange.demo.common.core.base.service.IBaseDictService;
import com.orange.demo.common.core.constant.ErrorCodeEnum;
import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.MyModelUtil;
@@ -26,6 +30,7 @@ import java.util.*;
* @author Jerry
* @date 2020-08-08
*/
+@Api(tags = "年级管理接口")
@Slf4j
@RestController
@RequestMapping("/grade")
@@ -35,7 +40,7 @@ public class GradeController extends BaseController {
private GradeService gradeService;
@Override
- protected BaseDictService service() {
+ protected IBaseDictService service() {
return gradeService;
}
@@ -45,6 +50,7 @@ public class GradeController extends BaseController {
* @param gradeDto 新增对象。
* @return 应答结果对象，包含新增对象主键Id。
*/
+ @ApiOperationSupport(ignoreParameters = {"grade.gradeId"})
@PostMapping("/add")
public ResponseResult add(@MyRequestBody("grade") GradeDto gradeDto) {
String errorMessage = MyCommonUtil.getModelValidationError(gradeDto);
@@ -116,18 +122,34 @@ public class GradeController extends BaseController {
}
/**
- * 以字典形式返回全部年级数据集合。
- * 白名单接口，登录用户均可访问。
+ * 白名单接口，登录用户均可访问。以字典形式返回全部年级数据集合。
+ * 所有数据全部取自于缓存，对于数据库中存在，但是缓存中不存在的数据，不会返回。
*
* @return 应答结果对象，包含字典形式的数据集合。
*/
@GetMapping("/listDict")
public ResponseResult>> listDict() {
- List resultList = gradeService.getAllList();
+ List resultList = gradeService.getAllListFromCache();
return ResponseResult.success(BeanQuery.select(
"gradeId as id", "gradeName as name").executeFrom(resultList));
}
+ /**
+ * 白名单接口，登录用户均可访问。以字典形式返回全部年级数据集合。
+ * fullResultList中的字典列表全部取自于数据库，而cachedResultList全部取自于缓存，前端负责比对。
+ *
+ * @return 应答结果对象，包含字典形式的数据集合。
+ */
+ @GetMapping("/listAll")
+ public ResponseResult listAll() {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("fullResultList", BeanQuery.select(
+ "gradeId as id", "gradeName as name").executeFrom(gradeService.getAllList()));
+ jsonObject.put("cachedResultList", BeanQuery.select(
+ "gradeId as id", "gradeName as name").executeFrom(gradeService.getAllListFromCache()));
+ return ResponseResult.success(jsonObject);
+ }
+
/**
* 根据主键Id集合，获取数据对象集合。仅限于微服务间远程接口调用。
*
@@ -135,6 +157,7 @@ public class GradeController extends BaseController {
* @param withDict 是否包含字典关联。
* @return 应答结果对象，包含主对象集合。
*/
+ @ApiOperation(hidden = true, value = "listByIds")
@PostMapping("/listByIds")
public ResponseResult> listByIds(
@RequestParam Set gradeIds, @RequestParam Boolean withDict) {
@@ -148,6 +171,7 @@ public class GradeController extends BaseController {
* @param withDict 是否包含字典关联。
* @return 应答结果对象，包含主对象数据。
*/
+ @ApiOperation(hidden = true, value = "getById")
@PostMapping("/getById")
public ResponseResult getById(
@RequestParam Integer gradeId, @RequestParam Boolean withDict) {
@@ -160,6 +184,7 @@ public class GradeController extends BaseController {
* @param gradeIds 主键Id集合。
* @return 应答结果对象，包含true全部存在，否则false。
*/
+ @ApiOperation(hidden = true, value = "existIds")
@PostMapping("/existIds")
public ResponseResult existIds(@RequestParam Set gradeIds) {
return super.baseExistIds(gradeIds);
@@ -171,6 +196,7 @@ public class GradeController extends BaseController {
* @param gradeId 主键Id。
* @return 应答结果对象，包含true全部存在，否则false。
*/
+ @ApiOperation(hidden = true, value = "existId")
@PostMapping("/existId")
public ResponseResult existId(@RequestParam Integer gradeId) {
return super.baseExistId(gradeId);
@@ -182,6 +208,7 @@ public class GradeController extends BaseController {
* @param filter 过滤对象。
* @return 删除数量。
*/
+ @ApiOperation(hidden = true, value = "deleteBy")
@PostMapping("/deleteBy")
public ResponseResult deleteBy(@RequestBody GradeDto filter) throws Exception {
return super.baseDeleteBy(MyModelUtil.copyTo(filter, Grade.class));
@@ -193,6 +220,7 @@ public class GradeController extends BaseController {
* @param queryParam 查询参数。
* @return 应答结果对象，包含符合查询过滤条件的对象结果集。
*/
+ @ApiOperation(hidden = true, value = "listBy")
@PostMapping("/listBy")
public ResponseResult> listBy(@RequestBody MyQueryParam queryParam) {
return super.baseListBy(queryParam, null);
@@ -204,6 +232,7 @@ public class GradeController extends BaseController {
* @param queryParam 查询参数。
* @return 应答结果对象，包含符合查询过滤条件的对象结果集。
*/
+ @ApiOperation(hidden = true, value = "getBy")
@PostMapping("/getBy")
public ResponseResult getBy(@RequestBody MyQueryParam queryParam) {
return super.baseGetBy(queryParam, null);
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/SchoolInfoController.java b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/SchoolInfoController.java
index 4003e1bb..55aefabe 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/SchoolInfoController.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/SchoolInfoController.java
@@ -10,9 +10,11 @@ import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.*;
import com.orange.demo.common.core.constant.*;
import com.orange.demo.common.core.base.controller.BaseController;
-import com.orange.demo.common.core.base.service.BaseService;
+import com.orange.demo.common.core.base.service.IBaseService;
import com.orange.demo.common.core.annotation.MyRequestBody;
import com.orange.demo.common.core.validator.UpdateGroup;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -26,6 +28,7 @@ import java.util.*;
* @author Jerry
* @date 2020-08-08
*/
+@Api(tags = "校区数据管理接口")
@Slf4j
@RestController
@RequestMapping("/schoolInfo")
@@ -35,7 +38,7 @@ public class SchoolInfoController extends BaseController service() {
+ protected IBaseService service() {
return schoolInfoService;
}
@@ -45,6 +48,7 @@ public class SchoolInfoController extends BaseController add(@MyRequestBody("schoolInfo") SchoolInfoDto schoolInfoDto) {
String errorMessage = MyCommonUtil.getModelValidationError(schoolInfoDto);
@@ -171,7 +175,7 @@ public class SchoolInfoController extends BaseController>> listDict(SchoolInfo filter) {
- List resultList = schoolInfoService.getListByFilter(filter, null);
+ List resultList = schoolInfoService.getListByFilter(filter);
return ResponseResult.success(
BeanQuery.select("schoolId as id", "schoolName as name").executeFrom(resultList));
}
@@ -183,6 +187,7 @@ public class SchoolInfoController extends BaseController> listByIds(
@RequestParam Set schoolIds, @RequestParam Boolean withDict) {
@@ -196,6 +201,7 @@ public class SchoolInfoController extends BaseController getById(
@RequestParam Long schoolId, @RequestParam Boolean withDict) {
@@ -208,6 +214,7 @@ public class SchoolInfoController extends BaseController existIds(@RequestParam Set schoolIds) {
return super.baseExistIds(schoolIds);
@@ -219,6 +226,7 @@ public class SchoolInfoController extends BaseController existId(@RequestParam Long schoolId) {
return super.baseExistId(schoolId);
@@ -230,6 +238,7 @@ public class SchoolInfoController extends BaseController deleteBy(@RequestBody SchoolInfoDto filter) throws Exception {
return super.baseDeleteBy(MyModelUtil.copyTo(filter, SchoolInfo.class));
@@ -241,6 +250,7 @@ public class SchoolInfoController extends BaseController> listBy(@RequestBody MyQueryParam queryParam) {
return super.baseListBy(queryParam, SchoolInfo.INSTANCE);
@@ -252,6 +262,7 @@ public class SchoolInfoController extends BaseController>> listMapBy(@RequestBody MyQueryParam queryParam) {
return super.baseListMapBy(queryParam, SchoolInfo.INSTANCE);
@@ -263,6 +274,7 @@ public class SchoolInfoController extends BaseController getBy(@RequestBody MyQueryParam queryParam) {
return super.baseGetBy(queryParam, SchoolInfo.INSTANCE);
@@ -274,6 +286,7 @@ public class SchoolInfoController extends BaseController countBy(@RequestBody MyQueryParam queryParam) {
return super.baseCountBy(queryParam);
@@ -285,6 +298,7 @@ public class SchoolInfoController extends BaseController>> aggregateBy(@RequestBody MyAggregationParam aggregationParam) {
return super.baseAggregateBy(aggregationParam);
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/StudentClassController.java b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/StudentClassController.java
index 02a5f1f3..d19763c7 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/StudentClassController.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/StudentClassController.java
@@ -9,9 +9,11 @@ import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.*;
import com.orange.demo.common.core.constant.*;
import com.orange.demo.common.core.base.controller.BaseController;
-import com.orange.demo.common.core.base.service.BaseService;
+import com.orange.demo.common.core.base.service.IBaseService;
import com.orange.demo.common.core.annotation.MyRequestBody;
import com.orange.demo.common.core.validator.UpdateGroup;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -26,6 +28,7 @@ import java.util.stream.Collectors;
* @author Jerry
* @date 2020-08-08
*/
+@Api(tags = "班级数据管理接口")
@Slf4j
@RestController
@RequestMapping("/studentClass")
@@ -39,7 +42,7 @@ public class StudentClassController extends BaseController service() {
+ protected IBaseService service() {
return studentClassService;
}
@@ -49,6 +52,7 @@ public class StudentClassController extends BaseController add(@MyRequestBody("studentClass") StudentClassDto studentClassDto) {
String errorMessage = MyCommonUtil.getModelValidationError(studentClassDto);
@@ -182,11 +186,9 @@ public class StudentClassController extends BaseController verifyResult = this.doClassCourseVerify(classId);
+ if (!verifyResult.isSuccess()) {
+ return ResponseResult.errorFrom(verifyResult);
}
if (pageParam != null) {
PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
@@ -213,11 +215,9 @@ public class StudentClassController extends BaseController verifyResult = this.doClassCourseVerify(classId);
+ if (!verifyResult.isSuccess()) {
+ return ResponseResult.errorFrom(verifyResult);
}
if (pageParam != null) {
PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
@@ -229,6 +229,16 @@ public class StudentClassController extends BaseController doClassCourseVerify(Long classId) {
+ if (MyCommonUtil.existBlankArgument(classId)) {
+ return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
+ }
+ if (!studentClassService.existId(classId)) {
+ return ResponseResult.error(ErrorCodeEnum.INVALID_RELATED_RECORD_ID);
+ }
+ return ResponseResult.success();
+ }
+
/**
* 批量添加班级数据和 [课程数据] 对象的多对多关联关系数据。
*
@@ -337,11 +347,9 @@ public class StudentClassController extends BaseController verifyResult = this.doClassStudentVerify(classId);
+ if (!verifyResult.isSuccess()) {
+ return ResponseResult.errorFrom(verifyResult);
}
if (pageParam != null) {
PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
@@ -368,11 +376,9 @@ public class StudentClassController extends BaseController verifyResult = this.doClassStudentVerify(classId);
+ if (!verifyResult.isSuccess()) {
+ return ResponseResult.errorFrom(verifyResult);
}
if (pageParam != null) {
PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
@@ -384,6 +390,16 @@ public class StudentClassController extends BaseController doClassStudentVerify(Long classId) {
+ if (MyCommonUtil.existBlankArgument(classId)) {
+ return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
+ }
+ if (!studentClassService.existId(classId)) {
+ return ResponseResult.error(ErrorCodeEnum.INVALID_RELATED_RECORD_ID);
+ }
+ return ResponseResult.success();
+ }
+
/**
* 批量添加班级数据和 [学生数据] 对象的多对多关联关系数据。
*
@@ -442,6 +458,7 @@ public class StudentClassController extends BaseController> listByIds(
@RequestParam Set classIds, @RequestParam Boolean withDict) {
@@ -455,6 +472,7 @@ public class StudentClassController extends BaseController getById(
@RequestParam Long classId, @RequestParam Boolean withDict) {
@@ -467,6 +485,7 @@ public class StudentClassController extends BaseController existIds(@RequestParam Set classIds) {
return super.baseExistIds(classIds);
@@ -478,6 +497,7 @@ public class StudentClassController extends BaseController existId(@RequestParam Long classId) {
return super.baseExistId(classId);
@@ -489,6 +509,7 @@ public class StudentClassController extends BaseController deleteBy(@RequestBody StudentClassDto filter) throws Exception {
return super.baseDeleteBy(MyModelUtil.copyTo(filter, StudentClass.class));
@@ -500,6 +521,7 @@ public class StudentClassController extends BaseController> listBy(@RequestBody MyQueryParam queryParam) {
return super.baseListBy(queryParam, StudentClass.INSTANCE);
@@ -511,6 +533,7 @@ public class StudentClassController extends BaseController>> listMapBy(@RequestBody MyQueryParam queryParam) {
return super.baseListMapBy(queryParam, StudentClass.INSTANCE);
@@ -522,6 +545,7 @@ public class StudentClassController extends BaseController getBy(@RequestBody MyQueryParam queryParam) {
return super.baseGetBy(queryParam, StudentClass.INSTANCE);
@@ -533,6 +557,7 @@ public class StudentClassController extends BaseController countBy(@RequestBody MyQueryParam queryParam) {
return super.baseCountBy(queryParam);
@@ -544,6 +569,7 @@ public class StudentClassController extends BaseController>> aggregateBy(@RequestBody MyAggregationParam aggregationParam) {
return super.baseAggregateBy(aggregationParam);
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/StudentController.java b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/StudentController.java
index e3db1bfb..a87f1c03 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/StudentController.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/StudentController.java
@@ -10,9 +10,11 @@ import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.*;
import com.orange.demo.common.core.constant.*;
import com.orange.demo.common.core.base.controller.BaseController;
-import com.orange.demo.common.core.base.service.BaseService;
+import com.orange.demo.common.core.base.service.IBaseService;
import com.orange.demo.common.core.annotation.MyRequestBody;
import com.orange.demo.common.core.validator.UpdateGroup;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -26,6 +28,7 @@ import java.util.*;
* @author Jerry
* @date 2020-08-08
*/
+@Api(tags = "学生数据管理接口")
@Slf4j
@RestController
@RequestMapping("/student")
@@ -35,7 +38,7 @@ public class StudentController extends BaseController
private StudentService studentService;
@Override
- protected BaseService service() {
+ protected IBaseService service() {
return studentService;
}
@@ -45,6 +48,13 @@ public class StudentController extends BaseController
* @param studentDto 新增对象。
* @return 应答结果对象，包含新增对象主键Id。
*/
+ @ApiOperationSupport(ignoreParameters = {
+ "student.studentId",
+ "student.searchString",
+ "student.birthdayStart",
+ "student.birthdayEnd",
+ "student.registerTimeStart",
+ "student.registerTimeEnd"})
@PostMapping("/add")
public ResponseResult add(@MyRequestBody("student") StudentDto studentDto) {
String errorMessage = MyCommonUtil.getModelValidationError(studentDto);
@@ -68,6 +78,12 @@ public class StudentController extends BaseController
* @param studentDto 更新对象。
* @return 应答结果对象。
*/
+ @ApiOperationSupport(ignoreParameters = {
+ "student.searchString",
+ "student.birthdayStart",
+ "student.birthdayEnd",
+ "student.registerTimeStart",
+ "student.registerTimeEnd"})
@PostMapping("/update")
public ResponseResult update(@MyRequestBody("student") StudentDto studentDto) {
String errorMessage = MyCommonUtil.getModelValidationError(studentDto, Default.class, UpdateGroup.class);
@@ -171,7 +187,7 @@ public class StudentController extends BaseController
*/
@GetMapping("/listDict")
public ResponseResult>> listDict(Student filter) {
- List resultList = studentService.getListByFilter(filter, null);
+ List resultList = studentService.getListByFilter(filter);
return ResponseResult.success(
BeanQuery.select("studentId as id", "studentName as name").executeFrom(resultList));
}
@@ -183,6 +199,7 @@ public class StudentController extends BaseController
* @param withDict 是否包含字典关联。
* @return 应答结果对象，包含主对象集合。
*/
+ @ApiOperation(hidden = true, value = "listByIds")
@PostMapping("/listByIds")
public ResponseResult> listByIds(
@RequestParam Set studentIds, @RequestParam Boolean withDict) {
@@ -196,6 +213,7 @@ public class StudentController extends BaseController
* @param withDict 是否包含字典关联。
* @return 应答结果对象，包含主对象数据。
*/
+ @ApiOperation(hidden = true, value = "getById")
@PostMapping("/getById")
public ResponseResult getById(
@RequestParam Long studentId, @RequestParam Boolean withDict) {
@@ -208,6 +226,7 @@ public class StudentController extends BaseController
* @param studentIds 主键Id集合。
* @return 应答结果对象，包含true全部存在，否则false。
*/
+ @ApiOperation(hidden = true, value = "existIds")
@PostMapping("/existIds")
public ResponseResult existIds(@RequestParam Set studentIds) {
return super.baseExistIds(studentIds);
@@ -219,6 +238,7 @@ public class StudentController extends BaseController
* @param studentId 主键Id。
* @return 应答结果对象，包含true表示存在，否则false。
*/
+ @ApiOperation(hidden = true, value = "existId")
@PostMapping("/existId")
public ResponseResult existId(@RequestParam Long studentId) {
return super.baseExistId(studentId);
@@ -230,6 +250,7 @@ public class StudentController extends BaseController
* @param filter 过滤对象。
* @return 删除数量。
*/
+ @ApiOperation(hidden = true, value = "deleteBy")
@PostMapping("/deleteBy")
public ResponseResult deleteBy(@RequestBody StudentDto filter) throws Exception {
return super.baseDeleteBy(MyModelUtil.copyTo(filter, Student.class));
@@ -241,6 +262,7 @@ public class StudentController extends BaseController
* @param queryParam 查询参数。
* @return 分页数据集合对象。如MyQueryParam参数的分页属性为空，则不会执行分页操作，只是基于MyPageData对象返回数据结果。
*/
+ @ApiOperation(hidden = true, value = "listBy")
@PostMapping("/listBy")
public ResponseResult> listBy(@RequestBody MyQueryParam queryParam) {
return super.baseListBy(queryParam, Student.INSTANCE);
@@ -252,6 +274,7 @@ public class StudentController extends BaseController
* @param queryParam 查询参数。
* @return 分页数据集合对象。如MyQueryParam参数的分页属性为空，则不会执行分页操作，只是基于MyPageData对象返回数据结果。
*/
+ @ApiOperation(hidden = true, value = "listMapBy")
@PostMapping("/listMapBy")
public ResponseResult>> listMapBy(@RequestBody MyQueryParam queryParam) {
return super.baseListMapBy(queryParam, Student.INSTANCE);
@@ -263,6 +286,7 @@ public class StudentController extends BaseController
* @param queryParam 查询参数。
* @return 应答结果对象，包含符合查询过滤条件的对象结果集。
*/
+ @ApiOperation(hidden = true, value = "getBy")
@PostMapping("/getBy")
public ResponseResult getBy(@RequestBody MyQueryParam queryParam) {
return super.baseGetBy(queryParam, Student.INSTANCE);
@@ -274,6 +298,7 @@ public class StudentController extends BaseController
* @param queryParam 查询参数。
* @return 应答结果对象，包含结果数量。
*/
+ @ApiOperation(hidden = true, value = "countBy")
@PostMapping("/countBy")
public ResponseResult countBy(@RequestBody MyQueryParam queryParam) {
return super.baseCountBy(queryParam);
@@ -285,6 +310,7 @@ public class StudentController extends BaseController
* @param aggregationParam 聚合参数。
* @return 应该结果对象，包含聚合计算后的分组Map列表。
*/
+ @ApiOperation(hidden = true, value = "aggregateBy")
@PostMapping("/aggregateBy")
public ResponseResult>> aggregateBy(@RequestBody MyAggregationParam aggregationParam) {
return super.baseAggregateBy(aggregationParam);
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/AreaCode.java b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/AreaCode.java
index a21cbd6e..561468e8 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/AreaCode.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/AreaCode.java
@@ -38,4 +38,4 @@ public class AreaCode {
*/
@Column(name = "parent_id")
private Long parentId;
-}
\ No newline at end of file
+}
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassCourse.java b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassCourse.java
index 0167d6e3..b34238d6 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassCourse.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassCourse.java
@@ -2,7 +2,6 @@ package com.orange.demo.courseclassservice.model;
import lombok.Data;
import javax.persistence.*;
-import javax.validation.constraints.*;
/**
* ClassCourse实体对象。
@@ -17,7 +16,6 @@ public class ClassCourse {
/**
* 班级Id。
*/
- @NotNull(message = "数据验证失败，班级Id不能为空！")
@Id
@Column(name = "class_id")
private Long classId;
@@ -25,7 +23,6 @@ public class ClassCourse {
/**
* 课程Id。
*/
- @NotNull(message = "数据验证失败，课程Id不能为空！")
@Id
@Column(name = "course_id")
private Long courseId;
@@ -33,7 +30,6 @@ public class ClassCourse {
/**
* 课程顺序(数值越小越靠前)。
*/
- @NotNull(message = "数据验证失败，课程顺序(数值越小越靠前)不能为空！")
@Column(name = "course_order")
private Integer courseOrder;
}
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassStudent.java b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassStudent.java
index d281e925..e3af4e09 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassStudent.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassStudent.java
@@ -2,7 +2,6 @@ package com.orange.demo.courseclassservice.model;
import lombok.Data;
import javax.persistence.*;
-import javax.validation.constraints.*;
/**
* ClassStudent实体对象。
@@ -17,7 +16,6 @@ public class ClassStudent {
/**
* 班级Id。
*/
- @NotNull(message = "数据验证失败，班级Id不能为空！")
@Id
@Column(name = "class_id")
private Long classId;
@@ -25,7 +23,6 @@ public class ClassStudent {
/**
* 学生Id。
*/
- @NotNull(message = "数据验证失败，学生Id不能为空！")
@Id
@Column(name = "student_id")
private Long studentId;
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Course.java b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Course.java
index d14b12a3..a856d236 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Course.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Course.java
@@ -7,13 +7,11 @@ import com.orange.demo.common.core.annotation.UploadFlagColumn;
import com.orange.demo.common.core.annotation.RelationDict;
import com.orange.demo.common.core.annotation.RelationConstDict;
import com.orange.demo.common.core.base.mapper.BaseModelMapper;
-import com.orange.demo.common.core.validator.ConstDictRef;
import com.orange.demo.courseclassinterface.vo.CourseVo;
import lombok.Data;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;
import javax.persistence.*;
-import javax.validation.constraints.*;
import java.math.BigDecimal;
import java.util.Date;
@@ -32,7 +30,6 @@ public class Course {
/**
* 主键Id。
*/
- @NotNull(message = "数据验证失败，主键Id不能为空！")
@Id
@Column(name = "course_id")
private Long courseId;
@@ -40,14 +37,12 @@ public class Course {
/**
* 课程名称。
*/
- @NotBlank(message = "数据验证失败，课程名称不能为空！")
@Column(name = "course_name")
private String courseName;
/**
* 课程价格。
*/
- @NotNull(message = "数据验证失败，课程价格不能为空！")
private BigDecimal price;
/**
@@ -58,29 +53,23 @@ public class Course {
/**
* 课程难度(0: 容易 1: 普通 2: 很难)。
*/
- @NotNull(message = "数据验证失败，课程难度不能为空！")
- @ConstDictRef(constDictClass = CourseDifficult.class, message = "数据验证失败，课程难度为无效值！")
private Integer difficulty;
/**
* 年级Id。
*/
- @NotNull(message = "数据验证失败，所属年级不能为空！")
@Column(name = "grade_id")
private Integer gradeId;
/**
* 学科Id。
*/
- @NotNull(message = "数据验证失败，所属学科不能为空！")
- @ConstDictRef(constDictClass = Subject.class, message = "数据验证失败，所属学科为无效值！")
@Column(name = "subject_id")
private Integer subjectId;
/**
* 课时数量。
*/
- @NotNull(message = "数据验证失败，课时数量不能为空！")
@Column(name = "class_hour")
private Integer classHour;
@@ -88,7 +77,6 @@ public class Course {
* 多张课程图片地址。
*/
@UploadFlagColumn(storeType = UploadStoreTypeEnum.LOCAL_SYSTEM)
- @NotBlank(message = "数据验证失败，课程图片不能为空！")
@Column(name = "picture_url")
private String pictureUrl;
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Grade.java b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Grade.java
index 30de8f4f..f9b9defe 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Grade.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Grade.java
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import lombok.Data;
import javax.persistence.*;
-import javax.validation.constraints.*;
/**
* Grade实体对象。
@@ -19,7 +18,6 @@ public class Grade {
/**
* 主键Id。
*/
- @NotNull(message = "数据验证失败，主键Id不能为空！")
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "grade_id")
@@ -28,7 +26,6 @@ public class Grade {
/**
* 年级名称。
*/
- @NotBlank(message = "数据验证失败，年级名称不能为空！")
@Column(name = "grade_name")
private String gradeName;
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/MaterialEdition.java b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/MaterialEdition.java
index 11c584cd..1a23af88 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/MaterialEdition.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/MaterialEdition.java
@@ -2,7 +2,6 @@ package com.orange.demo.courseclassservice.model;
import lombok.Data;
import javax.persistence.*;
-import javax.validation.constraints.*;
/**
* MaterialEdition实体对象。
@@ -17,7 +16,6 @@ public class MaterialEdition {
/**
* 主键Id。
*/
- @NotNull(message = "数据验证失败，主键Id不能为空！")
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "edition_id")
@@ -26,13 +24,11 @@ public class MaterialEdition {
/**
* 教材版本名称。
*/
- @NotBlank(message = "数据验证失败，教材版本名称不能为空！")
@Column(name = "edition_name")
private String editionName;
/**
* 是否正在使用（0：不是，1：是）。
*/
- @NotNull(message = "数据验证失败，是否正在使用（0：不是，1：是）不能为空！")
private Integer status;
}
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/SchoolInfo.java b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/SchoolInfo.java
index 50b39c77..822cfbe7 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/SchoolInfo.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/SchoolInfo.java
@@ -7,7 +7,6 @@ import lombok.Data;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;
import javax.persistence.*;
-import javax.validation.constraints.*;
import java.util.Map;
@@ -24,7 +23,6 @@ public class SchoolInfo {
/**
* 学校Id。
*/
- @NotNull(message = "数据验证失败，学校Id不能为空！")
@Id
@Column(name = "school_id")
private Long schoolId;
@@ -32,21 +30,18 @@ public class SchoolInfo {
/**
* 学校名称。
*/
- @NotBlank(message = "数据验证失败，学校名称不能为空！")
@Column(name = "school_name")
private String schoolName;
/**
* 所在省Id。
*/
- @NotNull(message = "数据验证失败，所在省份不能为空！")
@Column(name = "province_id")
private Long provinceId;
/**
* 所在城市Id。
*/
- @NotNull(message = "数据验证失败，所在城市不能为空！")
@Column(name = "city_id")
private Long cityId;
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Student.java b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Student.java
index b456e82d..b7e25b68 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Student.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Student.java
@@ -6,13 +6,12 @@ import com.orange.demo.application.common.constant.StudentStatus;
import com.orange.demo.common.core.annotation.RelationDict;
import com.orange.demo.common.core.annotation.RelationConstDict;
import com.orange.demo.common.core.base.mapper.BaseModelMapper;
-import com.orange.demo.common.core.validator.ConstDictRef;
+import com.orange.demo.common.core.util.MyCommonUtil;
import com.orange.demo.courseclassinterface.vo.StudentVo;
import lombok.Data;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;
import javax.persistence.*;
-import javax.validation.constraints.*;
import java.util.Date;
import java.util.Map;
@@ -30,7 +29,6 @@ public class Student {
/**
* 学生Id。
*/
- @NotNull(message = "数据验证失败，学生Id不能为空！")
@Id
@Column(name = "student_id")
private Long studentId;
@@ -38,84 +36,70 @@ public class Student {
/**
* 登录手机。
*/
- @NotBlank(message = "数据验证失败，手机号码不能为空！")
@Column(name = "login_mobile")
private String loginMobile;
/**
* 学生姓名。
*/
- @NotBlank(message = "数据验证失败，姓名不能为空！")
@Column(name = "student_name")
private String studentName;
/**
* 所在省份Id。
*/
- @NotNull(message = "数据验证失败，所在省份不能为空！")
@Column(name = "province_id")
private Long provinceId;
/**
* 所在城市Id。
*/
- @NotNull(message = "数据验证失败，所在城市不能为空！")
@Column(name = "city_id")
private Long cityId;
/**
* 区县Id。
*/
- @NotNull(message = "数据验证失败，所在区县不能为空！")
@Column(name = "district_id")
private Long districtId;
/**
* 学生性别 (0: 女生 1: 男生)。
*/
- @NotNull(message = "数据验证失败，性别不能为空！")
- @ConstDictRef(constDictClass = Gender.class, message = "数据验证失败，性别为无效值！")
private Integer gender;
/**
* 生日。
*/
- @NotNull(message = "数据验证失败，生日不能为空！")
private Date birthday;
/**
* 经验等级 (0: 初级 1: 中级 2: 高级 3: 资深)。
*/
- @NotNull(message = "数据验证失败，经验等级不能为空！")
- @ConstDictRef(constDictClass = ExpLevel.class, message = "数据验证失败，经验等级为无效值！")
@Column(name = "experience_level")
private Integer experienceLevel;
/**
* 总共充值学币数量。
*/
- @NotNull(message = "数据验证失败，充值学币不能为空！")
@Column(name = "total_coin")
private Integer totalCoin;
/**
* 可用学币数量。
*/
- @NotNull(message = "数据验证失败，剩余学币不能为空！")
@Column(name = "left_coin")
private Integer leftCoin;
/**
* 年级Id。
*/
- @NotNull(message = "数据验证失败，年级不能为空！")
@Column(name = "grade_id")
private Integer gradeId;
/**
* 校区Id。
*/
- @NotNull(message = "数据验证失败，所属校区不能为空！")
@Column(name = "school_id")
private Long schoolId;
@@ -128,8 +112,6 @@ public class Student {
/**
* 学生状态 (0: 正常 1: 锁定 2: 注销)。
*/
- @NotNull(message = "数据验证失败，状态 不能为空！")
- @ConstDictRef(constDictClass = StudentStatus.class, message = "数据验证失败，状态 为无效值！")
private Integer status;
/**
@@ -162,6 +144,10 @@ public class Student {
@Transient
private String searchString;
+ public void setSearchString(String searchString) {
+ this.searchString = MyCommonUtil.replaceSqlWildcard(searchString);
+ }
+
@RelationDict(
masterIdField = "provinceId",
slaveServiceName = "areaCodeService",
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/StudentClass.java b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/StudentClass.java
index 6570dc03..74bf30a3 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/StudentClass.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/StudentClass.java
@@ -6,13 +6,11 @@ import com.orange.demo.common.core.annotation.RelationDict;
import com.orange.demo.common.core.annotation.RelationConstDict;
import com.orange.demo.common.core.base.mapper.BaseModelMapper;
import com.orange.demo.common.core.annotation.DeletedFlagColumn;
-import com.orange.demo.common.core.validator.ConstDictRef;
import com.orange.demo.courseclassinterface.vo.StudentClassVo;
import lombok.Data;
import org.mapstruct.*;
import org.mapstruct.factory.Mappers;
import javax.persistence.*;
-import javax.validation.constraints.*;
import java.util.Date;
import java.util.Map;
@@ -30,7 +28,6 @@ public class StudentClass {
/**
* 班级Id。
*/
- @NotNull(message = "数据验证失败，班级Id不能为空！")
@Id
@Column(name = "class_id")
private Long classId;
@@ -38,36 +35,30 @@ public class StudentClass {
/**
* 班级名称。
*/
- @NotBlank(message = "数据验证失败，班级名称不能为空！")
@Column(name = "class_name")
private String className;
/**
* 学校Id。
*/
- @NotNull(message = "数据验证失败，所属校区不能为空！")
@Column(name = "school_id")
private Long schoolId;
/**
* 学生班长Id。
*/
- @NotNull(message = "数据验证失败，班长不能为空！")
@Column(name = "leader_id")
private Long leaderId;
/**
* 已完成课时数量。
*/
- @NotNull(message = "数据验证失败，已完成课时不能为空！")
@Column(name = "finish_class_hour")
private Integer finishClassHour;
/**
* 班级级别(0: 初级班 1: 培优班 2: 冲刺提分班 3: 竞赛班)。
*/
- @NotNull(message = "数据验证失败，班级级别不能为空！")
- @ConstDictRef(constDictClass = ClassLevel.class, message = "数据验证失败，班级级别为无效值！")
@Column(name = "class_level")
private Integer classLevel;
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/AreaCodeService.java b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/AreaCodeService.java
index 6aa17333..701c1cd5 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/AreaCodeService.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/AreaCodeService.java
@@ -1,49 +1,17 @@
package com.orange.demo.courseclassservice.service;
-import com.orange.demo.courseclassservice.dao.AreaCodeMapper;
import com.orange.demo.courseclassservice.model.AreaCode;
-import com.orange.demo.common.core.cache.MapTreeDictionaryCache;
-import com.orange.demo.common.core.base.service.BaseDictService;
-import com.orange.demo.common.core.base.dao.BaseDaoMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import tk.mybatis.mapper.entity.Example;
+import com.orange.demo.common.core.base.service.IBaseDictService;
import java.util.Collection;
-import java.util.List;
/**
- * 行政区划的Service类。
+ * 行政区划的Service接口。
*
* @author Jerry
* @date 2020-08-08
*/
-@Service
-public class AreaCodeService extends BaseDictService {
-
- @Autowired
- private AreaCodeMapper areaCodeMapper;
-
- public AreaCodeService() {
- super();
- this.dictionaryCache = MapTreeDictionaryCache.create(AreaCode::getAreaId, AreaCode::getParentId);
- }
-
- @Override
- protected BaseDaoMapper mapper() {
- return areaCodeMapper;
- }
-
- /**
- * 加载数据库数据到内存缓存。
- */
- @Override
- public void loadCachedData() {
- Example e = new Example(AreaCode.class);
- e.orderBy("areaLevel");
- List areaCodeList = areaCodeMapper.selectByExample(e);
- dictionaryCache.putAll(areaCodeList);
- }
+public interface AreaCodeService extends IBaseDictService {
/**
* 根据上级行政区划Id，获取其下级行政区划列表。
@@ -51,7 +19,5 @@ public class AreaCodeService extends BaseDictService {
* @param parentId 上级行政区划Id。
* @return 下级行政区划列表。
*/
- public Collection getListByParentId(Long parentId) {
- return ((MapTreeDictionaryCache) dictionaryCache).getListByParentId(parentId);
- }
+ Collection getListByParentId(Long parentId);
}
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/CourseService.java b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/CourseService.java
index 4a918da4..50ffa9b1 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/CourseService.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/CourseService.java
@@ -1,48 +1,18 @@
package com.orange.demo.courseclassservice.service;
-import com.orange.demo.courseclassservice.dao.*;
import com.orange.demo.courseclassservice.model.*;
-import com.orange.demo.common.core.util.*;
-import com.orange.demo.common.core.object.MyRelationParam;
import com.orange.demo.common.core.object.CallResult;
-import com.orange.demo.common.core.object.TokenData;
-import com.orange.demo.common.core.object.MyWhereCriteria;
-import com.orange.demo.common.core.base.dao.BaseDaoMapper;
-import com.orange.demo.common.core.base.service.BaseService;
-import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import com.orange.demo.common.core.base.service.IBaseService;
import java.util.*;
/**
- * 课程数据数据操作服务类。
+ * 课程数据数据操作服务接口。
*
* @author Jerry
* @date 2020-08-08
*/
-@Service
-public class CourseService extends BaseService {
-
- @Autowired
- private CourseMapper courseMapper;
- @Autowired
- private ClassCourseMapper classCourseMapper;
- @Autowired
- private GradeService gradeService;
- @Autowired
- private IdGeneratorWrapper idGenerator;
-
- /**
- * 返回当前Service的主表Mapper对象。
- *
- * @return 主表Mapper对象。
- */
- @Override
- protected BaseDaoMapper mapper() {
- return courseMapper;
- }
+public interface CourseService extends IBaseService {
/**
* 保存新增对象。
@@ -50,17 +20,7 @@ public class CourseService extends BaseService {
* @param course 新增对象。
* @return 返回新增对象。
*/
- @Transactional(rollbackFor = Exception.class)
- public Course saveNew(Course course) {
- course.setCourseId(idGenerator.nextLongId());
- TokenData tokenData = TokenData.takeFromRequest();
- course.setCreateUserId(tokenData.getUserId());
- Date now = new Date();
- course.setCreateTime(now);
- course.setUpdateTime(now);
- courseMapper.insert(course);
- return course;
- }
+ Course saveNew(Course course);
/**
* 更新数据对象。
@@ -69,14 +29,7 @@ public class CourseService extends BaseService {
* @param originalCourse 原有数据对象。
* @return 成功返回true，否则false。
*/
- @Transactional(rollbackFor = Exception.class)
- public boolean update(Course course, Course originalCourse) {
- course.setCreateUserId(originalCourse.getCreateUserId());
- course.setCreateTime(originalCourse.getCreateTime());
- course.setUpdateTime(new Date());
- // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
- return courseMapper.updateByPrimaryKey(course) == 1;
- }
+ boolean update(Course course, Course originalCourse);
/**
* 删除指定数据。
@@ -84,19 +37,7 @@ public class CourseService extends BaseService {
* @param courseId 主键Id。
* @return 成功返回true，否则false。
*/
- @Transactional(rollbackFor = Exception.class)
- public boolean remove(Long courseId) {
- // 这里先删除主数据
- if (courseMapper.deleteByPrimaryKey(courseId) == 0) {
- return false;
- }
- // 这里可继续删除关联数据。
- // 开始删除与本地多对多父表的关联
- ClassCourse classCourse = new ClassCourse();
- classCourse.setCourseId(courseId);
- classCourseMapper.delete(classCourse);
- return true;
- }
+ boolean remove(Long courseId);
/**
* 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
@@ -106,9 +47,7 @@ public class CourseService extends BaseService {
* @param orderBy 排序参数。
* @return 查询结果集。
*/
- public List getCourseList(Course filter, String orderBy) {
- return courseMapper.getCourseList(null, null, filter, orderBy);
- }
+ List getCourseList(Course filter, String orderBy);
/**
* 获取主表的查询结果，查询条件中包括主表过滤对象和指定字段的(in list)过滤。
@@ -121,11 +60,7 @@ public class CourseService extends BaseService {
* @param orderBy 排序参数。
* @return 查询结果集。
*/
- public List getCourseList(
- String inFilterField, Set inFilterValues, Course filter, String orderBy) {
- String inFilterColumn = MyModelUtil.mapToColumnName(inFilterField, Course.class);
- return courseMapper.getCourseList(inFilterColumn, inFilterValues, filter, orderBy);
- }
+ List getCourseList(String inFilterField, Set inFilterValues, Course filter, String orderBy);
/**
* 获取主表的查询结果，以及主表关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
@@ -135,12 +70,7 @@ public class CourseService extends BaseService {
* @param orderBy 排序对象。
* @return 查询结果集。
*/
- public List getCourseListWithRelation(Course filter, String orderBy) {
- List resultList = courseMapper.getCourseList(null, null, filter, orderBy);
- Map> criteriaMap = buildAggregationAdditionalWhereCriteria();
- this.buildRelationForDataList(resultList, MyRelationParam.normal(), criteriaMap);
- return resultList;
- }
+ List getCourseListWithRelation(Course filter, String orderBy);
/**
* 获取主表的查询结果，查询条件中包括主表过滤对象和指定字段的(in list)过滤。
@@ -153,13 +83,8 @@ public class CourseService extends BaseService {
* @param orderBy 排序对象。
* @return 查询结果集。
*/
- public List getCourseListWithRelation(
- String inFilterField, Set inFilterValues, Course filter, String orderBy) {
- List resultList =
- courseMapper.getCourseList(inFilterField, inFilterValues, filter, orderBy);
- this.buildRelationForDataList(resultList, MyRelationParam.dictOnly(), null);
- return resultList;
- }
+ List getCourseListWithRelation(
+ String inFilterField, Set inFilterValues, Course filter, String orderBy);
/**
* 在多对多关系中，当前Service的数据表为从表，返回不与指定主表主键Id存在对多对关系的列表。
@@ -169,13 +94,8 @@ public class CourseService extends BaseService {
* @param orderBy 排序参数。
* @return 查询结果集。
*/
- public List getNotInCourseListByClassId(
- Long classId, Course filter, String orderBy) {
- List resultList =
- courseMapper.getNotInCourseListByClassId(classId, filter, orderBy);
- this.buildRelationForDataList(resultList, MyRelationParam.dictOnly(), null);
- return resultList;
- }
+ List getNotInCourseListByClassId(
+ Long classId, Course filter, String orderBy);
/**
* 在多对多关系中，当前Service的数据表为从表，返回与指定主表主键Id存在对多对关系的列表。
@@ -185,13 +105,8 @@ public class CourseService extends BaseService {
* @param orderBy 排序参数。
* @return 查询结果集。
*/
- public List getCourseListByClassId(
- Long classId, Course filter, String orderBy) {
- List resultList =
- courseMapper.getCourseListByClassId(classId, filter, orderBy);
- this.buildRelationForDataList(resultList, MyRelationParam.dictOnly(), null);
- return resultList;
- }
+ List getCourseListByClassId(
+ Long classId, Course filter, String orderBy);
/**
* 根据最新对象和原有对象的数据对比，判断关联的字典数据和多对一主表数据是否都是合法数据。
@@ -200,12 +115,5 @@ public class CourseService extends BaseService {
* @param originalCourse 原有数据对象。
* @return 数据全部正确返回true，否则false，同时返回具体的错误信息。
*/
- public CallResult verifyRelatedData(Course course, Course originalCourse) {
- String errorMessageFormat = "数据验证失败，关联的%s并不存在，请刷新后重试！";
- if (this.needToVerify(course, originalCourse, Course::getGradeId)
- && !gradeService.existId(course.getGradeId())) {
- return CallResult.error(String.format(errorMessageFormat, "所属年级"));
- }
- return CallResult.ok();
- }
+ CallResult verifyRelatedData(Course course, Course originalCourse);
}
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/GradeService.java b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/GradeService.java
index 21a30fa6..1c3bb770 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/GradeService.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/GradeService.java
@@ -1,98 +1,13 @@
package com.orange.demo.courseclassservice.service;
-import com.orange.demo.common.redis.cache.RedisDictionaryCache;
-import com.orange.demo.common.core.base.service.BaseDictService;
-import com.orange.demo.common.core.base.dao.BaseDaoMapper;
-import com.orange.demo.common.core.constant.GlobalDeletedFlag;
-import com.orange.demo.courseclassservice.dao.GradeMapper;
+import com.orange.demo.common.core.base.service.IBaseDictService;
import com.orange.demo.courseclassservice.model.Grade;
-import org.redisson.api.RedissonClient;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.PostConstruct;
/**
- * 年级数据操作服务类。
+ * 年级字典数据操作服务接口。
*
* @author Jerry
* @date 2020-08-08
*/
-@Service
-public class GradeService extends BaseDictService {
-
- @Autowired
- private GradeMapper gradeMapper;
- @Autowired
- private RedissonClient redissonClient;
-
- public GradeService() {
- super();
- }
-
- @PostConstruct
- public void init() {
- this.dictionaryCache = RedisDictionaryCache.create(
- redissonClient, "Grade", Grade.class, Grade::getGradeId);
- }
-
- /**
- * 返回当前Service的主表Mapper对象。
- *
- * @return 主表Mapper对象。
- */
- @Override
- protected BaseDaoMapper mapper() {
- return gradeMapper;
- }
-
- /**
- * 保存新增对象。
- *
- * @param grade 新增对象。
- * @return 返回新增对象。
- */
- @Transactional(rollbackFor = Exception.class)
- public Grade saveNew(Grade grade) {
- grade.setStatus(GlobalDeletedFlag.NORMAL);
- gradeMapper.insert(grade);
- dictionaryCache.put(grade.getGradeId(), grade);
- return grade;
- }
-
- /**
- * 更新数据对象。
- *
- * @param grade 更新的对象。
- * @param originalGrade 原有数据对象。
- * @return 成功返回true，否则false。
- */
- @Transactional(rollbackFor = Exception.class)
- public boolean update(Grade grade, Grade originalGrade) {
- grade.setStatus(GlobalDeletedFlag.NORMAL);
- if (gradeMapper.updateByPrimaryKey(grade) != 1) {
- return false;
- }
- dictionaryCache.put(grade.getGradeId(), grade);
- return true;
- }
-
- /**
- * 删除指定数据。
- *
- * @param gradeId 主键Id。
- * @return 成功返回true，否则false。
- */
- @Transactional(rollbackFor = Exception.class)
- public boolean remove(Integer gradeId) {
- Grade deletedObject = new Grade();
- deletedObject.setGradeId(gradeId);
- deletedObject.setStatus(GlobalDeletedFlag.DELETED);
- if (gradeMapper.updateByPrimaryKeySelective(deletedObject) != 1) {
- return false;
- }
- dictionaryCache.invalidate(gradeId);
- return true;
- }
+public interface GradeService extends IBaseDictService {
}
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/SchoolInfoService.java b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/SchoolInfoService.java
index c87cf7b7..acb85c17 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/SchoolInfoService.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/SchoolInfoService.java
@@ -1,45 +1,18 @@
package com.orange.demo.courseclassservice.service;
-import com.orange.demo.courseclassservice.dao.*;
import com.orange.demo.courseclassservice.model.*;
-import com.orange.demo.common.core.util.*;
-import com.orange.demo.common.core.object.MyRelationParam;
import com.orange.demo.common.core.object.CallResult;
-import com.orange.demo.common.core.object.MyWhereCriteria;
-import com.orange.demo.common.core.base.dao.BaseDaoMapper;
-import com.orange.demo.common.core.base.service.BaseService;
-import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import com.orange.demo.common.core.base.service.IBaseService;
import java.util.*;
/**
- * 校区数据数据操作服务类。
+ * 校区数据数据操作服务接口。
*
* @author Jerry
* @date 2020-08-08
*/
-@Service
-public class SchoolInfoService extends BaseService {
-
- @Autowired
- private SchoolInfoMapper schoolInfoMapper;
- @Autowired
- private AreaCodeService areaCodeService;
- @Autowired
- private IdGeneratorWrapper idGenerator;
-
- /**
- * 返回当前Service的主表Mapper对象。
- *
- * @return 主表Mapper对象。
- */
- @Override
- protected BaseDaoMapper mapper() {
- return schoolInfoMapper;
- }
+public interface SchoolInfoService extends IBaseService {
/**
* 保存新增对象。
@@ -47,12 +20,7 @@ public class SchoolInfoService extends BaseService {
* @param schoolInfo 新增对象。
* @return 返回新增对象。
*/
- @Transactional(rollbackFor = Exception.class)
- public SchoolInfo saveNew(SchoolInfo schoolInfo) {
- schoolInfo.setSchoolId(idGenerator.nextLongId());
- schoolInfoMapper.insert(schoolInfo);
- return schoolInfo;
- }
+ SchoolInfo saveNew(SchoolInfo schoolInfo);
/**
* 更新数据对象。
@@ -61,11 +29,7 @@ public class SchoolInfoService extends BaseService {
* @param originalSchoolInfo 原有数据对象。
* @return 成功返回true，否则false。
*/
- @Transactional(rollbackFor = Exception.class)
- public boolean update(SchoolInfo schoolInfo, SchoolInfo originalSchoolInfo) {
- // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
- return schoolInfoMapper.updateByPrimaryKey(schoolInfo) == 1;
- }
+ boolean update(SchoolInfo schoolInfo, SchoolInfo originalSchoolInfo);
/**
* 删除指定数据。
@@ -73,10 +37,7 @@ public class SchoolInfoService extends BaseService {
* @param schoolId 主键Id。
* @return 成功返回true，否则false。
*/
- @Transactional(rollbackFor = Exception.class)
- public boolean remove(Long schoolId) {
- return schoolInfoMapper.deleteByPrimaryKey(schoolId) != 0;
- }
+ boolean remove(Long schoolId);
/**
* 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
@@ -86,9 +47,7 @@ public class SchoolInfoService extends BaseService {
* @param orderBy 排序参数。
* @return 查询结果集。
*/
- public List getSchoolInfoList(SchoolInfo filter, String orderBy) {
- return schoolInfoMapper.getSchoolInfoList(null, null, filter, orderBy);
- }
+ List getSchoolInfoList(SchoolInfo filter, String orderBy);
/**
* 获取主表的查询结果，查询条件中包括主表过滤对象和指定字段的(in list)过滤。
@@ -101,11 +60,7 @@ public class SchoolInfoService extends BaseService {
* @param orderBy 排序参数。
* @return 查询结果集。
*/
- public List getSchoolInfoList(
- String inFilterField, Set inFilterValues, SchoolInfo filter, String orderBy) {
- String inFilterColumn = MyModelUtil.mapToColumnName(inFilterField, SchoolInfo.class);
- return schoolInfoMapper.getSchoolInfoList(inFilterColumn, inFilterValues, filter, orderBy);
- }
+ List getSchoolInfoList(String inFilterField, Set inFilterValues, SchoolInfo filter, String orderBy);
/**
* 获取主表的查询结果，以及主表关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
@@ -115,12 +70,7 @@ public class SchoolInfoService extends BaseService {
* @param orderBy 排序对象。
* @return 查询结果集。
*/
- public List getSchoolInfoListWithRelation(SchoolInfo filter, String orderBy) {
- List resultList = schoolInfoMapper.getSchoolInfoList(null, null, filter, orderBy);
- Map> criteriaMap = buildAggregationAdditionalWhereCriteria();
- this.buildRelationForDataList(resultList, MyRelationParam.normal(), criteriaMap);
- return resultList;
- }
+ List getSchoolInfoListWithRelation(SchoolInfo filter, String orderBy);
/**
* 获取主表的查询结果，查询条件中包括主表过滤对象和指定字段的(in list)过滤。
@@ -133,13 +83,8 @@ public class SchoolInfoService extends BaseService {
* @param orderBy 排序对象。
* @return 查询结果集。
*/
- public List getSchoolInfoListWithRelation(
- String inFilterField, Set inFilterValues, SchoolInfo filter, String orderBy) {
- List resultList =
- schoolInfoMapper.getSchoolInfoList(inFilterField, inFilterValues, filter, orderBy);
- this.buildRelationForDataList(resultList, MyRelationParam.dictOnly(), null);
- return resultList;
- }
+ List getSchoolInfoListWithRelation(
+ String inFilterField, Set inFilterValues, SchoolInfo filter, String orderBy);
/**
* 根据最新对象和原有对象的数据对比，判断关联的字典数据和多对一主表数据是否都是合法数据。
@@ -148,16 +93,5 @@ public class SchoolInfoService extends BaseService {
* @param originalSchoolInfo 原有数据对象。
* @return 数据全部正确返回true，否则false，同时返回具体的错误信息。
*/
- public CallResult verifyRelatedData(SchoolInfo schoolInfo, SchoolInfo originalSchoolInfo) {
- String errorMessageFormat = "数据验证失败，关联的%s并不存在，请刷新后重试！";
- if (this.needToVerify(schoolInfo, originalSchoolInfo, SchoolInfo::getProvinceId)
- && !areaCodeService.existId(schoolInfo.getProvinceId())) {
- return CallResult.error(String.format(errorMessageFormat, "所在省份"));
- }
- if (this.needToVerify(schoolInfo, originalSchoolInfo, SchoolInfo::getCityId)
- && !areaCodeService.existId(schoolInfo.getCityId())) {
- return CallResult.error(String.format(errorMessageFormat, "所在城市"));
- }
- return CallResult.ok();
- }
+ CallResult verifyRelatedData(SchoolInfo schoolInfo, SchoolInfo originalSchoolInfo);
}
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/StudentClassService.java b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/StudentClassService.java
index 8dc2cd74..6aa0f943 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/StudentClassService.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/StudentClassService.java
@@ -1,54 +1,18 @@
package com.orange.demo.courseclassservice.service;
-import com.orange.demo.courseclassservice.dao.*;
import com.orange.demo.courseclassservice.model.*;
-import com.orange.demo.common.core.util.*;
-import com.orange.demo.common.core.object.MyRelationParam;
import com.orange.demo.common.core.object.CallResult;
-import com.orange.demo.common.core.object.TokenData;
-import com.orange.demo.common.core.object.MyWhereCriteria;
-import com.orange.demo.common.core.constant.GlobalDeletedFlag;
-import com.orange.demo.common.core.base.dao.BaseDaoMapper;
-import com.orange.demo.common.core.base.service.BaseService;
-import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import tk.mybatis.mapper.entity.Example;
+import com.orange.demo.common.core.base.service.IBaseService;
import java.util.*;
/**
- * 班级数据数据操作服务类。
+ * 班级数据数据操作服务接口。
*
* @author Jerry
* @date 2020-08-08
*/
-@Service
-public class StudentClassService extends BaseService {
-
- @Autowired
- private StudentClassMapper studentClassMapper;
- @Autowired
- private ClassCourseMapper classCourseMapper;
- @Autowired
- private ClassStudentMapper classStudentMapper;
- @Autowired
- private SchoolInfoService schoolInfoService;
- @Autowired
- private StudentService studentService;
- @Autowired
- private IdGeneratorWrapper idGenerator;
-
- /**
- * 返回当前Service的主表Mapper对象。
- *
- * @return 主表Mapper对象。
- */
- @Override
- protected BaseDaoMapper mapper() {
- return studentClassMapper;
- }
+public interface StudentClassService extends IBaseService {
/**
* 保存新增对象。
@@ -56,16 +20,7 @@ public class StudentClassService extends BaseService {
* @param studentClass 新增对象。
* @return 返回新增对象。
*/
- @Transactional(rollbackFor = Exception.class)
- public StudentClass saveNew(StudentClass studentClass) {
- studentClass.setClassId(idGenerator.nextLongId());
- TokenData tokenData = TokenData.takeFromRequest();
- studentClass.setCreateUserId(tokenData.getUserId());
- studentClass.setCreateTime(new Date());
- studentClass.setStatus(GlobalDeletedFlag.NORMAL);
- studentClassMapper.insert(studentClass);
- return studentClass;
- }
+ StudentClass saveNew(StudentClass studentClass);
/**
* 更新数据对象。
@@ -74,14 +29,7 @@ public class StudentClassService extends BaseService {
* @param originalStudentClass 原有数据对象。
* @return 成功返回true，否则false。
*/
- @Transactional(rollbackFor = Exception.class)
- public boolean update(StudentClass studentClass, StudentClass originalStudentClass) {
- studentClass.setCreateUserId(originalStudentClass.getCreateUserId());
- studentClass.setCreateTime(originalStudentClass.getCreateTime());
- studentClass.setStatus(GlobalDeletedFlag.NORMAL);
- // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
- return studentClassMapper.updateByPrimaryKey(studentClass) == 1;
- }
+ boolean update(StudentClass studentClass, StudentClass originalStudentClass);
/**
* 删除指定数据。
@@ -89,27 +37,7 @@ public class StudentClassService extends BaseService {
* @param classId 主键Id。
* @return 成功返回true，否则false。
*/
- @Transactional(rollbackFor = Exception.class)
- public boolean remove(Long classId) {
- Example studentClassExample = new Example(StudentClass.class);
- Example.Criteria c = studentClassExample.createCriteria();
- c.andEqualTo(super.idFieldName, classId);
- c.andEqualTo(super.deletedFlagFieldName, GlobalDeletedFlag.NORMAL);
- // 这里先删除主数据
- StudentClass deletedObject = new StudentClass();
- deletedObject.setStatus(GlobalDeletedFlag.DELETED);
- if (studentClassMapper.updateByExampleSelective(deletedObject, studentClassExample) == 0) {
- return false;
- }
- // 开始删除多对多中间表的关联
- ClassCourse classCourse = new ClassCourse();
- classCourse.setClassId(classId);
- classCourseMapper.delete(classCourse);
- ClassStudent classStudent = new ClassStudent();
- classStudent.setClassId(classId);
- classStudentMapper.delete(classStudent);
- return true;
- }
+ boolean remove(Long classId);
/**
* 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
@@ -119,9 +47,7 @@ public class StudentClassService extends BaseService {
* @param orderBy 排序参数。
* @return 查询结果集。
*/
- public List getStudentClassList(StudentClass filter, String orderBy) {
- return studentClassMapper.getStudentClassList(null, null, filter, orderBy);
- }
+ List getStudentClassList(StudentClass filter, String orderBy);
/**
* 获取主表的查询结果，查询条件中包括主表过滤对象和指定字段的(in list)过滤。
@@ -134,11 +60,7 @@ public class StudentClassService extends BaseService {
* @param orderBy 排序参数。
* @return 查询结果集。
*/
- public List getStudentClassList(
- String inFilterField, Set inFilterValues, StudentClass filter, String orderBy) {
- String inFilterColumn = MyModelUtil.mapToColumnName(inFilterField, StudentClass.class);
- return studentClassMapper.getStudentClassList(inFilterColumn, inFilterValues, filter, orderBy);
- }
+ List getStudentClassList(String inFilterField, Set inFilterValues, StudentClass filter, String orderBy);
/**
* 获取主表的查询结果，以及主表关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
@@ -148,12 +70,7 @@ public class StudentClassService extends BaseService {
* @param orderBy 排序对象。
* @return 查询结果集。
*/
- public List getStudentClassListWithRelation(StudentClass filter, String orderBy) {
- List resultList = studentClassMapper.getStudentClassList(null, null, filter, orderBy);
- Map> criteriaMap = buildAggregationAdditionalWhereCriteria();
- this.buildRelationForDataList(resultList, MyRelationParam.normal(), criteriaMap);
- return resultList;
- }
+ List getStudentClassListWithRelation(StudentClass filter, String orderBy);
/**
* 获取主表的查询结果，查询条件中包括主表过滤对象和指定字段的(in list)过滤。
@@ -166,13 +83,8 @@ public class StudentClassService extends BaseService