commit：集成Minio

orange-demo-multi-service/application/course-class/course-class-service/course-class-service.iml

@@ -40,7 +40,6 @@
     <orderEntry type="library" name="Maven: com.google.guava:guava:28.2-android" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
     <orderEntry type="library" name="Maven: org.checkerframework:checker-compat-qual:2.5.5" level="project" />
     <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
     <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
@@ -64,7 +63,6 @@
     <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.19" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.22" level="project" />
@@ -113,6 +111,18 @@
     <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.8" level="project" />
     <orderEntry type="library" name="Maven: org.jodd:jodd-bean:5.0.13" level="project" />
     <orderEntry type="library" name="Maven: org.jodd:jodd-core:5.0.13" level="project" />
+    <orderEntry type="module" module-name="common-minio" />
+    <orderEntry type="library" name="Maven: io.minio:minio:7.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: xpp3:xpp3:1.1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.12.0" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.10.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.spotbugs:spotbugs-annotations:4.0.0" level="project" />
+    <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
     <orderEntry type="module" module-name="common-sequence" />
     <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.2.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.2.1" level="project" />
@@ -160,7 +170,6 @@
     <orderEntry type="library" name="Maven: com.alibaba.csp:sentinel-cluster-client-default:1.7.1" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-sentinel-datasource:2.2.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.10.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.10.2" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.10.2" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:4.2" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.woodstox:woodstox-core:5.0.3" level="project" />

orange-demo-multi-service/application/course-class/course-class-service/pom.xml

@@ -25,6 +25,11 @@
             <artifactId>common-redis</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.orange.demo</groupId>
+            <artifactId>common-minio</artifactId>
+            <version>1.0.0</version>
+        </dependency>
         <dependency>
             <groupId>com.orange.demo</groupId>
             <artifactId>common-sequence</artifactId>

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/CourseClassApplication.java

@@ -9,7 +9,7 @@ import org.springframework.context.annotation.ComponentScan;
  * course-class服务启动类。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 @SpringCloudApplication
 @EnableFeignClients(basePackages = "com.orange.demo")

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/config/ApplicationConfig.java

@@ -14,7 +14,7 @@ import org.springframework.context.annotation.Configuration;
  *   defaultSomething: defaultValue
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 @Data
 @RefreshScope

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/config/DataSourceConfig.java

@@ -14,7 +14,7 @@ import javax.sql.DataSource;
  * 数据源配置Bean对象。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 @Configuration
 @EnableTransactionManagement

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/AreaCodeController.java

@@ -19,7 +19,7 @@ import java.util.*;
  * 行政区划数据访问接口类。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 @RestController
 @RequestMapping("/areaCode")

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/CourseController.java

@@ -1,7 +1,11 @@
 package com.orange.demo.courseclassservice.controller;
 
-import cn.hutool.core.util.ReflectUtil;
 import cn.jimmyshi.beanquery.BeanQuery;
+import cn.hutool.core.util.ReflectUtil;
+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.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.page.PageMethod;
@@ -10,7 +14,7 @@ import com.orange.demo.courseclassservice.service.*;
 import com.orange.demo.courseclassinterface.dto.*;
 import com.orange.demo.common.core.object.*;
 import com.orange.demo.common.core.util.*;
-import com.orange.demo.common.core.constant.ErrorCodeEnum;
+import com.orange.demo.common.core.constant.*;
 import com.orange.demo.common.core.base.controller.BaseController;
 import com.orange.demo.common.core.base.service.BaseService;
 import com.orange.demo.common.core.annotation.MyRequestBody;
@@ -23,7 +27,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import javax.validation.groups.Default;
 import java.util.*;
 
@@ -31,7 +34,7 @@ import java.util.*;
  * 课程数据操作控制器类。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 @Slf4j
 @RestController
@@ -44,6 +47,8 @@ public class CourseController extends BaseController<Course, CourseDto, Long> {
     private ApplicationConfig appConfig;
     @Autowired
     private SessionCacheHelper cacheHelper;
+    @Autowired
+    private UpDownloaderFactory upDownloaderFactory;
 
     @Override
     protected BaseService<Course, CourseDto, Long> service() {
@@ -209,26 +214,33 @@ public class CourseController extends BaseController<Course, CourseDto, Long> {
             // 如果请求参数中没有包含主键Id，就判断该文件是否为当前session上传的。
             if (courseId == null) {
                 if (!cacheHelper.existSessionUploadFile(filename)) {
-                    response.setStatus(HttpServletResponse.SC_FORBIDDEN);
+                    ResponseResult.output(HttpServletResponse.SC_FORBIDDEN);
                     return;
                 }
             } else {
                 Course course = courseService.getById(courseId);
                 if (course == null) {
-                    response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                    ResponseResult.output(HttpServletResponse.SC_NOT_FOUND);
                     return;
                 }
                 String fieldJsonData = (String) ReflectUtil.getFieldValue(course, fieldName);
                 if (fieldJsonData == null) {
-                    response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+                    ResponseResult.output(HttpServletResponse.SC_BAD_REQUEST);
                     return;
                 }
-                if (!UpDownloadUtil.containFile(fieldJsonData, filename)) {
-                    response.setStatus(HttpServletResponse.SC_FORBIDDEN);
+                if (!BaseUpDownloader.containFile(fieldJsonData, filename)) {
+                    ResponseResult.output(HttpServletResponse.SC_FORBIDDEN);
                     return;
                 }
             }
-            UpDownloadUtil.doDownload(appConfig.getUploadFileBaseDir(),
+            UploadStoreInfo storeInfo = MyModelUtil.getUploadStoreInfo(Course.class, fieldName);
+            if (!storeInfo.isSupportUpload()) {
+                ResponseResult.output(HttpServletResponse.SC_NOT_IMPLEMENTED,
+                        ResponseResult.error(ErrorCodeEnum.INVALID_UPLOAD_FIELD));
+                return;
+            }
+            BaseUpDownloader upDownloader = upDownloaderFactory.get(storeInfo.getStoreType());
+            upDownloader.doDownload(appConfig.getUploadFileBaseDir(),
                     Course.class.getSimpleName(), fieldName, filename, asImage, response);
         } catch (Exception e) {
             response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
@@ -242,20 +254,30 @@ public class CourseController extends BaseController<Course, CourseDto, Long> {
      * @param fieldName  上传文件名。
      * @param asImage    是否作为图片上传。如果是图片，今后下载的时候无需权限验证。否则就是附件上传，下载时需要权限验证。
      * @param uploadFile 上传文件对象。
-     * @param response   Http 应答对象。
-     * @throws IOException 文件读写错误。
      */
     @PostMapping("/upload")
     public void upload(
             @RequestParam String fieldName,
             @RequestParam Boolean asImage,
-            @RequestParam("uploadFile") MultipartFile uploadFile,
-            HttpServletResponse response) throws IOException {
-        String filename = UpDownloadUtil.doUpload(appConfig.getUploadFileBaseDir(), appConfig.getServiceContextPath(),
-                Course.class.getSimpleName(), fieldName, asImage, uploadFile, response);
-        if (filename != null) {
-            cacheHelper.putSessionUploadFile(filename);
+            @RequestParam("uploadFile") MultipartFile uploadFile) throws Exception {
+        UploadStoreInfo storeInfo = MyModelUtil.getUploadStoreInfo(Course.class, fieldName);
+        // 这里就会判断参数中指定的字段，是否支持上传操作。
+        if (!storeInfo.isSupportUpload()) {
+            ResponseResult.output(HttpServletResponse.SC_FORBIDDEN,
+                    ResponseResult.error(ErrorCodeEnum.INVALID_UPLOAD_FIELD));
+            return;
         }
+        // 根据字段注解中的存储类型，通过工厂方法获取匹配的上传下载实现类，从而解耦。
+        BaseUpDownloader upDownloader = upDownloaderFactory.get(storeInfo.getStoreType());
+        UploadResponseInfo responseInfo = upDownloader.doUpload(appConfig.getServiceContextPath(),
+                appConfig.getUploadFileBaseDir(), Course.class.getSimpleName(), fieldName, asImage, uploadFile);
+        if (responseInfo.getUploadFailed()) {
+            ResponseResult.output(HttpServletResponse.SC_FORBIDDEN,
+                    ResponseResult.error(ErrorCodeEnum.UPLOAD_FAILED, responseInfo.getErrorMessage()));
+            return;
+        }
+        cacheHelper.putSessionUploadFile(responseInfo.getFilename());
+        ResponseResult.output(ResponseResult.success(responseInfo));
     }
 
     /**

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/GradeController.java

@@ -25,7 +25,7 @@ import java.util.*;
  * 年级操作控制器类。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 @Slf4j
 @RestController

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/SchoolInfoController.java

@@ -9,7 +9,7 @@ import com.orange.demo.courseclassservice.service.*;
 import com.orange.demo.courseclassinterface.dto.*;
 import com.orange.demo.common.core.object.*;
 import com.orange.demo.common.core.util.*;
-import com.orange.demo.common.core.constant.ErrorCodeEnum;
+import com.orange.demo.common.core.constant.*;
 import com.orange.demo.common.core.base.controller.BaseController;
 import com.orange.demo.common.core.base.service.BaseService;
 import com.orange.demo.common.core.annotation.MyRequestBody;
@@ -25,7 +25,7 @@ import java.util.*;
  * 校区数据操作控制器类。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 @Slf4j
 @RestController

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/StudentClassController.java

@@ -8,7 +8,7 @@ import com.orange.demo.courseclassservice.service.*;
 import com.orange.demo.courseclassinterface.dto.*;
 import com.orange.demo.common.core.object.*;
 import com.orange.demo.common.core.util.*;
-import com.orange.demo.common.core.constant.ErrorCodeEnum;
+import com.orange.demo.common.core.constant.*;
 import com.orange.demo.common.core.base.controller.BaseController;
 import com.orange.demo.common.core.base.service.BaseService;
 import com.orange.demo.common.core.annotation.MyRequestBody;
@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
  * 班级数据操作控制器类。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 @Slf4j
 @RestController

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/StudentController.java

@@ -9,7 +9,7 @@ import com.orange.demo.courseclassservice.service.*;
 import com.orange.demo.courseclassinterface.dto.*;
 import com.orange.demo.common.core.object.*;
 import com.orange.demo.common.core.util.*;
-import com.orange.demo.common.core.constant.ErrorCodeEnum;
+import com.orange.demo.common.core.constant.*;
 import com.orange.demo.common.core.base.controller.BaseController;
 import com.orange.demo.common.core.base.service.BaseService;
 import com.orange.demo.common.core.annotation.MyRequestBody;
@@ -25,7 +25,7 @@ import java.util.*;
  * 学生数据操作控制器类。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 @Slf4j
 @RestController

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/AreaCodeMapper.java

@@ -7,7 +7,7 @@ import com.orange.demo.courseclassservice.model.AreaCode;
  * 行政区划数据操作访问接口。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 public interface AreaCodeMapper extends BaseDaoMapper<AreaCode> {
 }

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/ClassCourseMapper.java

@@ -7,7 +7,7 @@ import com.orange.demo.courseclassservice.model.ClassCourse;
  * 数据操作访问接口。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 public interface ClassCourseMapper extends BaseDaoMapper<ClassCourse> {
 }

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/ClassStudentMapper.java

@@ -7,7 +7,7 @@ import com.orange.demo.courseclassservice.model.ClassStudent;
  * 数据操作访问接口。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 public interface ClassStudentMapper extends BaseDaoMapper<ClassStudent> {
 }

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/CourseMapper.java

@@ -10,7 +10,7 @@ import java.util.*;
  * 课程数据数据操作访问接口。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 public interface CourseMapper extends BaseDaoMapper<Course> {
 

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/GradeMapper.java

@@ -7,7 +7,7 @@ import com.orange.demo.courseclassservice.model.Grade;
  * 年级数据操作访问接口。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 public interface GradeMapper extends BaseDaoMapper<Grade> {
 }

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/MaterialEditionMapper.java

@@ -7,7 +7,7 @@ import com.orange.demo.courseclassservice.model.MaterialEdition;
  * 数据操作访问接口。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 public interface MaterialEditionMapper extends BaseDaoMapper<MaterialEdition> {
 }

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/SchoolInfoMapper.java

@@ -10,7 +10,7 @@ import java.util.*;
  * 校区数据数据操作访问接口。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 public interface SchoolInfoMapper extends BaseDaoMapper<SchoolInfo> {
 

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/StudentClassMapper.java

@@ -10,7 +10,7 @@ import java.util.*;
  * 班级数据数据操作访问接口。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 public interface StudentClassMapper extends BaseDaoMapper<StudentClass> {
 

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/StudentMapper.java

@@ -10,7 +10,7 @@ import java.util.*;
  * 学生数据数据操作访问接口。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 public interface StudentMapper extends BaseDaoMapper<Student> {
 

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/mapper/CourseMapper.xml

@@ -16,6 +16,11 @@
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
     </resultMap>
 
+    <resultMap id="BaseResultMapWithClassCourse" type="com.orange.demo.courseclassservice.model.Course" extends="BaseResultMap">
+        <association property="classCourse" column="course_id" foreignColumn="course_id"
+                     notNullColumn="course_id" resultMap="com.orange.demo.courseclassservice.dao.ClassCourseMapper.BaseResultMap" />
+    </resultMap>
+
     <sql id="filterRef">
         <if test="courseFilter != null">
             <if test="courseFilter.courseName != null and courseFilter.courseName != ''">
@@ -81,9 +86,10 @@
         </where>
     </select>
 
-    <select id="getCourseListByClassId" resultMap="BaseResultMap">
+    <select id="getCourseListByClassId" resultMap="BaseResultMapWithClassCourse">
         SELECT
-            zz_course.*
+            zz_course.*,
+            zz_class_course.*
         FROM
             zz_course,
             zz_class_course

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/AreaCode.java

@@ -8,7 +8,7 @@ import javax.persistence.*;
  * 行政区划实体对象。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 @Data
 @Table(name = "zz_area_code")

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassCourse.java

@@ -8,7 +8,7 @@ import javax.validation.constraints.*;
  * ClassCourse实体对象。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 @Data
 @Table(name = "zz_class_course")
@@ -33,6 +33,7 @@ public class ClassCourse {
     /**
      * 课程顺序(数值越小越靠前)。
      */
+    @NotNull(message = "数据验证失败，课程顺序(数值越小越靠前)不能为空！")
     @Column(name = "course_order")
     private Integer courseOrder;
 }

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassStudent.java

@@ -8,7 +8,7 @@ import javax.validation.constraints.*;
  * ClassStudent实体对象。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 @Data
 @Table(name = "zz_class_student")

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Course.java

@@ -2,6 +2,8 @@ package com.orange.demo.courseclassservice.model;
 
 import com.orange.demo.courseclassinterface.constant.CourseDifficult;
 import com.orange.demo.application.common.constant.Subject;
+import com.orange.demo.common.core.upload.UploadStoreTypeEnum;
+import com.orange.demo.common.core.annotation.UploadFlagColumn;
 import com.orange.demo.common.core.annotation.RelationDict;
 import com.orange.demo.common.core.annotation.RelationConstDict;
 import com.orange.demo.common.core.base.mapper.BaseModelMapper;
@@ -21,7 +23,7 @@ import java.util.Map;
  * Course实体对象。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 @Data
 @Table(name = "zz_course")
@@ -85,6 +87,7 @@ public class Course {
     /**
      * 多张课程图片地址。
      */
+    @UploadFlagColumn(storeType = UploadStoreTypeEnum.MINIO_SYSTEM)
     @NotBlank(message = "数据验证失败，课程图片不能为空！")
     @Column(name = "picture_url")
     private String pictureUrl;
@@ -143,6 +146,12 @@ public class Course {
     @Transient
     private String updateTimeEnd;
 
+    /**
+     * courseId 的多对多关联表数据对象。
+     */
+    @Transient
+    private ClassCourse classCourse;
+
     @RelationDict(
             masterIdField = "gradeId",
             slaveServiceName = "gradeService",
@@ -172,6 +181,7 @@ public class Course {
          * @param courseDto 域对象。
          * @return 实体对象。
          */
+        @Mapping(target = "classCourse", expression = "java(mapToBean(courseDto.getClassCourse(), com.orange.demo.courseclassservice.model.ClassCourse.class))")
         @Override
         Course toModel(CourseDto courseDto);
         /**
@@ -180,6 +190,7 @@ public class Course {
          * @param course 实体对象。
          * @return 域对象。
          */
+        @Mapping(target = "classCourse", expression = "java(beanToMap(course.getClassCourse(), false))")
         @Override
         CourseDto fromModel(Course course);
     }

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Grade.java

@@ -10,7 +10,7 @@ import javax.validation.constraints.*;
  * Grade实体对象。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 @Data
 @Table(name = "zz_grade")

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/MaterialEdition.java

@@ -8,7 +8,7 @@ import javax.validation.constraints.*;
  * MaterialEdition实体对象。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 @Data
 @Table(name = "zz_material_edition")

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/SchoolInfo.java

@@ -15,7 +15,7 @@ import java.util.Map;
  * SchoolInfo实体对象。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 @Data
 @Table(name = "zz_school_info")

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Student.java

@@ -21,7 +21,7 @@ import java.util.Map;
  * Student实体对象。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 @Data
 @Table(name = "zz_student")

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/StudentClass.java

@@ -21,7 +21,7 @@ import java.util.Map;
  * StudentClass实体对象。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 @Data
 @Table(name = "zz_class")

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/AreaCodeService.java

@@ -17,7 +17,7 @@ import java.util.List;
  * 行政区划的Service类。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 @Service
 public class AreaCodeService extends BaseDictService<AreaCode, AreaCodeDto, Long> {

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/CourseService.java

@@ -21,7 +21,7 @@ import java.util.*;
  * 课程数据数据操作服务类。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 @Service
 public class CourseService extends BaseService<Course, CourseDto, Long> {

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/GradeService.java

@@ -18,7 +18,7 @@ import javax.annotation.PostConstruct;
  * 年级数据操作服务类。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 @Service
 public class GradeService extends BaseDictService<Grade, GradeDto, Integer> {

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/SchoolInfoService.java

@@ -20,7 +20,7 @@ import java.util.*;
  * 校区数据数据操作服务类。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 @Service
 public class SchoolInfoService extends BaseService<SchoolInfo, SchoolInfoDto, Long> {

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/StudentClassService.java

@@ -23,7 +23,7 @@ import java.util.*;
  * 班级数据数据操作服务类。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 @Service
 public class StudentClassService extends BaseService<StudentClass, StudentClassDto, Long> {

orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/StudentService.java

@@ -21,7 +21,7 @@ import java.util.*;
  * 学生数据数据操作服务类。
  *
  * @author Jerry
- * @date 2020-09-27
+ * @date 2020-10-19
  */
 @Service
 public class StudentService extends BaseService<Student, StudentDto, Long> {