diff --git a/orange-demo-multi-service-for-app/.idea/compiler.xml b/orange-demo-multi-service-for-app/.idea/compiler.xml
index 2d58d5b1..e490c836 100644
--- a/orange-demo-multi-service-for-app/.idea/compiler.xml
+++ b/orange-demo-multi-service-for-app/.idea/compiler.xml
@@ -6,19 +6,18 @@
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
+
+
+
+
@@ -30,7 +29,6 @@
-
diff --git a/orange-demo-multi-service-for-app/.idea/encodings.xml b/orange-demo-multi-service-for-app/.idea/encodings.xml
index a957d8ba..0b38991f 100644
--- a/orange-demo-multi-service-for-app/.idea/encodings.xml
+++ b/orange-demo-multi-service-for-app/.idea/encodings.xml
@@ -18,8 +18,6 @@
-
-
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 c562afbb..fc8488e1 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,57 +14,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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
deleted file mode 100644
index 1f9c628c..00000000
--- a/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_xiaoymin_knife4j_annotations_2_0_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 177365d1..00000000
--- a/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_xiaoymin_knife4j_core_2_0_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 2e57265a..00000000
--- a/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_xiaoymin_knife4j_micro_spring_boot_starter_2_0_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 664ba028..00000000
--- a/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_2_0_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 1fee9449..00000000
--- a/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_autoconfigure_2_0_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index da9242d4..00000000
--- a/orange-demo-multi-service-for-app/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_ui_2_0_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index fd547760..00000000
--- a/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_bean_validators_2_9_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 03588dc9..00000000
--- a/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 4a47148b..00000000
--- a/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index f934649a..00000000
--- a/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 7898a19c..00000000
--- a/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 4ed7d0d2..00000000
--- a/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index c40ef9ff..00000000
--- a/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 1c4a6212..00000000
--- a/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index b4e45d34..00000000
--- a/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_22.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 9b3959ab..00000000
--- a/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_swagger_swagger_models_1_5_21.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 9d254f74..00000000
--- a/orange-demo-multi-service-for-app/.idea/libraries/Maven__io_swagger_swagger_models_1_5_22.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index a24c34c9..00000000
--- a/orange-demo-multi-service-for-app/.idea/libraries/Maven__org_javassist_javassist_3_25_0_GA.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index fbc04529..00000000
--- a/orange-demo-multi-service-for-app/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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
deleted file mode 100644
index 7e6f096b..00000000
--- a/orange-demo-multi-service-for-app/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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 6144c4af..50af0a81 100644
--- a/orange-demo-multi-service-for-app/.idea/modules.xml
+++ b/orange-demo-multi-service-for-app/.idea/modules.xml
@@ -10,7 +10,6 @@
-
diff --git a/orange-demo-multi-service-for-app/.idea/workspace.xml b/orange-demo-multi-service-for-app/.idea/workspace.xml
index 8b5e18a6..833389ab 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 @@
-
+
@@ -34,24 +34,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -80,12 +65,6 @@
-
-
-
-
-
- 1605869904849
+
+ 1608300885867
- 1605869904849
-
+ 1608300885867
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/orange-demo-multi-service-for-app/README.md b/orange-demo-multi-service-for-app/README.md
index 5a9d9476..e9deee26 100644
--- a/orange-demo-multi-service-for-app/README.md
+++ b/orange-demo-multi-service-for-app/README.md
@@ -12,8 +12,6 @@
最后，我们真诚的希望能够得到您的反馈，并持续改进我们的产品、文档、服务和操作流程。
### 服务接口文档
---
-- 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/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 4c9d6353..7ae6871c 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
@@ -91,24 +91,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -265,7 +247,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 4d488707..4de79cbd 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,11 +26,5 @@
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/client/AreaCodeClient.java b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/AreaCodeClient.java
index da0c6e93..3badc4b4 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/AreaCodeClient.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/AreaCodeClient.java
@@ -3,9 +3,9 @@ package com.orange.demo.courseclassinterface.client;
import com.orange.demo.common.core.base.client.BaseFallbackFactory;
import com.orange.demo.common.core.base.client.BaseClient;
import com.orange.demo.common.core.constant.ErrorCodeEnum;
-import com.orange.demo.common.core.object.MyQueryParam;
-import com.orange.demo.common.core.object.ResponseResult;
+import com.orange.demo.common.core.object.*;
import com.orange.demo.courseclassinterface.dto.AreaCodeDto;
+import com.orange.demo.courseclassinterface.vo.AreaCodeVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
@@ -20,7 +20,7 @@ import java.util.*;
* @date 2020-08-08
*/
@FeignClient(name = "system-service", fallbackFactory = AreaCodeClient.AreaCodeClientFallbackFactory.class)
-public interface AreaCodeClient extends BaseClient {
+public interface AreaCodeClient extends BaseClient {
/**
* 根据主键Id集合，返回给定的数据集合。
@@ -31,7 +31,7 @@ public interface AreaCodeClient extends BaseClient {
*/
@Override
@PostMapping("/areaCode/listByIds")
- ResponseResult> listByIds(
+ ResponseResult> listByIds(
@RequestParam("areaCodeIds") Set areaCodeIds,
@RequestParam("withDict") Boolean withDict);
@@ -44,7 +44,7 @@ public interface AreaCodeClient extends BaseClient {
*/
@Override
@GetMapping("/areaCode/getById")
- ResponseResult getById(
+ ResponseResult getById(
@RequestParam("areaId") Long areaId,
@RequestParam("withDict") Boolean withDict);
@@ -76,7 +76,7 @@ public interface AreaCodeClient extends BaseClient {
*/
@Override
@PostMapping("/areaCode/listBy")
- ResponseResult> listBy(@RequestBody MyQueryParam queryParam);
+ ResponseResult> listBy(@RequestBody MyQueryParam queryParam);
/**
* 获取远程主对象中符合查询条件的单条数据对象。
@@ -86,7 +86,7 @@ public interface AreaCodeClient extends BaseClient {
*/
@Override
@PostMapping("/areaCode/getBy")
- ResponseResult getBy(@RequestBody MyQueryParam queryParam);
+ ResponseResult getBy(@RequestBody MyQueryParam queryParam);
/**
* 以id、name的形式返回所有字典数据的列表。
@@ -108,7 +108,7 @@ public interface AreaCodeClient extends BaseClient {
@Component
@Slf4j
class AreaCodeClientFallbackFactory
- extends BaseFallbackFactory implements AreaCodeClient {
+ extends BaseFallbackFactory implements AreaCodeClient {
@Override
public ResponseResult>> listDict() {
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/CourseClient.java b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/CourseClient.java
index ed1e7d17..cc73bebc 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/CourseClient.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/CourseClient.java
@@ -5,6 +5,7 @@ import com.orange.demo.common.core.config.FeignConfig;
import com.orange.demo.common.core.base.client.BaseClient;
import com.orange.demo.common.core.object.*;
import com.orange.demo.courseclassinterface.dto.CourseDto;
+import com.orange.demo.courseclassinterface.vo.CourseVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
@@ -22,7 +23,7 @@ import java.util.*;
name = "course-class",
configuration = FeignConfig.class,
fallbackFactory = CourseClient.CourseClientFallbackFactory.class)
-public interface CourseClient extends BaseClient {
+public interface CourseClient extends BaseClient {
/**
* 基于主键的(In-list)条件获取远程数据接口。
@@ -33,7 +34,7 @@ public interface CourseClient extends BaseClient {
*/
@Override
@PostMapping("/course/listByIds")
- ResponseResult> listByIds(
+ ResponseResult> listByIds(
@RequestParam("courseIds") Set courseIds,
@RequestParam("withDict") Boolean withDict);
@@ -46,7 +47,7 @@ public interface CourseClient extends BaseClient {
*/
@Override
@PostMapping("/course/getById")
- ResponseResult getById(
+ ResponseResult getById(
@RequestParam("courseId") Long courseId,
@RequestParam("withDict") Boolean withDict);
@@ -98,7 +99,7 @@ public interface CourseClient extends BaseClient {
*/
@Override
@PostMapping("/course/listBy")
- ResponseResult> listBy(@RequestBody MyQueryParam queryParam);
+ ResponseResult> listBy(@RequestBody MyQueryParam queryParam);
/**
* 获取远程主对象中符合查询条件的单条数据对象。
@@ -108,7 +109,7 @@ public interface CourseClient extends BaseClient {
*/
@Override
@PostMapping("/course/getBy")
- ResponseResult getBy(@RequestBody MyQueryParam queryParam);
+ ResponseResult getBy(@RequestBody MyQueryParam queryParam);
/**
* 获取远程主对象中符合查询条件的数据列表。
@@ -119,7 +120,7 @@ public interface CourseClient extends BaseClient {
*/
@Override
@PostMapping("/course/listMapBy")
- ResponseResult>> listMapBy(@RequestBody MyQueryParam queryParam);
+ ResponseResult>> listMapBy(@RequestBody MyQueryParam queryParam);
/**
* 获取远程主对象中符合查询条件的数据数量。
@@ -144,7 +145,7 @@ public interface CourseClient extends BaseClient {
@Component("CourseClassCourseClientFallbackFactory")
@Slf4j
class CourseClientFallbackFactory
- extends BaseFallbackFactory implements CourseClient {
+ extends BaseFallbackFactory implements CourseClient {
@Override
public CourseClient create(Throwable throwable) {
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/GradeClient.java b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/GradeClient.java
index 75db4e36..bb51d1ca 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/GradeClient.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/GradeClient.java
@@ -5,6 +5,7 @@ import com.orange.demo.common.core.config.FeignConfig;
import com.orange.demo.common.core.base.client.BaseClient;
import com.orange.demo.common.core.object.*;
import com.orange.demo.courseclassinterface.dto.GradeDto;
+import com.orange.demo.courseclassinterface.vo.GradeVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
@@ -22,7 +23,7 @@ import java.util.*;
name = "course-class",
configuration = FeignConfig.class,
fallbackFactory = GradeClient.GradeClientFallbackFactory.class)
-public interface GradeClient extends BaseClient {
+public interface GradeClient extends BaseClient {
/**
* 基于主键的(in list)条件获取远程数据接口。
@@ -33,7 +34,7 @@ public interface GradeClient extends BaseClient {
*/
@Override
@PostMapping("/grade/listByIds")
- ResponseResult> listByIds(
+ ResponseResult> listByIds(
@RequestParam("gradeIds") Set gradeIds,
@RequestParam("withDict") Boolean withDict);
@@ -46,7 +47,7 @@ public interface GradeClient extends BaseClient {
*/
@Override
@PostMapping("/grade/getById")
- ResponseResult getById(
+ ResponseResult getById(
@RequestParam("gradeId") Integer gradeId,
@RequestParam("withDict") Boolean withDict);
@@ -98,7 +99,7 @@ public interface GradeClient extends BaseClient {
*/
@Override
@PostMapping("/grade/listBy")
- ResponseResult> listBy(@RequestBody MyQueryParam queryParam);
+ ResponseResult> listBy(@RequestBody MyQueryParam queryParam);
/**
* 获取远程主对象中符合查询条件的单条数据对象。
@@ -108,12 +109,12 @@ public interface GradeClient extends BaseClient {
*/
@Override
@PostMapping("/grade/getBy")
- ResponseResult getBy(@RequestBody MyQueryParam queryParam);
+ ResponseResult getBy(@RequestBody MyQueryParam queryParam);
@Component("CourseClassGradeClientFallbackFactory")
@Slf4j
class GradeClientFallbackFactory
- extends BaseFallbackFactory implements GradeClient {
+ extends BaseFallbackFactory implements GradeClient {
@Override
public GradeClient create(Throwable throwable) {
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/SchoolInfoClient.java b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/SchoolInfoClient.java
index 03b07da1..ffaf7912 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/SchoolInfoClient.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/SchoolInfoClient.java
@@ -5,6 +5,7 @@ import com.orange.demo.common.core.config.FeignConfig;
import com.orange.demo.common.core.base.client.BaseClient;
import com.orange.demo.common.core.object.*;
import com.orange.demo.courseclassinterface.dto.SchoolInfoDto;
+import com.orange.demo.courseclassinterface.vo.SchoolInfoVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
@@ -22,7 +23,7 @@ import java.util.*;
name = "course-class",
configuration = FeignConfig.class,
fallbackFactory = SchoolInfoClient.SchoolInfoClientFallbackFactory.class)
-public interface SchoolInfoClient extends BaseClient {
+public interface SchoolInfoClient extends BaseClient {
/**
* 基于主键的(In-list)条件获取远程数据接口。
@@ -33,7 +34,7 @@ public interface SchoolInfoClient extends BaseClient {
*/
@Override
@PostMapping("/schoolInfo/listByIds")
- ResponseResult> listByIds(
+ ResponseResult> listByIds(
@RequestParam("schoolIds") Set schoolIds,
@RequestParam("withDict") Boolean withDict);
@@ -46,7 +47,7 @@ public interface SchoolInfoClient extends BaseClient {
*/
@Override
@PostMapping("/schoolInfo/getById")
- ResponseResult getById(
+ ResponseResult getById(
@RequestParam("schoolId") Long schoolId,
@RequestParam("withDict") Boolean withDict);
@@ -98,7 +99,7 @@ public interface SchoolInfoClient extends BaseClient {
*/
@Override
@PostMapping("/schoolInfo/listBy")
- ResponseResult> listBy(@RequestBody MyQueryParam queryParam);
+ ResponseResult> listBy(@RequestBody MyQueryParam queryParam);
/**
* 获取远程主对象中符合查询条件的单条数据对象。
@@ -108,7 +109,7 @@ public interface SchoolInfoClient extends BaseClient {
*/
@Override
@PostMapping("/schoolInfo/getBy")
- ResponseResult getBy(@RequestBody MyQueryParam queryParam);
+ ResponseResult getBy(@RequestBody MyQueryParam queryParam);
/**
* 获取远程主对象中符合查询条件的数据列表。
@@ -119,7 +120,7 @@ public interface SchoolInfoClient extends BaseClient {
*/
@Override
@PostMapping("/schoolInfo/listMapBy")
- ResponseResult>> listMapBy(@RequestBody MyQueryParam queryParam);
+ ResponseResult>> listMapBy(@RequestBody MyQueryParam queryParam);
/**
* 获取远程主对象中符合查询条件的数据数量。
@@ -144,7 +145,7 @@ public interface SchoolInfoClient extends BaseClient {
@Component("CourseClassSchoolInfoClientFallbackFactory")
@Slf4j
class SchoolInfoClientFallbackFactory
- extends BaseFallbackFactory implements SchoolInfoClient {
+ extends BaseFallbackFactory implements SchoolInfoClient {
@Override
public SchoolInfoClient create(Throwable throwable) {
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/StudentClassClient.java b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/StudentClassClient.java
index 62c92f58..1155161d 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/StudentClassClient.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/StudentClassClient.java
@@ -5,6 +5,7 @@ import com.orange.demo.common.core.config.FeignConfig;
import com.orange.demo.common.core.base.client.BaseClient;
import com.orange.demo.common.core.object.*;
import com.orange.demo.courseclassinterface.dto.StudentClassDto;
+import com.orange.demo.courseclassinterface.vo.StudentClassVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
@@ -22,7 +23,7 @@ import java.util.*;
name = "course-class",
configuration = FeignConfig.class,
fallbackFactory = StudentClassClient.StudentClassClientFallbackFactory.class)
-public interface StudentClassClient extends BaseClient {
+public interface StudentClassClient extends BaseClient {
/**
* 基于主键的(In-list)条件获取远程数据接口。
@@ -33,7 +34,7 @@ public interface StudentClassClient extends BaseClient {
*/
@Override
@PostMapping("/studentClass/listByIds")
- ResponseResult> listByIds(
+ ResponseResult> listByIds(
@RequestParam("classIds") Set classIds,
@RequestParam("withDict") Boolean withDict);
@@ -46,7 +47,7 @@ public interface StudentClassClient extends BaseClient {
*/
@Override
@PostMapping("/studentClass/getById")
- ResponseResult getById(
+ ResponseResult getById(
@RequestParam("classId") Long classId,
@RequestParam("withDict") Boolean withDict);
@@ -98,7 +99,7 @@ public interface StudentClassClient extends BaseClient {
*/
@Override
@PostMapping("/studentClass/listBy")
- ResponseResult> listBy(@RequestBody MyQueryParam queryParam);
+ ResponseResult> listBy(@RequestBody MyQueryParam queryParam);
/**
* 获取远程主对象中符合查询条件的单条数据对象。
@@ -108,7 +109,7 @@ public interface StudentClassClient extends BaseClient {
*/
@Override
@PostMapping("/studentClass/getBy")
- ResponseResult getBy(@RequestBody MyQueryParam queryParam);
+ ResponseResult getBy(@RequestBody MyQueryParam queryParam);
/**
* 获取远程主对象中符合查询条件的数据列表。
@@ -119,7 +120,7 @@ public interface StudentClassClient extends BaseClient {
*/
@Override
@PostMapping("/studentClass/listMapBy")
- ResponseResult>> listMapBy(@RequestBody MyQueryParam queryParam);
+ ResponseResult>> listMapBy(@RequestBody MyQueryParam queryParam);
/**
* 获取远程主对象中符合查询条件的数据数量。
@@ -144,7 +145,7 @@ public interface StudentClassClient extends BaseClient {
@Component("CourseClassStudentClassClientFallbackFactory")
@Slf4j
class StudentClassClientFallbackFactory
- extends BaseFallbackFactory implements StudentClassClient {
+ extends BaseFallbackFactory implements StudentClassClient {
@Override
public StudentClassClient create(Throwable throwable) {
diff --git a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/StudentClient.java b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/StudentClient.java
index 75449784..a45d0b0d 100644
--- a/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/StudentClient.java
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/StudentClient.java
@@ -5,6 +5,7 @@ import com.orange.demo.common.core.config.FeignConfig;
import com.orange.demo.common.core.base.client.BaseClient;
import com.orange.demo.common.core.object.*;
import com.orange.demo.courseclassinterface.dto.StudentDto;
+import com.orange.demo.courseclassinterface.vo.StudentVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
@@ -22,7 +23,7 @@ import java.util.*;
name = "course-class",
configuration = FeignConfig.class,
fallbackFactory = StudentClient.StudentClientFallbackFactory.class)
-public interface StudentClient extends BaseClient {
+public interface StudentClient extends BaseClient {
/**
* 基于主键的(In-list)条件获取远程数据接口。
@@ -33,7 +34,7 @@ public interface StudentClient extends BaseClient {
*/
@Override
@PostMapping("/student/listByIds")
- ResponseResult> listByIds(
+ ResponseResult> listByIds(
@RequestParam("studentIds") Set studentIds,
@RequestParam("withDict") Boolean withDict);
@@ -46,7 +47,7 @@ public interface StudentClient extends BaseClient {
*/
@Override
@PostMapping("/student/getById")
- ResponseResult getById(
+ ResponseResult getById(
@RequestParam("studentId") Long studentId,
@RequestParam("withDict") Boolean withDict);
@@ -98,7 +99,7 @@ public interface StudentClient extends BaseClient {
*/
@Override
@PostMapping("/student/listBy")
- ResponseResult> listBy(@RequestBody MyQueryParam queryParam);
+ ResponseResult> listBy(@RequestBody MyQueryParam queryParam);
/**
* 获取远程主对象中符合查询条件的单条数据对象。
@@ -108,7 +109,7 @@ public interface StudentClient extends BaseClient {
*/
@Override
@PostMapping("/student/getBy")
- ResponseResult getBy(@RequestBody MyQueryParam queryParam);
+ ResponseResult getBy(@RequestBody MyQueryParam queryParam);
/**
* 获取远程主对象中符合查询条件的数据列表。
@@ -119,7 +120,7 @@ public interface StudentClient extends BaseClient {
*/
@Override
@PostMapping("/student/listMapBy")
- ResponseResult>> listMapBy(@RequestBody MyQueryParam queryParam);
+ ResponseResult>> listMapBy(@RequestBody MyQueryParam queryParam);
/**
* 获取远程主对象中符合查询条件的数据数量。
@@ -144,7 +145,7 @@ public interface StudentClient extends BaseClient {
@Component("CourseClassStudentClientFallbackFactory")
@Slf4j
class StudentClientFallbackFactory
- extends BaseFallbackFactory implements StudentClient {
+ extends BaseFallbackFactory implements StudentClient {
@Override
public StudentClient create(Throwable throwable) {
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 acec0c2b..fbf7db6d 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,7 +1,5 @@
package com.orange.demo.courseclassinterface.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -10,31 +8,26 @@ 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/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 a6d4b620..1033586b 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,15 +5,12 @@ 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;
-import java.util.Map;
/**
* CourseDto对象。
@@ -21,41 +18,35 @@ import java.util.Map;
* @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;
@@ -63,14 +54,12 @@ 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;
@@ -78,92 +67,57 @@ public class CourseDto {
/**
* 课时数量。
*/
- @ApiModelProperty(value = "课时数量", required = true)
@NotNull(message = "数据验证失败，课时数量不能为空！")
private Integer classHour;
/**
* 多张课程图片地址。
*/
- @ApiModelProperty(value = "多张课程图片地址", required = true)
@NotBlank(message = "数据验证失败，课程图片不能为空！")
private String pictureUrl;
/**
* 创建用户Id。
*/
- @ApiModelProperty(value = "创建用户Id")
private Long createUserId;
/**
* 创建时间。
*/
- @ApiModelProperty(value = "创建时间")
private Date createTime;
/**
* 最后修改时间。
*/
- @ApiModelProperty(value = "最后修改时间")
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;
-
- /**
- * courseId 的多对多关联表数据对象，数据对应类型为ClassCourseDto。
- */
- @ApiModelProperty(hidden = true)
- private Map classCourse;
-
- /**
- * gradeId 字典关联数据。
- */
- @ApiModelProperty(hidden = true)
- private Map gradeIdDictMap;
-
- /**
- * difficulty 常量字典关联数据。
- */
- @ApiModelProperty(hidden = true)
- private Map difficultyDictMap;
-
- /**
- * subjectId 常量字典关联数据。
- */
- @ApiModelProperty(hidden = true)
- 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/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 a047ab60..36fed0d7 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,8 +2,6 @@ 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.*;
@@ -14,21 +12,18 @@ 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 2d7da7d1..a42aaa9e 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,13 +2,10 @@ 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.*;
-import java.util.Map;
/**
* SchoolInfoDto对象。
@@ -16,47 +13,30 @@ import java.util.Map;
* @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;
-
- /**
- * provinceId 字典关联数据。
- */
- @ApiModelProperty(hidden = true)
- private Map provinceIdDictMap;
-
- /**
- * cityId 字典关联数据。
- */
- @ApiModelProperty(hidden = true)
- 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/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 9510ad8b..499318fb 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,14 +4,11 @@ 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;
-import java.util.Map;
/**
* StudentClassDto对象。
@@ -19,49 +16,42 @@ import java.util.Map;
* @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;
@@ -69,30 +59,10 @@ public class StudentClassDto {
/**
* 创建用户。
*/
- @ApiModelProperty(value = "创建用户")
private Long createUserId;
/**
* 班级创建时间。
*/
- @ApiModelProperty(value = "班级创建时间")
private Date createTime;
-
- /**
- * schoolId 字典关联数据。
- */
- @ApiModelProperty(hidden = true)
- private Map schoolIdDictMap;
-
- /**
- * leaderId 字典关联数据。
- */
- @ApiModelProperty(hidden = true)
- private Map leaderIdDictMap;
-
- /**
- * classLevel 常量字典关联数据。
- */
- @ApiModelProperty(hidden = true)
- 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/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 aed34de5..28dedfcf 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,14 +6,11 @@ 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.*;
import java.util.Date;
-import java.util.Map;
/**
* StudentDto对象。
@@ -21,56 +18,48 @@ import java.util.Map;
* @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;
@@ -78,14 +67,12 @@ 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;
@@ -93,41 +80,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;
/**
* 注册时间。
*/
- @ApiModelProperty(value = "注册时间")
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;
@@ -135,78 +116,25 @@ 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;
-
- /**
- * provinceId 字典关联数据。
- */
- @ApiModelProperty(hidden = true)
- private Map provinceIdDictMap;
-
- /**
- * cityId 字典关联数据。
- */
- @ApiModelProperty(hidden = true)
- private Map cityIdDictMap;
-
- /**
- * districtId 字典关联数据。
- */
- @ApiModelProperty(hidden = true)
- private Map districtIdDictMap;
-
- /**
- * gradeId 字典关联数据。
- */
- @ApiModelProperty(hidden = true)
- private Map gradeIdDictMap;
-
- /**
- * schoolId 字典关联数据。
- */
- @ApiModelProperty(hidden = true)
- private Map schoolIdDictMap;
-
- /**
- * gender 常量字典关联数据。
- */
- @ApiModelProperty(hidden = true)
- private Map genderDictMap;
-
- /**
- * experienceLevel 常量字典关联数据。
- */
- @ApiModelProperty(hidden = true)
- private Map experienceLevelDictMap;
-
- /**
- * status 常量字典关联数据。
- */
- @ApiModelProperty(hidden = true)
- private Map statusDictMap;
}
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
new file mode 100644
index 00000000..275bcb2a
--- /dev/null
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/AreaCodeVo.java
@@ -0,0 +1,33 @@
+package com.orange.demo.courseclassinterface.vo;
+
+import lombok.Data;
+
+/**
+ * 行政区划VO。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@Data
+public class AreaCodeVo {
+
+ /**
+ * 行政区划主键Id
+ */
+ private Long areaId;
+
+ /**
+ * 行政区划名称
+ */
+ private String areaName;
+
+ /**
+ * 行政区划级别 (1: 省级别 2: 市级别 3: 区级别)
+ */
+ private Integer areaLevel;
+
+ /**
+ * 父级行政区划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
new file mode 100644
index 00000000..07617396
--- /dev/null
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/ClassCourseVo.java
@@ -0,0 +1,28 @@
+package com.orange.demo.courseclassinterface.vo;
+
+import lombok.Data;
+
+/**
+ * ClassCourseVO对象。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@Data
+public class ClassCourseVo {
+
+ /**
+ * 班级Id。
+ */
+ private Long classId;
+
+ /**
+ * 课程Id。
+ */
+ private Long courseId;
+
+ /**
+ * 课程顺序(数值越小越靠前)。
+ */
+ 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
new file mode 100644
index 00000000..27b9cce9
--- /dev/null
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/ClassStudentVo.java
@@ -0,0 +1,23 @@
+package com.orange.demo.courseclassinterface.vo;
+
+import lombok.Data;
+
+/**
+ * ClassStudentVO对象。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@Data
+public class ClassStudentVo {
+
+ /**
+ * 班级Id。
+ */
+ private Long classId;
+
+ /**
+ * 学生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
new file mode 100644
index 00000000..5a6d3208
--- /dev/null
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/CourseVo.java
@@ -0,0 +1,97 @@
+package com.orange.demo.courseclassinterface.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * CourseVO对象。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@Data
+public class CourseVo {
+
+ /**
+ * 主键Id。
+ */
+ private Long courseId;
+
+ /**
+ * 课程名称。
+ */
+ private String courseName;
+
+ /**
+ * 课程价格。
+ */
+ private BigDecimal price;
+
+ /**
+ * 课程描述。
+ */
+ private String description;
+
+ /**
+ * 课程难度(0: 容易 1: 普通 2: 很难)。
+ */
+ private Integer difficulty;
+
+ /**
+ * 年级Id。
+ */
+ private Integer gradeId;
+
+ /**
+ * 学科Id。
+ */
+ private Integer subjectId;
+
+ /**
+ * 课时数量。
+ */
+ private Integer classHour;
+
+ /**
+ * 多张课程图片地址。
+ */
+ private String pictureUrl;
+
+ /**
+ * 创建用户Id。
+ */
+ private Long createUserId;
+
+ /**
+ * 创建时间。
+ */
+ private Date createTime;
+
+ /**
+ * 最后修改时间。
+ */
+ private Date updateTime;
+
+ /**
+ * courseId 的多对多关联表数据对象，数据对应类型为ClassCourseVo。
+ */
+ private Map classCourse;
+
+ /**
+ * gradeId 字典关联数据。
+ */
+ private Map gradeIdDictMap;
+
+ /**
+ * difficulty 常量字典关联数据。
+ */
+ private Map difficultyDictMap;
+
+ /**
+ * 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
new file mode 100644
index 00000000..42b57aca
--- /dev/null
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/GradeVo.java
@@ -0,0 +1,23 @@
+package com.orange.demo.courseclassinterface.vo;
+
+import lombok.Data;
+
+/**
+ * GradeVO对象。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@Data
+public class GradeVo {
+
+ /**
+ * 主键Id。
+ */
+ private Integer gradeId;
+
+ /**
+ * 年级名称。
+ */
+ 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
new file mode 100644
index 00000000..3dbbd71d
--- /dev/null
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/SchoolInfoVo.java
@@ -0,0 +1,45 @@
+package com.orange.demo.courseclassinterface.vo;
+
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * SchoolInfoVO对象。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@Data
+public class SchoolInfoVo {
+
+ /**
+ * 学校Id。
+ */
+ private Long schoolId;
+
+ /**
+ * 学校名称。
+ */
+ private String schoolName;
+
+ /**
+ * 所在省Id。
+ */
+ private Long provinceId;
+
+ /**
+ * 所在城市Id。
+ */
+ private Long cityId;
+
+ /**
+ * provinceId 字典关联数据。
+ */
+ private Map provinceIdDictMap;
+
+ /**
+ * 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
new file mode 100644
index 00000000..737ce628
--- /dev/null
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/StudentClassVo.java
@@ -0,0 +1,71 @@
+package com.orange.demo.courseclassinterface.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * StudentClassVO对象。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@Data
+public class StudentClassVo {
+
+ /**
+ * 班级Id。
+ */
+ private Long classId;
+
+ /**
+ * 班级名称。
+ */
+ private String className;
+
+ /**
+ * 学校Id。
+ */
+ private Long schoolId;
+
+ /**
+ * 学生班长Id。
+ */
+ private Long leaderId;
+
+ /**
+ * 已完成课时数量。
+ */
+ private Integer finishClassHour;
+
+ /**
+ * 班级级别(0: 初级班 1: 培优班 2: 冲刺提分班 3: 竞赛班)。
+ */
+ private Integer classLevel;
+
+ /**
+ * 创建用户。
+ */
+ private Long createUserId;
+
+ /**
+ * 班级创建时间。
+ */
+ private Date createTime;
+
+ /**
+ * schoolId 字典关联数据。
+ */
+ private Map schoolIdDictMap;
+
+ /**
+ * leaderId 字典关联数据。
+ */
+ private Map leaderIdDictMap;
+
+ /**
+ * 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
new file mode 100644
index 00000000..5981354f
--- /dev/null
+++ b/orange-demo-multi-service-for-app/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/StudentVo.java
@@ -0,0 +1,131 @@
+package com.orange.demo.courseclassinterface.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * StudentVO对象。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@Data
+public class StudentVo {
+
+ /**
+ * 学生Id。
+ */
+ private Long studentId;
+
+ /**
+ * 登录手机。
+ */
+ private String loginMobile;
+
+ /**
+ * 学生姓名。
+ */
+ private String studentName;
+
+ /**
+ * 所在省份Id。
+ */
+ private Long provinceId;
+
+ /**
+ * 所在城市Id。
+ */
+ private Long cityId;
+
+ /**
+ * 区县Id。
+ */
+ private Long districtId;
+
+ /**
+ * 学生性别 (0: 女生 1: 男生)。
+ */
+ private Integer gender;
+
+ /**
+ * 生日。
+ */
+ private Date birthday;
+
+ /**
+ * 经验等级 (0: 初级 1: 中级 2: 高级 3: 资深)。
+ */
+ private Integer experienceLevel;
+
+ /**
+ * 总共充值学币数量。
+ */
+ private Integer totalCoin;
+
+ /**
+ * 可用学币数量。
+ */
+ private Integer leftCoin;
+
+ /**
+ * 年级Id。
+ */
+ private Integer gradeId;
+
+ /**
+ * 校区Id。
+ */
+ private Long schoolId;
+
+ /**
+ * 注册时间。
+ */
+ private Date registerTime;
+
+ /**
+ * 学生状态 (0: 正常 1: 锁定 2: 注销)。
+ */
+ private Integer status;
+
+ /**
+ * provinceId 字典关联数据。
+ */
+ private Map provinceIdDictMap;
+
+ /**
+ * cityId 字典关联数据。
+ */
+ private Map cityIdDictMap;
+
+ /**
+ * districtId 字典关联数据。
+ */
+ private Map districtIdDictMap;
+
+ /**
+ * gradeId 字典关联数据。
+ */
+ private Map gradeIdDictMap;
+
+ /**
+ * schoolId 字典关联数据。
+ */
+ private Map schoolIdDictMap;
+
+ /**
+ * gender 常量字典关联数据。
+ */
+ private Map genderDictMap;
+
+ /**
+ * experienceLevel 常量字典关联数据。
+ */
+ private Map experienceLevelDictMap;
+
+ /**
+ * 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 488ef26c..998afcc9 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
@@ -89,23 +89,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 f2b44bee..9a778716 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,13 +1,11 @@
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.util.MyModelUtil;
-import com.orange.demo.common.core.object.MyQueryParam;
-import com.orange.demo.common.core.object.ResponseResult;
-import com.orange.demo.courseclassinterface.dto.AreaCodeDto;
+import com.orange.demo.common.core.object.*;
+import com.orange.demo.courseclassinterface.vo.AreaCodeVo;
import com.orange.demo.courseclassservice.model.AreaCode;
import com.orange.demo.courseclassservice.service.AreaCodeService;
import org.apache.commons.collections4.CollectionUtils;
@@ -22,16 +20,15 @@ import java.util.*;
* @author Jerry
* @date 2020-08-08
*/
-@Api(tags = "行政区划数据访问接口")
@RestController
@RequestMapping("/areaCode")
-public class AreaCodeController extends BaseController {
+public class AreaCodeController extends BaseController {
@Autowired
private AreaCodeService areaCodeService;
@Override
- protected BaseService service() {
+ protected BaseService service() {
return areaCodeService;
}
@@ -70,9 +67,9 @@ public class AreaCodeController extends BaseController view(@RequestParam Long areaId) {
+ public ResponseResult view(@RequestParam Long areaId) {
AreaCode areaCode = areaCodeService.getById(areaId);
- return ResponseResult.success(MyModelUtil.copyTo(areaCode, AreaCodeDto.class));
+ return ResponseResult.success(MyModelUtil.copyTo(areaCode, AreaCodeVo.class));
}
/**
@@ -83,7 +80,7 @@ public class AreaCodeController extends BaseController> listByIds(
+ public ResponseResult> listByIds(
@RequestParam Set areaCodeIds, @RequestParam Boolean withDict) {
return super.baseListByIds(areaCodeIds, withDict, null);
}
@@ -96,7 +93,7 @@ public class AreaCodeController extends BaseController getById(@RequestParam Long areaId, @RequestParam Boolean withDict) {
+ public ResponseResult getById(@RequestParam Long areaId, @RequestParam Boolean withDict) {
return super.baseGetById(areaId, withDict, null);
}
@@ -129,7 +126,7 @@ public class AreaCodeController extends BaseController> listBy(@RequestBody MyQueryParam queryParam) {
+ public ResponseResult> listBy(@RequestBody MyQueryParam queryParam) {
return super.baseListBy(queryParam, null);
}
@@ -140,7 +137,7 @@ public class AreaCodeController extends BaseController getBy(@RequestBody MyQueryParam queryParam) {
+ 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/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 f8da94d3..d64775de 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
@@ -6,11 +6,11 @@ import com.orange.demo.common.core.upload.BaseUpDownloader;
import com.orange.demo.common.core.upload.UpDownloaderFactory;
import com.orange.demo.common.core.upload.UploadResponseInfo;
import com.orange.demo.common.core.upload.UploadStoreInfo;
-import com.github.pagehelper.Page;
import com.github.pagehelper.page.PageMethod;
import com.orange.demo.courseclassservice.model.*;
import com.orange.demo.courseclassservice.service.*;
import com.orange.demo.courseclassinterface.dto.*;
+import com.orange.demo.courseclassinterface.vo.*;
import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.*;
import com.orange.demo.common.core.constant.*;
@@ -20,9 +20,6 @@ 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.Api;
-import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -38,11 +35,10 @@ import java.util.*;
* @author Jerry
* @date 2020-08-08
*/
-@Api(tags = "课程数据管理接口")
@Slf4j
@RestController
@RequestMapping("/course")
-public class CourseController extends BaseController {
+public class CourseController extends BaseController {
@Autowired
private CourseService courseService;
@@ -54,7 +50,7 @@ public class CourseController extends BaseController {
private UpDownloaderFactory upDownloaderFactory;
@Override
- protected BaseService service() {
+ protected BaseService service() {
return courseService;
}
@@ -64,21 +60,13 @@ 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);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
- Course course = Course.INSTANCE.toModel(courseDto);
+ Course course = MyModelUtil.copyTo(courseDto, Course.class);
// 验证关联Id的数据合法性
CallResult callResult = courseService.verifyRelatedData(course, null);
if (!callResult.isSuccess()) {
@@ -95,20 +83,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);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
- Course course = Course.INSTANCE.toModel(courseDto);
+ Course course = MyModelUtil.copyTo(courseDto, Course.class);
Course originalCourse = courseService.getById(course.getCourseId());
if (originalCourse == null) {
// NOTE: 修改下面方括号中的话述
@@ -162,25 +143,18 @@ public class CourseController extends BaseController {
* @return 应答结果对象，包含查询结果集。
*/
@PostMapping("/list")
- public ResponseResult> list(
+ public ResponseResult> list(
@MyRequestBody("courseFilter") CourseDto courseDtoFilter,
@MyRequestBody MyOrderParam orderParam,
@MyRequestBody MyPageParam pageParam) {
if (pageParam != null) {
PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
}
- Course courseFilter = Course.INSTANCE.toModel(courseDtoFilter);
+ Course courseFilter = MyModelUtil.copyTo(courseDtoFilter, Course.class);
String orderBy = MyOrderParam.buildOrderBy(orderParam, Course.class);
List courseList =
courseService.getCourseListWithRelation(courseFilter, orderBy);
- long totalCount = 0L;
- if (courseList instanceof Page) {
- totalCount = ((Page) courseList).getTotal();
- }
- // 分页连同对象数据转换copy工作，下面的方法一并完成。
- Tuple2, Long> responseData =
- new Tuple2<>(Course.INSTANCE.fromModelList(courseList), totalCount);
- return ResponseResult.success(MyPageUtil.makeResponseData(responseData));
+ return ResponseResult.success(MyPageUtil.makeResponseData(courseList, Course.INSTANCE));
}
/**
@@ -190,7 +164,7 @@ public class CourseController extends BaseController {
* @return 应答结果对象，包含对象详情。
*/
@GetMapping("/view")
- public ResponseResult view(@RequestParam Long courseId) {
+ public ResponseResult view(@RequestParam Long courseId) {
if (MyCommonUtil.existBlankArgument(courseId)) {
return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
}
@@ -199,8 +173,8 @@ public class CourseController extends BaseController {
if (course == null) {
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
}
- CourseDto courseDto = Course.INSTANCE.fromModel(course);
- return ResponseResult.success(courseDto);
+ CourseVo courseVo = Course.INSTANCE.fromModel(course);
+ return ResponseResult.success(courseVo);
}
/**
@@ -317,9 +291,8 @@ public class CourseController extends BaseController {
* @param withDict 是否包含字典关联。
* @return 应答结果对象，包含主对象集合。
*/
- @ApiOperation(hidden = true, value = "listByIds")
@PostMapping("/listByIds")
- public ResponseResult> listByIds(
+ public ResponseResult> listByIds(
@RequestParam Set courseIds, @RequestParam Boolean withDict) {
return super.baseListByIds(courseIds, withDict, Course.INSTANCE);
}
@@ -331,9 +304,8 @@ public class CourseController extends BaseController {
* @param withDict 是否包含字典关联。
* @return 应答结果对象，包含主对象数据。
*/
- @ApiOperation(hidden = true, value = "getById")
@PostMapping("/getById")
- public ResponseResult getById(
+ public ResponseResult getById(
@RequestParam Long courseId, @RequestParam Boolean withDict) {
return super.baseGetById(courseId, withDict, Course.INSTANCE);
}
@@ -344,7 +316,6 @@ 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);
@@ -356,7 +327,6 @@ 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);
@@ -368,33 +338,30 @@ 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(filter, Course.INSTANCE);
+ return super.baseDeleteBy(MyModelUtil.copyTo(filter, Course.class));
}
/**
- * 复杂的查询调用，包括(in list)过滤，对象条件过滤，分组和排序等。主要用于微服务间远程过程调用。
+ * 复杂的查询调用，包括(in list)过滤，对象条件过滤，分页和排序等。主要用于微服务间远程过程调用。
*
* @param queryParam 查询参数。
- * @return 应答结果对象，包含符合查询过滤条件的对象结果集。
+ * @return 分页数据集合对象。如MyQueryParam参数的分页属性为空，则不会执行分页操作，只是基于MyPageData对象返回数据结果。
*/
- @ApiOperation(hidden = true, value = "listBy")
@PostMapping("/listBy")
- public ResponseResult> listBy(@RequestBody MyQueryParam queryParam) {
+ public ResponseResult> listBy(@RequestBody MyQueryParam queryParam) {
return super.baseListBy(queryParam, Course.INSTANCE);
}
/**
- * 复杂的查询调用，包括(in list)过滤，对象条件过滤，分组和排序等。主要用于微服务间远程过程调用。
+ * 复杂的查询调用，包括(in list)过滤，对象条件过滤，分页和排序等。主要用于微服务间远程过程调用。
*
* @param queryParam 查询参数。
- * @return 应答结果对象，包含符合查询过滤条件的对象结果集。
+ * @return 分页数据集合对象。如MyQueryParam参数的分页属性为空，则不会执行分页操作，只是基于MyPageData对象返回数据结果。
*/
- @ApiOperation(hidden = true, value = "listMapBy")
@PostMapping("/listMapBy")
- public ResponseResult>> listMapBy(@RequestBody MyQueryParam queryParam) {
+ public ResponseResult>> listMapBy(@RequestBody MyQueryParam queryParam) {
return super.baseListMapBy(queryParam, Course.INSTANCE);
}
@@ -404,9 +371,8 @@ public class CourseController extends BaseController {
* @param queryParam 查询参数。
* @return 应答结果对象，包含符合查询过滤条件的对象结果集。
*/
- @ApiOperation(hidden = true, value = "getBy")
@PostMapping("/getBy")
- public ResponseResult getBy(@RequestBody MyQueryParam queryParam) {
+ public ResponseResult getBy(@RequestBody MyQueryParam queryParam) {
return super.baseGetBy(queryParam, Course.INSTANCE);
}
@@ -416,7 +382,6 @@ 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);
@@ -428,7 +393,6 @@ 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 2c1ed993..d0ebc95a 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,20 +1,17 @@
package com.orange.demo.courseclassservice.controller;
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.constant.ErrorCodeEnum;
-import com.orange.demo.common.core.object.MyQueryParam;
-import com.orange.demo.common.core.object.ResponseResult;
+import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.MyModelUtil;
import com.orange.demo.common.core.util.MyCommonUtil;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.orange.demo.common.core.annotation.MyRequestBody;
import com.orange.demo.courseclassinterface.dto.GradeDto;
+import com.orange.demo.courseclassinterface.vo.GradeVo;
import com.orange.demo.courseclassservice.model.Grade;
import com.orange.demo.courseclassservice.service.GradeService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,17 +26,16 @@ import java.util.*;
* @author Jerry
* @date 2020-08-08
*/
-@Api(tags = "年级管理接口")
@Slf4j
@RestController
@RequestMapping("/grade")
-public class GradeController extends BaseController {
+public class GradeController extends BaseController {
@Autowired
private GradeService gradeService;
@Override
- protected BaseDictService service() {
+ protected BaseDictService service() {
return gradeService;
}
@@ -49,7 +45,6 @@ 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);
@@ -108,7 +103,7 @@ public class GradeController extends BaseController {
* @return 应答结果对象，包含对象详情。
*/
@GetMapping("/view")
- public ResponseResult view(@RequestParam Integer gradeId) {
+ public ResponseResult view(@RequestParam Integer gradeId) {
if (MyCommonUtil.existBlankArgument(gradeId)) {
return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
}
@@ -116,8 +111,8 @@ public class GradeController extends BaseController {
if (grade == null) {
return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
}
- GradeDto gradeDto = MyModelUtil.copyTo(grade, GradeDto.class);
- return ResponseResult.success(gradeDto);
+ GradeVo gradeVo = MyModelUtil.copyTo(grade, GradeVo.class);
+ return ResponseResult.success(gradeVo);
}
/**
@@ -140,9 +135,8 @@ public class GradeController extends BaseController {
* @param withDict 是否包含字典关联。
* @return 应答结果对象，包含主对象集合。
*/
- @ApiOperation(hidden = true, value = "listByIds")
@PostMapping("/listByIds")
- public ResponseResult> listByIds(
+ public ResponseResult> listByIds(
@RequestParam Set gradeIds, @RequestParam Boolean withDict) {
return super.baseListByIds(gradeIds, withDict, null);
}
@@ -154,9 +148,8 @@ public class GradeController extends BaseController {
* @param withDict 是否包含字典关联。
* @return 应答结果对象，包含主对象数据。
*/
- @ApiOperation(hidden = true, value = "getById")
@PostMapping("/getById")
- public ResponseResult getById(
+ public ResponseResult getById(
@RequestParam Integer gradeId, @RequestParam Boolean withDict) {
return super.baseGetById(gradeId, withDict, null);
}
@@ -167,7 +160,6 @@ 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);
@@ -179,7 +171,6 @@ 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);
@@ -191,10 +182,9 @@ 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(filter, null);
+ return super.baseDeleteBy(MyModelUtil.copyTo(filter, Grade.class));
}
/**
@@ -203,9 +193,8 @@ public class GradeController extends BaseController {
* @param queryParam 查询参数。
* @return 应答结果对象，包含符合查询过滤条件的对象结果集。
*/
- @ApiOperation(hidden = true, value = "listBy")
@PostMapping("/listBy")
- public ResponseResult> listBy(@RequestBody MyQueryParam queryParam) {
+ public ResponseResult> listBy(@RequestBody MyQueryParam queryParam) {
return super.baseListBy(queryParam, null);
}
@@ -215,9 +204,8 @@ public class GradeController extends BaseController {
* @param queryParam 查询参数。
* @return 应答结果对象，包含符合查询过滤条件的对象结果集。
*/
- @ApiOperation(hidden = true, value = "getBy")
@PostMapping("/getBy")
- public ResponseResult getBy(@RequestBody MyQueryParam queryParam) {
+ 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 9479bc1c..4003e1bb 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
@@ -1,11 +1,11 @@
package com.orange.demo.courseclassservice.controller;
import cn.jimmyshi.beanquery.BeanQuery;
-import com.github.pagehelper.Page;
import com.github.pagehelper.page.PageMethod;
import com.orange.demo.courseclassservice.model.*;
import com.orange.demo.courseclassservice.service.*;
import com.orange.demo.courseclassinterface.dto.*;
+import com.orange.demo.courseclassinterface.vo.*;
import com.orange.demo.common.core.object.*;
import com.orange.demo.common.core.util.*;
import com.orange.demo.common.core.constant.*;
@@ -13,9 +13,6 @@ import com.orange.demo.common.core.base.controller.BaseController;
import com.orange.demo.common.core.base.service.BaseService;
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.Api;
-import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -29,17 +26,16 @@ import java.util.*;
* @author Jerry
* @date 2020-08-08
*/
-@Api(tags = "校区数据管理接口")
@Slf4j
@RestController
@RequestMapping("/schoolInfo")
-public class SchoolInfoController extends BaseController {
+public class SchoolInfoController extends BaseController {
@Autowired
private SchoolInfoService schoolInfoService;
@Override
- protected BaseService service() {
+ protected BaseService service() {
return schoolInfoService;
}
@@ -49,14 +45,13 @@ public class SchoolInfoController extends BaseController add(@MyRequestBody("schoolInfo") SchoolInfoDto schoolInfoDto) {
String errorMessage = MyCommonUtil.getModelValidationError(schoolInfoDto);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
- SchoolInfo schoolInfo = SchoolInfo.INSTANCE.toModel(schoolInfoDto);
+ SchoolInfo schoolInfo = MyModelUtil.copyTo(schoolInfoDto, SchoolInfo.class);
// 验证关联Id的数据合法性
CallResult callResult = schoolInfoService.verifyRelatedData(schoolInfo, null);
if (!callResult.isSuccess()) {
@@ -79,7 +74,7 @@ public class SchoolInfoController extends BaseController> list(
+ public ResponseResult> list(
@MyRequestBody("schoolInfoFilter") SchoolInfoDto schoolInfoDtoFilter,
@MyRequestBody MyOrderParam orderParam,
@MyRequestBody MyPageParam pageParam) {
if (pageParam != null) {
PageMethod.startPage(pageParam.getPageNum(), pageParam.getPageSize());
}
- SchoolInfo schoolInfoFilter = SchoolInfo.INSTANCE.toModel(schoolInfoDtoFilter);
+ SchoolInfo schoolInfoFilter = MyModelUtil.copyTo(schoolInfoDtoFilter, SchoolInfo.class);
String orderBy = MyOrderParam.buildOrderBy(orderParam, SchoolInfo.class);
List schoolInfoList =
schoolInfoService.getSchoolInfoListWithRelation(schoolInfoFilter, orderBy);
- long totalCount = 0L;
- if (schoolInfoList instanceof Page) {
- totalCount = ((Page