commit：VO支持以及bug修复

orange-demo-multi-service/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<AreaCodeDto, Long> {
+public interface AreaCodeClient extends BaseClient<AreaCodeDto, AreaCodeVo, Long> {
 
     /**
      * 根据主键Id集合，返回给定的数据集合。
@@ -31,7 +31,7 @@ public interface AreaCodeClient extends BaseClient<AreaCodeDto, Long> {
      */
     @Override
     @PostMapping("/areaCode/listByIds")
-    ResponseResult<List<AreaCodeDto>> listByIds(
+    ResponseResult<List<AreaCodeVo>> listByIds(
             @RequestParam("areaCodeIds") Set<Long> areaCodeIds,
             @RequestParam("withDict") Boolean withDict);
 
@@ -44,7 +44,7 @@ public interface AreaCodeClient extends BaseClient<AreaCodeDto, Long> {
      */
     @Override
     @GetMapping("/areaCode/getById")
-    ResponseResult<AreaCodeDto> getById(
+    ResponseResult<AreaCodeVo> getById(
             @RequestParam("areaId") Long areaId,
             @RequestParam("withDict") Boolean withDict);
 
@@ -76,7 +76,7 @@ public interface AreaCodeClient extends BaseClient<AreaCodeDto, Long> {
      */
     @Override
     @PostMapping("/areaCode/listBy")
-    ResponseResult<List<AreaCodeDto>> listBy(@RequestBody MyQueryParam queryParam);
+    ResponseResult<MyPageData<AreaCodeVo>> listBy(@RequestBody MyQueryParam queryParam);
 
     /**
      * 获取远程主对象中符合查询条件的单条数据对象。
@@ -86,7 +86,7 @@ public interface AreaCodeClient extends BaseClient<AreaCodeDto, Long> {
      */
     @Override
     @PostMapping("/areaCode/getBy")
-    ResponseResult<AreaCodeDto> getBy(@RequestBody MyQueryParam queryParam);
+    ResponseResult<AreaCodeVo> getBy(@RequestBody MyQueryParam queryParam);
 
     /**
      * 以id、name的形式返回所有字典数据的列表。
@@ -108,7 +108,7 @@ public interface AreaCodeClient extends BaseClient<AreaCodeDto, Long> {
     @Component
     @Slf4j
     class AreaCodeClientFallbackFactory
-            extends BaseFallbackFactory<AreaCodeDto, Long, AreaCodeClient> implements AreaCodeClient {
+            extends BaseFallbackFactory<AreaCodeDto, AreaCodeVo, Long, AreaCodeClient> implements AreaCodeClient {
 
         @Override
         public ResponseResult<List<Map<String, Object>>> listDict() {

orange-demo-multi-service/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<CourseDto, Long> {
+public interface CourseClient extends BaseClient<CourseDto, CourseVo, Long> {
 
     /**
      * 基于主键的(In-list)条件获取远程数据接口。
@@ -33,7 +34,7 @@ public interface CourseClient extends BaseClient<CourseDto, Long> {
      */
     @Override
     @PostMapping("/course/listByIds")
-    ResponseResult<List<CourseDto>> listByIds(
+    ResponseResult<List<CourseVo>> listByIds(
             @RequestParam("courseIds") Set<Long> courseIds,
             @RequestParam("withDict") Boolean withDict);
 
@@ -46,7 +47,7 @@ public interface CourseClient extends BaseClient<CourseDto, Long> {
      */
     @Override
     @PostMapping("/course/getById")
-    ResponseResult<CourseDto> getById(
+    ResponseResult<CourseVo> getById(
             @RequestParam("courseId") Long courseId,
             @RequestParam("withDict") Boolean withDict);
 
@@ -98,7 +99,7 @@ public interface CourseClient extends BaseClient<CourseDto, Long> {
      */
     @Override
     @PostMapping("/course/listBy")
-    ResponseResult<List<CourseDto>> listBy(@RequestBody MyQueryParam queryParam);
+    ResponseResult<MyPageData<CourseVo>> listBy(@RequestBody MyQueryParam queryParam);
 
     /**
      * 获取远程主对象中符合查询条件的单条数据对象。
@@ -108,7 +109,7 @@ public interface CourseClient extends BaseClient<CourseDto, Long> {
      */
     @Override
     @PostMapping("/course/getBy")
-    ResponseResult<CourseDto> getBy(@RequestBody MyQueryParam queryParam);
+    ResponseResult<CourseVo> getBy(@RequestBody MyQueryParam queryParam);
 
     /**
      * 获取远程主对象中符合查询条件的数据列表。
@@ -119,7 +120,7 @@ public interface CourseClient extends BaseClient<CourseDto, Long> {
      */
     @Override
     @PostMapping("/course/listMapBy")
-    ResponseResult<List<Map<String, Object>>> listMapBy(@RequestBody MyQueryParam queryParam);
+    ResponseResult<MyPageData<Map<String, Object>>> listMapBy(@RequestBody MyQueryParam queryParam);
 
     /**
      * 获取远程主对象中符合查询条件的数据数量。
@@ -144,7 +145,7 @@ public interface CourseClient extends BaseClient<CourseDto, Long> {
     @Component("CourseClassCourseClientFallbackFactory")
     @Slf4j
     class CourseClientFallbackFactory
-            extends BaseFallbackFactory<CourseDto, Long, CourseClient> implements CourseClient {
+            extends BaseFallbackFactory<CourseDto, CourseVo, Long, CourseClient> implements CourseClient {
 
         @Override
         public CourseClient create(Throwable throwable) {

orange-demo-multi-service/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<GradeDto, Integer> {
+public interface GradeClient extends BaseClient<GradeDto, GradeVo, Integer> {
 
     /**
      * 基于主键的(in list)条件获取远程数据接口。
@@ -33,7 +34,7 @@ public interface GradeClient extends BaseClient<GradeDto, Integer> {
      */
     @Override
     @PostMapping("/grade/listByIds")
-    ResponseResult<List<GradeDto>> listByIds(
+    ResponseResult<List<GradeVo>> listByIds(
             @RequestParam("gradeIds") Set<Integer> gradeIds,
             @RequestParam("withDict") Boolean withDict);
 
@@ -46,7 +47,7 @@ public interface GradeClient extends BaseClient<GradeDto, Integer> {
      */
     @Override
     @PostMapping("/grade/getById")
-    ResponseResult<GradeDto> getById(
+    ResponseResult<GradeVo> getById(
             @RequestParam("gradeId") Integer gradeId,
             @RequestParam("withDict") Boolean withDict);
 
@@ -98,7 +99,7 @@ public interface GradeClient extends BaseClient<GradeDto, Integer> {
      */
     @Override
     @PostMapping("/grade/listBy")
-    ResponseResult<List<GradeDto>> listBy(@RequestBody MyQueryParam queryParam);
+    ResponseResult<MyPageData<GradeVo>> listBy(@RequestBody MyQueryParam queryParam);
 
     /**
      * 获取远程主对象中符合查询条件的单条数据对象。
@@ -108,12 +109,12 @@ public interface GradeClient extends BaseClient<GradeDto, Integer> {
      */
     @Override
     @PostMapping("/grade/getBy")
-    ResponseResult<GradeDto> getBy(@RequestBody MyQueryParam queryParam);
+    ResponseResult<GradeVo> getBy(@RequestBody MyQueryParam queryParam);
 
     @Component("CourseClassGradeClientFallbackFactory")
     @Slf4j
     class GradeClientFallbackFactory
-            extends BaseFallbackFactory<GradeDto, Integer, GradeClient> implements GradeClient {
+            extends BaseFallbackFactory<GradeDto, GradeVo, Integer, GradeClient> implements GradeClient {
 
         @Override
         public GradeClient create(Throwable throwable) {

orange-demo-multi-service/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<SchoolInfoDto, Long> {
+public interface SchoolInfoClient extends BaseClient<SchoolInfoDto, SchoolInfoVo, Long> {
 
     /**
      * 基于主键的(In-list)条件获取远程数据接口。
@@ -33,7 +34,7 @@ public interface SchoolInfoClient extends BaseClient<SchoolInfoDto, Long> {
      */
     @Override
     @PostMapping("/schoolInfo/listByIds")
-    ResponseResult<List<SchoolInfoDto>> listByIds(
+    ResponseResult<List<SchoolInfoVo>> listByIds(
             @RequestParam("schoolIds") Set<Long> schoolIds,
             @RequestParam("withDict") Boolean withDict);
 
@@ -46,7 +47,7 @@ public interface SchoolInfoClient extends BaseClient<SchoolInfoDto, Long> {
      */
     @Override
     @PostMapping("/schoolInfo/getById")
-    ResponseResult<SchoolInfoDto> getById(
+    ResponseResult<SchoolInfoVo> getById(
             @RequestParam("schoolId") Long schoolId,
             @RequestParam("withDict") Boolean withDict);
 
@@ -98,7 +99,7 @@ public interface SchoolInfoClient extends BaseClient<SchoolInfoDto, Long> {
      */
     @Override
     @PostMapping("/schoolInfo/listBy")
-    ResponseResult<List<SchoolInfoDto>> listBy(@RequestBody MyQueryParam queryParam);
+    ResponseResult<MyPageData<SchoolInfoVo>> listBy(@RequestBody MyQueryParam queryParam);
 
     /**
      * 获取远程主对象中符合查询条件的单条数据对象。
@@ -108,7 +109,7 @@ public interface SchoolInfoClient extends BaseClient<SchoolInfoDto, Long> {
      */
     @Override
     @PostMapping("/schoolInfo/getBy")
-    ResponseResult<SchoolInfoDto> getBy(@RequestBody MyQueryParam queryParam);
+    ResponseResult<SchoolInfoVo> getBy(@RequestBody MyQueryParam queryParam);
 
     /**
      * 获取远程主对象中符合查询条件的数据列表。
@@ -119,7 +120,7 @@ public interface SchoolInfoClient extends BaseClient<SchoolInfoDto, Long> {
      */
     @Override
     @PostMapping("/schoolInfo/listMapBy")
-    ResponseResult<List<Map<String, Object>>> listMapBy(@RequestBody MyQueryParam queryParam);
+    ResponseResult<MyPageData<Map<String, Object>>> listMapBy(@RequestBody MyQueryParam queryParam);
 
     /**
      * 获取远程主对象中符合查询条件的数据数量。
@@ -144,7 +145,7 @@ public interface SchoolInfoClient extends BaseClient<SchoolInfoDto, Long> {
     @Component("CourseClassSchoolInfoClientFallbackFactory")
     @Slf4j
     class SchoolInfoClientFallbackFactory
-            extends BaseFallbackFactory<SchoolInfoDto, Long, SchoolInfoClient> implements SchoolInfoClient {
+            extends BaseFallbackFactory<SchoolInfoDto, SchoolInfoVo, Long, SchoolInfoClient> implements SchoolInfoClient {
 
         @Override
         public SchoolInfoClient create(Throwable throwable) {

orange-demo-multi-service/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<StudentClassDto, Long> {
+public interface StudentClassClient extends BaseClient<StudentClassDto, StudentClassVo, Long> {
 
     /**
      * 基于主键的(In-list)条件获取远程数据接口。
@@ -33,7 +34,7 @@ public interface StudentClassClient extends BaseClient<StudentClassDto, Long> {
      */
     @Override
     @PostMapping("/studentClass/listByIds")
-    ResponseResult<List<StudentClassDto>> listByIds(
+    ResponseResult<List<StudentClassVo>> listByIds(
             @RequestParam("classIds") Set<Long> classIds,
             @RequestParam("withDict") Boolean withDict);
 
@@ -46,7 +47,7 @@ public interface StudentClassClient extends BaseClient<StudentClassDto, Long> {
      */
     @Override
     @PostMapping("/studentClass/getById")
-    ResponseResult<StudentClassDto> getById(
+    ResponseResult<StudentClassVo> getById(
             @RequestParam("classId") Long classId,
             @RequestParam("withDict") Boolean withDict);
 
@@ -98,7 +99,7 @@ public interface StudentClassClient extends BaseClient<StudentClassDto, Long> {
      */
     @Override
     @PostMapping("/studentClass/listBy")
-    ResponseResult<List<StudentClassDto>> listBy(@RequestBody MyQueryParam queryParam);
+    ResponseResult<MyPageData<StudentClassVo>> listBy(@RequestBody MyQueryParam queryParam);
 
     /**
      * 获取远程主对象中符合查询条件的单条数据对象。
@@ -108,7 +109,7 @@ public interface StudentClassClient extends BaseClient<StudentClassDto, Long> {
      */
     @Override
     @PostMapping("/studentClass/getBy")
-    ResponseResult<StudentClassDto> getBy(@RequestBody MyQueryParam queryParam);
+    ResponseResult<StudentClassVo> getBy(@RequestBody MyQueryParam queryParam);
 
     /**
      * 获取远程主对象中符合查询条件的数据列表。
@@ -119,7 +120,7 @@ public interface StudentClassClient extends BaseClient<StudentClassDto, Long> {
      */
     @Override
     @PostMapping("/studentClass/listMapBy")
-    ResponseResult<List<Map<String, Object>>> listMapBy(@RequestBody MyQueryParam queryParam);
+    ResponseResult<MyPageData<Map<String, Object>>> listMapBy(@RequestBody MyQueryParam queryParam);
 
     /**
      * 获取远程主对象中符合查询条件的数据数量。
@@ -144,7 +145,7 @@ public interface StudentClassClient extends BaseClient<StudentClassDto, Long> {
     @Component("CourseClassStudentClassClientFallbackFactory")
     @Slf4j
     class StudentClassClientFallbackFactory
-            extends BaseFallbackFactory<StudentClassDto, Long, StudentClassClient> implements StudentClassClient {
+            extends BaseFallbackFactory<StudentClassDto, StudentClassVo, Long, StudentClassClient> implements StudentClassClient {
 
         @Override
         public StudentClassClient create(Throwable throwable) {

orange-demo-multi-service/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<StudentDto, Long> {
+public interface StudentClient extends BaseClient<StudentDto, StudentVo, Long> {
 
     /**
      * 基于主键的(In-list)条件获取远程数据接口。
@@ -33,7 +34,7 @@ public interface StudentClient extends BaseClient<StudentDto, Long> {
      */
     @Override
     @PostMapping("/student/listByIds")
-    ResponseResult<List<StudentDto>> listByIds(
+    ResponseResult<List<StudentVo>> listByIds(
             @RequestParam("studentIds") Set<Long> studentIds,
             @RequestParam("withDict") Boolean withDict);
 
@@ -46,7 +47,7 @@ public interface StudentClient extends BaseClient<StudentDto, Long> {
      */
     @Override
     @PostMapping("/student/getById")
-    ResponseResult<StudentDto> getById(
+    ResponseResult<StudentVo> getById(
             @RequestParam("studentId") Long studentId,
             @RequestParam("withDict") Boolean withDict);
 
@@ -98,7 +99,7 @@ public interface StudentClient extends BaseClient<StudentDto, Long> {
      */
     @Override
     @PostMapping("/student/listBy")
-    ResponseResult<List<StudentDto>> listBy(@RequestBody MyQueryParam queryParam);
+    ResponseResult<MyPageData<StudentVo>> listBy(@RequestBody MyQueryParam queryParam);
 
     /**
      * 获取远程主对象中符合查询条件的单条数据对象。
@@ -108,7 +109,7 @@ public interface StudentClient extends BaseClient<StudentDto, Long> {
      */
     @Override
     @PostMapping("/student/getBy")
-    ResponseResult<StudentDto> getBy(@RequestBody MyQueryParam queryParam);
+    ResponseResult<StudentVo> getBy(@RequestBody MyQueryParam queryParam);
 
     /**
      * 获取远程主对象中符合查询条件的数据列表。
@@ -119,7 +120,7 @@ public interface StudentClient extends BaseClient<StudentDto, Long> {
      */
     @Override
     @PostMapping("/student/listMapBy")
-    ResponseResult<List<Map<String, Object>>> listMapBy(@RequestBody MyQueryParam queryParam);
+    ResponseResult<MyPageData<Map<String, Object>>> listMapBy(@RequestBody MyQueryParam queryParam);
 
     /**
      * 获取远程主对象中符合查询条件的数据数量。
@@ -144,7 +145,7 @@ public interface StudentClient extends BaseClient<StudentDto, Long> {
     @Component("CourseClassStudentClientFallbackFactory")
     @Slf4j
     class StudentClientFallbackFactory
-            extends BaseFallbackFactory<StudentDto, Long, StudentClient> implements StudentClient {
+            extends BaseFallbackFactory<StudentDto, StudentVo, Long, StudentClient> implements StudentClient {
 
         @Override
         public StudentClient create(Throwable throwable) {

orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/CourseDto.java

@@ -13,7 +13,6 @@ import javax.validation.constraints.*;
 
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.Map;
 
 /**
  * CourseDto对象。
@@ -142,28 +141,4 @@ public class CourseDto {
      */
     @ApiModelProperty(value = "updateTime 范围过滤结束值(<=)")
     private String updateTimeEnd;
-
-    /**
-     * courseId 的多对多关联表数据对象，数据对应类型为ClassCourseDto。
-     */
-    @ApiModelProperty(hidden = true)
-    private Map<String, Object> classCourse;
-
-    /**
-     * gradeId 字典关联数据。
-     */
-    @ApiModelProperty(hidden = true)
-    private Map<String, Object> gradeIdDictMap;
-
-    /**
-     * difficulty 常量字典关联数据。
-     */
-    @ApiModelProperty(hidden = true)
-    private Map<String, Object> difficultyDictMap;
-
-    /**
-     * subjectId 常量字典关联数据。
-     */
-    @ApiModelProperty(hidden = true)
-    private Map<String, Object> subjectIdDictMap;
 }

orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/SchoolInfoDto.java

@@ -8,7 +8,6 @@ import lombok.Data;
 
 import javax.validation.constraints.*;
 
-import java.util.Map;
 
 /**
  * SchoolInfoDto对象。
@@ -47,16 +46,4 @@ public class SchoolInfoDto {
     @ApiModelProperty(value = "所在城市Id", required = true)
     @NotNull(message = "数据验证失败，所在城市不能为空！")
     private Long cityId;
-
-    /**
-     * provinceId 字典关联数据。
-     */
-    @ApiModelProperty(hidden = true)
-    private Map<String, Object> provinceIdDictMap;
-
-    /**
-     * cityId 字典关联数据。
-     */
-    @ApiModelProperty(hidden = true)
-    private Map<String, Object> cityIdDictMap;
 }

orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/StudentClassDto.java

@@ -11,7 +11,6 @@ import lombok.Data;
 import javax.validation.constraints.*;
 
 import java.util.Date;
-import java.util.Map;
 
 /**
  * StudentClassDto对象。
@@ -77,22 +76,4 @@ public class StudentClassDto {
      */
     @ApiModelProperty(value = "班级创建时间")
     private Date createTime;
-
-    /**
-     * schoolId 字典关联数据。
-     */
-    @ApiModelProperty(hidden = true)
-    private Map<String, Object> schoolIdDictMap;
-
-    /**
-     * leaderId 字典关联数据。
-     */
-    @ApiModelProperty(hidden = true)
-    private Map<String, Object> leaderIdDictMap;
-
-    /**
-     * classLevel 常量字典关联数据。
-     */
-    @ApiModelProperty(hidden = true)
-    private Map<String, Object> classLevelDictMap;
 }

orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/StudentDto.java

@@ -13,7 +13,6 @@ import lombok.Data;
 import javax.validation.constraints.*;
 
 import java.util.Date;
-import java.util.Map;
 
 /**
  * StudentDto对象。
@@ -161,52 +160,4 @@ public class StudentDto {
      */
     @ApiModelProperty(value = "LIKE模糊搜索字符串")
     private String searchString;
-
-    /**
-     * provinceId 字典关联数据。
-     */
-    @ApiModelProperty(hidden = true)
-    private Map<String, Object> provinceIdDictMap;
-
-    /**
-     * cityId 字典关联数据。
-     */
-    @ApiModelProperty(hidden = true)
-    private Map<String, Object> cityIdDictMap;
-
-    /**
-     * districtId 字典关联数据。
-     */
-    @ApiModelProperty(hidden = true)
-    private Map<String, Object> districtIdDictMap;
-
-    /**
-     * gradeId 字典关联数据。
-     */
-    @ApiModelProperty(hidden = true)
-    private Map<String, Object> gradeIdDictMap;
-
-    /**
-     * schoolId 字典关联数据。
-     */
-    @ApiModelProperty(hidden = true)
-    private Map<String, Object> schoolIdDictMap;
-
-    /**
-     * gender 常量字典关联数据。
-     */
-    @ApiModelProperty(hidden = true)
-    private Map<String, Object> genderDictMap;
-
-    /**
-     * experienceLevel 常量字典关联数据。
-     */
-    @ApiModelProperty(hidden = true)
-    private Map<String, Object> experienceLevelDictMap;
-
-    /**
-     * status 常量字典关联数据。
-     */
-    @ApiModelProperty(hidden = true)
-    private Map<String, Object> statusDictMap;
 }

orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/AreaCodeVo.java

@@ -0,0 +1,40 @@
+package com.orange.demo.courseclassinterface.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 行政区划VO。
+ *
+ * @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;
+}

orange-demo-multi-service/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;
+}

orange-demo-multi-service/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;
+}

orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/CourseVo.java

@@ -0,0 +1,116 @@
+package com.orange.demo.courseclassinterface.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * CourseVO对象。
+ *
+ * @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(hidden = true)
+    private Map<String, Object> classCourse;
+
+    /**
+     * gradeId 字典关联数据。
+     */
+    @ApiModelProperty(hidden = true)
+    private Map<String, Object> gradeIdDictMap;
+
+    /**
+     * difficulty 常量字典关联数据。
+     */
+    @ApiModelProperty(hidden = true)
+    private Map<String, Object> difficultyDictMap;
+
+    /**
+     * subjectId 常量字典关联数据。
+     */
+    @ApiModelProperty(hidden = true)
+    private Map<String, Object> subjectIdDictMap;
+}

orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/GradeVo.java

@@ -0,0 +1,28 @@
+package com.orange.demo.courseclassinterface.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * GradeVO对象。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@ApiModel("GradeVO实体对象")
+@Data
+public class GradeVo {
+
+    /**
+     * 主键Id。
+     */
+    @ApiModelProperty(value = "主键Id")
+    private Integer gradeId;
+
+    /**
+     * 年级名称。
+     */
+    @ApiModelProperty(value = "年级名称")
+    private String gradeName;
+}

orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/SchoolInfoVo.java

@@ -0,0 +1,54 @@
+package com.orange.demo.courseclassinterface.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * SchoolInfoVO对象。
+ *
+ * @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(hidden = true)
+    private Map<String, Object> provinceIdDictMap;
+
+    /**
+     * cityId 字典关联数据。
+     */
+    @ApiModelProperty(hidden = true)
+    private Map<String, Object> cityIdDictMap;
+}

orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/StudentClassVo.java

@@ -0,0 +1,85 @@
+package com.orange.demo.courseclassinterface.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * StudentClassVO对象。
+ *
+ * @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(hidden = true)
+    private Map<String, Object> schoolIdDictMap;
+
+    /**
+     * leaderId 字典关联数据。
+     */
+    @ApiModelProperty(hidden = true)
+    private Map<String, Object> leaderIdDictMap;
+
+    /**
+     * classLevel 常量字典关联数据。
+     */
+    @ApiModelProperty(hidden = true)
+    private Map<String, Object> classLevelDictMap;
+}

orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/vo/StudentVo.java

@@ -0,0 +1,157 @@
+package com.orange.demo.courseclassinterface.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * StudentVO对象。
+ *
+ * @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(hidden = true)
+    private Map<String, Object> provinceIdDictMap;
+
+    /**
+     * cityId 字典关联数据。
+     */
+    @ApiModelProperty(hidden = true)
+    private Map<String, Object> cityIdDictMap;
+
+    /**
+     * districtId 字典关联数据。
+     */
+    @ApiModelProperty(hidden = true)
+    private Map<String, Object> districtIdDictMap;
+
+    /**
+     * gradeId 字典关联数据。
+     */
+    @ApiModelProperty(hidden = true)
+    private Map<String, Object> gradeIdDictMap;
+
+    /**
+     * schoolId 字典关联数据。
+     */
+    @ApiModelProperty(hidden = true)
+    private Map<String, Object> schoolIdDictMap;
+
+    /**
+     * gender 常量字典关联数据。
+     */
+    @ApiModelProperty(hidden = true)
+    private Map<String, Object> genderDictMap;
+
+    /**
+     * experienceLevel 常量字典关联数据。
+     */
+    @ApiModelProperty(hidden = true)
+    private Map<String, Object> experienceLevelDictMap;
+
+    /**
+     * status 常量字典关联数据。
+     */
+    @ApiModelProperty(hidden = true)
+    private Map<String, Object> statusDictMap;
+}