同步到1.7版本

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

@@ -4,6 +4,7 @@ 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.IBaseDictService;
+import com.orange.demo.common.core.annotation.MyRequestBody;
 import com.orange.demo.common.core.util.MyModelUtil;
 import com.orange.demo.common.core.object.*;
 import com.orange.demo.courseclassapi.vo.AreaCodeVo;
@@ -62,6 +63,20 @@ public class AreaCodeController extends BaseController<AreaCode, AreaCodeVo, Lon
                 "parentId as parentId", "areaId as id", "areaName as name").executeFrom(resultList));
     }
 
+    /**
+     * 根据字典Id集合，获取查询后的字典数据。
+     *
+     * @param dictIds 字典Id集合。
+     * @return 字典形式的行政区划列表。
+     */
+    @PostMapping("/listDictByIds")
+    public ResponseResult<List<Map<String, Object>>> listDictByIds(
+            @MyRequestBody(elementType = Long.class) List<Long> dictIds) {
+        List<AreaCode> resultList = areaCodeService.getInList(new HashSet<>(dictIds));
+        return ResponseResult.success(BeanQuery.select(
+                "parentId as parentId", "areaId as id", "areaName as name").executeFrom(resultList));
+    }
+
     /**
      * 查看单条记录的详情信息，如果当前主对象包含字典和一对一关联，也都同时返回。
      *

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

@@ -64,15 +64,15 @@ public class CourseController extends BaseController<Course, CourseVo, Long> {
      * @return 应答结果对象，包含新增对象主键Id。
      */
     @ApiOperationSupport(ignoreParameters = {
-            "course.courseId",
-            "course.priceStart",
-            "course.priceEnd",
-            "course.classHourStart",
-            "course.classHourEnd",
-            "course.updateTimeStart",
-            "course.updateTimeEnd"})
+            "courseDto.courseId",
+            "courseDto.priceStart",
+            "courseDto.priceEnd",
+            "courseDto.classHourStart",
+            "courseDto.classHourEnd",
+            "courseDto.updateTimeStart",
+            "courseDto.updateTimeEnd"})
     @PostMapping("/add")
-    public ResponseResult<Long> add(@MyRequestBody("course") CourseDto courseDto) {
+    public ResponseResult<Long> add(@MyRequestBody CourseDto courseDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(courseDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -95,14 +95,14 @@ public class CourseController extends BaseController<Course, CourseVo, Long> {
      * @return 应答结果对象。
      */
     @ApiOperationSupport(ignoreParameters = {
-            "course.priceStart",
-            "course.priceEnd",
-            "course.classHourStart",
-            "course.classHourEnd",
-            "course.updateTimeStart",
-            "course.updateTimeEnd"})
+            "CourseDto.priceStart",
+            "CourseDto.priceEnd",
+            "CourseDto.classHourStart",
+            "CourseDto.classHourEnd",
+            "CourseDto.updateTimeStart",
+            "CourseDto.updateTimeEnd"})
     @PostMapping("/update")
-    public ResponseResult<Void> update(@MyRequestBody("course") CourseDto courseDto) {
+    public ResponseResult<Void> update(@MyRequestBody CourseDto courseDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(courseDto, Default.class, UpdateGroup.class);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -162,7 +162,7 @@ public class CourseController extends BaseController<Course, CourseVo, Long> {
      */
     @PostMapping("/list")
     public ResponseResult<MyPageData<CourseVo>> list(
-            @MyRequestBody("courseFilter") CourseDto courseDtoFilter,
+            @MyRequestBody CourseDto courseDtoFilter,
             @MyRequestBody MyOrderParam orderParam,
             @MyRequestBody MyPageParam pageParam) {
         if (pageParam != null) {
@@ -302,6 +302,20 @@ public class CourseController extends BaseController<Course, CourseVo, Long> {
                 BeanQuery.select("courseId as id", "courseName as name").executeFrom(resultList));
     }
 
+    /**
+     * 根据字典Id集合，获取查询后的字典数据。
+     *
+     * @param dictIds 字典Id集合。
+     * @return 应答结果对象，包含字典形式的数据集合。
+     */
+    @PostMapping("/listDictByIds")
+    public ResponseResult<List<Map<String, Object>>> listDictByIds(
+            @MyRequestBody(elementType = Long.class) List<Long> dictIds) {
+        List<Course> resultList = courseService.getInList(new HashSet<>(dictIds));
+        return ResponseResult.success(
+                BeanQuery.select("courseId as id", "courseName as name").executeFrom(resultList));
+    }
+
     /**
      * 根据主键Id集合，获取数据对象集合。仅限于微服务间远程接口调用。
      *

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

@@ -9,11 +9,11 @@ import lombok.extern.slf4j.Slf4j;
 import com.orange.demo.common.core.base.controller.BaseController;
 import com.orange.demo.common.core.base.service.IBaseDictService;
 import com.orange.demo.common.core.object.*;
+import com.orange.demo.common.core.annotation.MyRequestBody;
 import com.orange.demo.common.core.constant.ErrorCodeEnum;
 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.courseclassapi.dto.GradeDto;
 import com.orange.demo.courseclassapi.vo.GradeVo;
 import com.orange.demo.courseclassservice.model.Grade;
@@ -51,9 +51,9 @@ public class GradeController extends BaseController<Grade, GradeVo, Integer> {
      * @param gradeDto 新增对象。
      * @return 应答结果对象，包含新增对象主键Id。
      */
-    @ApiOperationSupport(ignoreParameters = {"grade.gradeId"})
+    @ApiOperationSupport(ignoreParameters = {"gradeDto.gradeId"})
     @PostMapping("/add")
-    public ResponseResult<Integer> add(@MyRequestBody("grade") GradeDto gradeDto) {
+    public ResponseResult<Integer> add(@MyRequestBody GradeDto gradeDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(gradeDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -70,7 +70,7 @@ public class GradeController extends BaseController<Grade, GradeVo, Integer> {
      * @return 应答结果对象。
      */
     @PostMapping("/update")
-    public ResponseResult<Void> update(@MyRequestBody("grade") GradeDto gradeDto) {
+    public ResponseResult<Void> update(@MyRequestBody GradeDto gradeDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(gradeDto, Default.class, UpdateGroup.class);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -155,6 +155,20 @@ public class GradeController extends BaseController<Grade, GradeVo, Integer> {
         return ResponseResult.success(jsonObject);
     }
 
+    /**
+     * 根据字典Id集合，获取查询后的字典数据。
+     *
+     * @param dictIds 字典Id集合。
+     * @return 应答结果对象，包含字典形式的数据集合。
+     */
+    @PostMapping("/listDictByIds")
+    public ResponseResult<List<Map<String, Object>>> listDictByIds(
+            @MyRequestBody(elementType = Integer.class) List<Integer> dictIds) {
+        List<Grade> resultList = gradeService.getInList(new HashSet<>(dictIds));
+        return ResponseResult.success(BeanQuery.select(
+                "gradeId as id", "gradeName as name").executeFrom(resultList));
+    }
+
     /**
      * 根据主键Id集合，获取数据对象集合。仅限于微服务间远程接口调用。
      *

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

@@ -48,9 +48,9 @@ public class SchoolInfoController extends BaseController<SchoolInfo, SchoolInfoV
      * @param schoolInfoDto 新增对象。
      * @return 应答结果对象，包含新增对象主键Id。
      */
-    @ApiOperationSupport(ignoreParameters = {"schoolInfo.schoolId"})
+    @ApiOperationSupport(ignoreParameters = {"schoolInfoDto.schoolId"})
     @PostMapping("/add")
-    public ResponseResult<Long> add(@MyRequestBody("schoolInfo") SchoolInfoDto schoolInfoDto) {
+    public ResponseResult<Long> add(@MyRequestBody SchoolInfoDto schoolInfoDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(schoolInfoDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -73,7 +73,7 @@ public class SchoolInfoController extends BaseController<SchoolInfo, SchoolInfoV
      * @return 应答结果对象。
      */
     @PostMapping("/update")
-    public ResponseResult<Void> update(@MyRequestBody("schoolInfo") SchoolInfoDto schoolInfoDto) {
+    public ResponseResult<Void> update(@MyRequestBody SchoolInfoDto schoolInfoDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(schoolInfoDto, Default.class, UpdateGroup.class);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -133,7 +133,7 @@ public class SchoolInfoController extends BaseController<SchoolInfo, SchoolInfoV
      */
     @PostMapping("/list")
     public ResponseResult<MyPageData<SchoolInfoVo>> list(
-            @MyRequestBody("schoolInfoFilter") SchoolInfoDto schoolInfoDtoFilter,
+            @MyRequestBody SchoolInfoDto schoolInfoDtoFilter,
             @MyRequestBody MyOrderParam orderParam,
             @MyRequestBody MyPageParam pageParam) {
         if (pageParam != null) {
@@ -180,6 +180,20 @@ public class SchoolInfoController extends BaseController<SchoolInfo, SchoolInfoV
                 BeanQuery.select("schoolId as id", "schoolName as name").executeFrom(resultList));
     }
 
+    /**
+     * 根据字典Id集合，获取查询后的字典数据。
+     *
+     * @param dictIds 字典Id集合。
+     * @return 应答结果对象，包含字典形式的数据集合。
+     */
+    @PostMapping("/listDictByIds")
+    public ResponseResult<List<Map<String, Object>>> listDictByIds(
+            @MyRequestBody(elementType = Long.class) List<Long> dictIds) {
+        List<SchoolInfo> resultList = schoolInfoService.getInList(new HashSet<>(dictIds));
+        return ResponseResult.success(
+                BeanQuery.select("schoolId as id", "schoolName as name").executeFrom(resultList));
+    }
+
     /**
      * 根据主键Id集合，获取数据对象集合。仅限于微服务间远程接口调用。
      *

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

@@ -52,9 +52,9 @@ public class StudentClassController extends BaseController<StudentClass, Student
      * @param studentClassDto 新增对象。
      * @return 应答结果对象，包含新增对象主键Id。
      */
-    @ApiOperationSupport(ignoreParameters = {"studentClass.classId"})
+    @ApiOperationSupport(ignoreParameters = {"studentClassDto.classId"})
     @PostMapping("/add")
-    public ResponseResult<Long> add(@MyRequestBody("studentClass") StudentClassDto studentClassDto) {
+    public ResponseResult<Long> add(@MyRequestBody StudentClassDto studentClassDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(studentClassDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -77,7 +77,7 @@ public class StudentClassController extends BaseController<StudentClass, Student
      * @return 应答结果对象。
      */
     @PostMapping("/update")
-    public ResponseResult<Void> update(@MyRequestBody("studentClass") StudentClassDto studentClassDto) {
+    public ResponseResult<Void> update(@MyRequestBody StudentClassDto studentClassDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(studentClassDto, Default.class, UpdateGroup.class);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -137,7 +137,7 @@ public class StudentClassController extends BaseController<StudentClass, Student
      */
     @PostMapping("/list")
     public ResponseResult<MyPageData<StudentClassVo>> list(
-            @MyRequestBody("studentClassFilter") StudentClassDto studentClassDtoFilter,
+            @MyRequestBody StudentClassDto studentClassDtoFilter,
             @MyRequestBody MyOrderParam orderParam,
             @MyRequestBody MyPageParam pageParam) {
         if (pageParam != null) {
@@ -183,7 +183,7 @@ public class StudentClassController extends BaseController<StudentClass, Student
     @PostMapping("/listNotInClassCourse")
     public ResponseResult<MyPageData<CourseVo>> listNotInClassCourse(
             @MyRequestBody Long classId,
-            @MyRequestBody("courseFilter") CourseDto courseDtoFilter,
+            @MyRequestBody CourseDto courseDtoFilter,
             @MyRequestBody MyOrderParam orderParam,
             @MyRequestBody MyPageParam pageParam) {
         ResponseResult<Void> verifyResult = this.doClassCourseVerify(classId);
@@ -212,7 +212,7 @@ public class StudentClassController extends BaseController<StudentClass, Student
     @PostMapping("/listClassCourse")
     public ResponseResult<MyPageData<CourseVo>> listClassCourse(
             @MyRequestBody Long classId,
-            @MyRequestBody("courseFilter") CourseDto courseDtoFilter,
+            @MyRequestBody CourseDto courseDtoFilter,
             @MyRequestBody MyOrderParam orderParam,
             @MyRequestBody MyPageParam pageParam) {
         ResponseResult<Void> verifyResult = this.doClassCourseVerify(classId);
@@ -249,7 +249,7 @@ public class StudentClassController extends BaseController<StudentClass, Student
     @PostMapping("/addClassCourse")
     public ResponseResult<Void> addClassCourse(
             @MyRequestBody Long classId,
-            @MyRequestBody(value = "classCourseList", elementType = ClassCourseDto.class) List<ClassCourseDto> classCourseDtoList) {
+            @MyRequestBody(elementType = ClassCourseDto.class) List<ClassCourseDto> classCourseDtoList) {
         if (MyCommonUtil.existBlankArgument(classId, classCourseDtoList)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
@@ -279,7 +279,7 @@ public class StudentClassController extends BaseController<StudentClass, Student
      */
     @PostMapping("/updateClassCourse")
     public ResponseResult<Void> updateClassCourse(
-            @MyRequestBody("classCourse") ClassCourseDto classCourseDto) {
+            @MyRequestBody ClassCourseDto classCourseDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(classCourseDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -344,7 +344,7 @@ public class StudentClassController extends BaseController<StudentClass, Student
     @PostMapping("/listNotInClassStudent")
     public ResponseResult<MyPageData<StudentVo>> listNotInClassStudent(
             @MyRequestBody Long classId,
-            @MyRequestBody("studentFilter") StudentDto studentDtoFilter,
+            @MyRequestBody StudentDto studentDtoFilter,
             @MyRequestBody MyOrderParam orderParam,
             @MyRequestBody MyPageParam pageParam) {
         ResponseResult<Void> verifyResult = this.doClassStudentVerify(classId);
@@ -373,7 +373,7 @@ public class StudentClassController extends BaseController<StudentClass, Student
     @PostMapping("/listClassStudent")
     public ResponseResult<MyPageData<StudentVo>> listClassStudent(
             @MyRequestBody Long classId,
-            @MyRequestBody("studentFilter") StudentDto studentDtoFilter,
+            @MyRequestBody StudentDto studentDtoFilter,
             @MyRequestBody MyOrderParam orderParam,
             @MyRequestBody MyPageParam pageParam) {
         ResponseResult<Void> verifyResult = this.doClassStudentVerify(classId);
@@ -410,7 +410,7 @@ public class StudentClassController extends BaseController<StudentClass, Student
     @PostMapping("/addClassStudent")
     public ResponseResult<Void> addClassStudent(
             @MyRequestBody Long classId,
-            @MyRequestBody(value = "classStudentList", elementType = ClassStudentDto.class) List<ClassStudentDto> classStudentDtoList) {
+            @MyRequestBody(elementType = ClassStudentDto.class) List<ClassStudentDto> classStudentDtoList) {
         if (MyCommonUtil.existBlankArgument(classId, classStudentDtoList)) {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }

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

@@ -49,14 +49,14 @@ public class StudentController extends BaseController<Student, StudentVo, Long>
      * @return 应答结果对象，包含新增对象主键Id。
      */
     @ApiOperationSupport(ignoreParameters = {
-            "student.studentId",
-            "student.searchString",
-            "student.birthdayStart",
-            "student.birthdayEnd",
-            "student.registerTimeStart",
-            "student.registerTimeEnd"})
+            "studentDto.studentId",
+            "studentDto.searchString",
+            "studentDto.birthdayStart",
+            "studentDto.birthdayEnd",
+            "studentDto.registerTimeStart",
+            "studentDto.registerTimeEnd"})
     @PostMapping("/add")
-    public ResponseResult<Long> add(@MyRequestBody("student") StudentDto studentDto) {
+    public ResponseResult<Long> add(@MyRequestBody StudentDto studentDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(studentDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -79,13 +79,13 @@ public class StudentController extends BaseController<Student, StudentVo, Long>
      * @return 应答结果对象。
      */
     @ApiOperationSupport(ignoreParameters = {
-            "student.searchString",
-            "student.birthdayStart",
-            "student.birthdayEnd",
-            "student.registerTimeStart",
-            "student.registerTimeEnd"})
+            "StudentDto.searchString",
+            "StudentDto.birthdayStart",
+            "StudentDto.birthdayEnd",
+            "StudentDto.registerTimeStart",
+            "StudentDto.registerTimeEnd"})
     @PostMapping("/update")
-    public ResponseResult<Void> update(@MyRequestBody("student") StudentDto studentDto) {
+    public ResponseResult<Void> update(@MyRequestBody StudentDto studentDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(studentDto, Default.class, UpdateGroup.class);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -145,7 +145,7 @@ public class StudentController extends BaseController<Student, StudentVo, Long>
      */
     @PostMapping("/list")
     public ResponseResult<MyPageData<StudentVo>> list(
-            @MyRequestBody("studentFilter") StudentDto studentDtoFilter,
+            @MyRequestBody StudentDto studentDtoFilter,
             @MyRequestBody MyOrderParam orderParam,
             @MyRequestBody MyPageParam pageParam) {
         if (pageParam != null) {
@@ -192,6 +192,20 @@ public class StudentController extends BaseController<Student, StudentVo, Long>
                 BeanQuery.select("studentId as id", "studentName as name").executeFrom(resultList));
     }
 
+    /**
+     * 根据字典Id集合，获取查询后的字典数据。
+     *
+     * @param dictIds 字典Id集合。
+     * @return 应答结果对象，包含字典形式的数据集合。
+     */
+    @PostMapping("/listDictByIds")
+    public ResponseResult<List<Map<String, Object>>> listDictByIds(
+            @MyRequestBody(elementType = Long.class) List<Long> dictIds) {
+        List<Student> resultList = studentService.getInList(new HashSet<>(dictIds));
+        return ResponseResult.success(
+                BeanQuery.select("studentId as id", "studentName as name").executeFrom(resultList));
+    }
+
     /**
      * 根据主键Id集合，获取数据对象集合。仅限于微服务间远程接口调用。
      *

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

@@ -94,8 +94,7 @@ public interface CourseService extends IBaseService<Course, Long> {
      * @param orderBy        排序参数。
      * @return 查询结果集。
      */
-    List<Course> getNotInCourseListByClassId(
-            Long classId, Course filter, String orderBy);
+    List<Course> getNotInCourseListByClassId(Long classId, Course filter, String orderBy);
 
     /**
      * 在多对多关系中，当前Service的数据表为从表，返回与指定主表主键Id存在对多对关系的列表。
@@ -105,8 +104,7 @@ public interface CourseService extends IBaseService<Course, Long> {
      * @param orderBy 排序参数。
      * @return 查询结果集。
      */
-    List<Course> getCourseListByClassId(
-            Long classId, Course filter, String orderBy);
+    List<Course> getCourseListByClassId(Long classId, Course filter, String orderBy);
 
     /**
      * 根据最新对象和原有对象的数据对比，判断关联的字典数据和多对一主表数据是否都是合法数据。

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

@@ -94,8 +94,7 @@ public interface StudentService extends IBaseService<Student, Long> {
      * @param orderBy        排序参数。
      * @return 查询结果集。
      */
-    List<Student> getNotInStudentListByClassId(
-            Long classId, Student filter, String orderBy);
+    List<Student> getNotInStudentListByClassId(Long classId, Student filter, String orderBy);
 
     /**
      * 在多对多关系中，当前Service的数据表为从表，返回与指定主表主键Id存在对多对关系的列表。
@@ -105,8 +104,7 @@ public interface StudentService extends IBaseService<Student, Long> {
      * @param orderBy 排序参数。
      * @return 查询结果集。
      */
-    List<Student> getStudentListByClassId(
-            Long classId, Student filter, String orderBy);
+    List<Student> getStudentListByClassId(Long classId, Student filter, String orderBy);
 
     /**
      * 根据最新对象和原有对象的数据对比，判断关联的字典数据和多对一主表数据是否都是合法数据。

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

@@ -10,6 +10,7 @@ import com.orange.demo.common.core.object.TokenData;
 import com.orange.demo.common.core.base.dao.BaseDaoMapper;
 import com.orange.demo.common.core.base.service.BaseService;
 import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
+import lombok.extern.slf4j.Slf4j;
 import com.github.pagehelper.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -23,6 +24,7 @@ import java.util.*;
  * @author Jerry
  * @date 2020-08-08
  */
+@Slf4j
 @Service("courseService")
 public class CourseServiceImpl extends BaseService<Course, Long> implements CourseService {
 
@@ -144,6 +146,8 @@ public class CourseServiceImpl extends BaseService<Course, Long> implements Cour
     @Override
     public List<Course> getCourseListWithRelation(Course filter, String orderBy) {
         List<Course> resultList = courseMapper.getCourseList(null, null, filter, orderBy);
+        // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
+        // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
         int batchSize = resultList instanceof Page ? 0 : 1000;
         this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
         return resultList;
@@ -165,6 +169,8 @@ public class CourseServiceImpl extends BaseService<Course, Long> implements Cour
             String inFilterField, Set<M> inFilterValues, Course filter, String orderBy) {
         List<Course> resultList =
                 courseMapper.getCourseList(inFilterField, inFilterValues, filter, orderBy);
+        // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
+        // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
         int batchSize = resultList instanceof Page ? 0 : 1000;
         this.buildRelationForDataList(resultList, MyRelationParam.dictOnly(), batchSize);
         return resultList;
@@ -179,8 +185,7 @@ public class CourseServiceImpl extends BaseService<Course, Long> implements Cour
      * @return 查询结果集。
      */
     @Override
-    public List<Course> getNotInCourseListByClassId(
-            Long classId, Course filter, String orderBy) {
+    public List<Course> getNotInCourseListByClassId(Long classId, Course filter, String orderBy) {
         List<Course> resultList =
                 courseMapper.getNotInCourseListByClassId(classId, filter, orderBy);
         this.buildRelationForDataList(resultList, MyRelationParam.dictOnly());
@@ -196,8 +201,7 @@ public class CourseServiceImpl extends BaseService<Course, Long> implements Cour
      * @return 查询结果集。
      */
     @Override
-    public List<Course> getCourseListByClassId(
-            Long classId, Course filter, String orderBy) {
+    public List<Course> getCourseListByClassId(Long classId, Course filter, String orderBy) {
         List<Course> resultList =
                 courseMapper.getCourseListByClassId(classId, filter, orderBy);
         this.buildRelationForDataList(resultList, MyRelationParam.dictOnly());

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

@@ -6,6 +6,7 @@ import com.orange.demo.common.core.base.dao.BaseDaoMapper;
 import com.orange.demo.courseclassservice.service.GradeService;
 import com.orange.demo.courseclassservice.dao.GradeMapper;
 import com.orange.demo.courseclassservice.model.Grade;
+import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -18,6 +19,7 @@ import javax.annotation.PostConstruct;
  * @author Jerry
  * @date 2020-08-08
  */
+@Slf4j
 @Service("gradeService")
 public class GradeServiceImpl extends BaseDictService<Grade, Integer> implements GradeService {
 

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

@@ -9,6 +9,7 @@ import com.orange.demo.common.core.object.CallResult;
 import com.orange.demo.common.core.base.dao.BaseDaoMapper;
 import com.orange.demo.common.core.base.service.BaseService;
 import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
+import lombok.extern.slf4j.Slf4j;
 import com.github.pagehelper.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -22,6 +23,7 @@ import java.util.*;
  * @author Jerry
  * @date 2020-08-08
  */
+@Slf4j
 @Service("schoolInfoService")
 public class SchoolInfoServiceImpl extends BaseService<SchoolInfo, Long> implements SchoolInfoService {
 
@@ -126,6 +128,8 @@ public class SchoolInfoServiceImpl extends BaseService<SchoolInfo, Long> impleme
     @Override
     public List<SchoolInfo> getSchoolInfoListWithRelation(SchoolInfo filter, String orderBy) {
         List<SchoolInfo> resultList = schoolInfoMapper.getSchoolInfoList(null, null, filter, orderBy);
+        // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
+        // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
         int batchSize = resultList instanceof Page ? 0 : 1000;
         this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
         return resultList;
@@ -147,6 +151,8 @@ public class SchoolInfoServiceImpl extends BaseService<SchoolInfo, Long> impleme
             String inFilterField, Set<M> inFilterValues, SchoolInfo filter, String orderBy) {
         List<SchoolInfo> resultList =
                 schoolInfoMapper.getSchoolInfoList(inFilterField, inFilterValues, filter, orderBy);
+        // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
+        // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
         int batchSize = resultList instanceof Page ? 0 : 1000;
         this.buildRelationForDataList(resultList, MyRelationParam.dictOnly(), batchSize);
         return resultList;

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

@@ -11,6 +11,7 @@ import com.orange.demo.common.core.constant.GlobalDeletedFlag;
 import com.orange.demo.common.core.base.dao.BaseDaoMapper;
 import com.orange.demo.common.core.base.service.BaseService;
 import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
+import lombok.extern.slf4j.Slf4j;
 import com.github.pagehelper.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,6 +26,7 @@ import java.util.*;
  * @author Jerry
  * @date 2020-08-08
  */
+@Slf4j
 @Service("studentClassService")
 public class StudentClassServiceImpl extends BaseService<StudentClass, Long> implements StudentClassService {
 
@@ -152,6 +154,8 @@ public class StudentClassServiceImpl extends BaseService<StudentClass, Long> imp
     @Override
     public List<StudentClass> getStudentClassListWithRelation(StudentClass filter, String orderBy) {
         List<StudentClass> resultList = studentClassMapper.getStudentClassList(null, null, filter, orderBy);
+        // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
+        // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
         int batchSize = resultList instanceof Page ? 0 : 1000;
         this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
         return resultList;
@@ -173,6 +177,8 @@ public class StudentClassServiceImpl extends BaseService<StudentClass, Long> imp
             String inFilterField, Set<M> inFilterValues, StudentClass filter, String orderBy) {
         List<StudentClass> resultList =
                 studentClassMapper.getStudentClassList(inFilterField, inFilterValues, filter, orderBy);
+        // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
+        // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
         int batchSize = resultList instanceof Page ? 0 : 1000;
         this.buildRelationForDataList(resultList, MyRelationParam.dictOnly(), batchSize);
         return resultList;

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

@@ -10,6 +10,7 @@ import com.orange.demo.common.core.object.CallResult;
 import com.orange.demo.common.core.base.dao.BaseDaoMapper;
 import com.orange.demo.common.core.base.service.BaseService;
 import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
+import lombok.extern.slf4j.Slf4j;
 import com.github.pagehelper.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -23,6 +24,7 @@ import java.util.*;
  * @author Jerry
  * @date 2020-08-08
  */
+@Slf4j
 @Service("studentService")
 public class StudentServiceImpl extends BaseService<Student, Long> implements StudentService {
 
@@ -143,6 +145,8 @@ public class StudentServiceImpl extends BaseService<Student, Long> implements St
     @Override
     public List<Student> getStudentListWithRelation(Student filter, String orderBy) {
         List<Student> resultList = studentMapper.getStudentList(null, null, filter, orderBy);
+        // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
+        // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
         int batchSize = resultList instanceof Page ? 0 : 1000;
         this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
         return resultList;
@@ -164,6 +168,8 @@ public class StudentServiceImpl extends BaseService<Student, Long> implements St
             String inFilterField, Set<M> inFilterValues, Student filter, String orderBy) {
         List<Student> resultList =
                 studentMapper.getStudentList(inFilterField, inFilterValues, filter, orderBy);
+        // 在缺省生成的代码中，如果查询结果resultList不是Page对象，说明没有分页，那么就很可能是数据导出接口调用了当前方法。
+        // 为了避免一次性的大量数据关联，规避因此而造成的系统运行性能冲击，这里手动进行了分批次读取，开发者可按需修改该值。
         int batchSize = resultList instanceof Page ? 0 : 1000;
         this.buildRelationForDataList(resultList, MyRelationParam.dictOnly(), batchSize);
         return resultList;
@@ -178,8 +184,7 @@ public class StudentServiceImpl extends BaseService<Student, Long> implements St
      * @return 查询结果集。
      */
     @Override
-    public List<Student> getNotInStudentListByClassId(
-            Long classId, Student filter, String orderBy) {
+    public List<Student> getNotInStudentListByClassId(Long classId, Student filter, String orderBy) {
         List<Student> resultList =
                 studentMapper.getNotInStudentListByClassId(classId, filter, orderBy);
         this.buildRelationForDataList(resultList, MyRelationParam.dictOnly());
@@ -195,8 +200,7 @@ public class StudentServiceImpl extends BaseService<Student, Long> implements St
      * @return 查询结果集。
      */
     @Override
-    public List<Student> getStudentListByClassId(
-            Long classId, Student filter, String orderBy) {
+    public List<Student> getStudentListByClassId(Long classId, Student filter, String orderBy) {
         List<Student> resultList =
                 studentMapper.getStudentListByClassId(classId, filter, orderBy);
         this.buildRelationForDataList(resultList, MyRelationParam.dictOnly());