Merge branch 'meiteng' of ssh://103.249.252.28:10022/lcy/education into meiteng

# Conflicts:
#	src/main/java/org/rcisoft/business/bcourse/controller/BCourseController.java

src/main/java/org/rcisoft/business/bbanner/controller/BBannerController.java

@@ -107,12 +107,4 @@ public class BBannerController extends PaginationController<BBanner> {
                 topDownDTO);
     }
 
-    @GetMapping(value = "/test")
-    public Result test(){
-        return Result.builder(new PersistModel(1),
-                MessageConstant.MESSAGE_ALERT_SUCCESS,
-                MessageConstant.MESSAGE_ALERT_ERROR,
-                1);
-    }
-
 }

src/main/java/org/rcisoft/business/blesson/controller/BLessonController.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.rcisoft.business.blesson.dto.AddLessonDTO;
 import org.rcisoft.business.blesson.dto.FindAllLessonDTO;
+import org.rcisoft.business.blesson.dto.FirstPageQueryDTO;
 import org.rcisoft.business.blesson.entity.BLesson;
 import org.rcisoft.business.blesson.service.BLessonService;
 import org.rcisoft.common.component.Global;
@@ -103,7 +104,7 @@ public class BLessonController extends PaginationController<BLesson> {
 
     @ApiOperation(value="606 分页查询大家都在学", notes="分页查询大家都在学")
     @GetMapping(value = "/queryPersonMoreByPagination")
-    public Result queryPersonMoreByPagination(CurUser curUser) {
+    public Result queryPersonMoreByPagination(CurUser curUser,@Valid FirstPageQueryDTO firstPageQueryDTO, BindingResult bindingResult) {
         bLessonService.queryPersonMoreByPagination(getPaginationUtility());
         GridModel gridModel = getGridModelResponse();
         return  Result.builder(new PersistModel(1),
@@ -114,7 +115,7 @@ public class BLessonController extends PaginationController<BLesson> {
 
     @ApiOperation(value="607 分页查询推荐", notes="分页查询推荐")
     @GetMapping(value = "/queryRecommendByPagination")
-    public Result queryRecommendByPagination(CurUser curUser) {
+    public Result queryRecommendByPagination(CurUser curUser,@Valid FirstPageQueryDTO firstPageQueryDTO, BindingResult bindingResult) {
         String userId = curUser.getUserId();
         bLessonService.queryRecommendByPagination(getPaginationUtility(),userId);
         GridModel gridModel = getGridModelResponse();
@@ -126,7 +127,7 @@ public class BLessonController extends PaginationController<BLesson> {
 
     @ApiOperation(value="608 分页查询最受关注", notes="分页查询最受关注")
     @GetMapping(value = "/queryConcernByPagination")
-    public Result queryConcernByPagination(CurUser curUser) {
+    public Result queryConcernByPagination(CurUser curUser,@Valid FirstPageQueryDTO firstPageQueryDTO, BindingResult bindingResult) {
 //        String userId = curUser.getUserId();
         bLessonService.queryConcernByPagination(getPaginationUtility());
         GridModel gridModel = getGridModelResponse();
@@ -139,7 +140,7 @@ public class BLessonController extends PaginationController<BLesson> {
 
     @ApiOperation(value="609 分页查询可能感兴趣", notes="分页查询可能感兴趣")
     @GetMapping(value = "/queryInterestedByPagination")
-    public Result queryInterestedByPagination(CurUser curUser) {
+    public Result queryInterestedByPagination(CurUser curUser, @Valid FirstPageQueryDTO firstPageQueryDTO, BindingResult bindingResult) {
 //        String userId = curUser.getUserId();
         bLessonService.queryInterestedByPagination(getPaginationUtility());
         GridModel gridModel = getGridModelResponse();

src/main/java/org/rcisoft/business/blesson/dto/FirstPageQueryDTO.java

+package org.rcisoft.business.blesson.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+@Data
+public class FirstPageQueryDTO {
+
+
+    @ApiModelProperty(value = "课程一级分类",required = false)
+    @Length(min = 1,max = 64,message = "长度最小为1,最大为50")
+    private String courseLevelOne;
+
+    @ApiModelProperty(value = "查询参数",required = false)
+    private String viewParam;
+
+}