酷乐秀支持课件查看

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/LessonCoursewareController.java

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 @RestController
 @RequestMapping("${app-config.url.admin:}/lessonCourseware")
@@ -38,7 +39,21 @@ public class LessonCoursewareController extends BaseController {
 	@PreAuthorize("@pcs.hasPermissions('lessonCourseware/queryPage')")
 	public HttpResponseResult<PageInfo<CbsLessonCoursewareWrapper.LessonCourseware>> queryPage(@RequestBody CbsLessonCoursewareWrapper.LessonCoursewareQuery query) throws Exception {
 		query.setEnableFlag(true);
-		return succeed(PageUtil.pageInfo(coursewareFeignService.lessonCoursewarePage(query).feignData()));
+		return succeed(pageInfo(coursewareFeignService.lessonCoursewarePage(query).feignData()));
+	}
+
+	public static <T> PageInfo<T> pageInfo(com.microsvc.toolkit.common.response.paging.PageInfo<T> source) {
+		if (Objects.isNull(source)) {
+			return new PageInfo<>(1, 20);
+		}
+		int total = Integer.parseInt(String.valueOf(source.getTotal()));
+		int limit = Integer.parseInt(String.valueOf(source.getLimit()));
+		PageInfo<T> resultPage = new PageInfo<>();
+		resultPage.setRows(source.getRows());
+		resultPage.setPageNo(Long.valueOf(source.getCurrent()).intValue());
+		resultPage.setLimit(limit);
+		resultPage.setTotal(total);
+		return resultPage;
 	}
 
 	@ApiOperation(value = "分页查询已添加的课件")

toolset/toolset-mybatis/pom.xml

@@ -48,10 +48,6 @@
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>3.0.7.1</version>
         </dependency>
-        <dependency>
-            <groupId>com.microsvc.toolkit.common</groupId>
-            <artifactId>microsvc-common-response</artifactId>
-        </dependency>
     </dependencies>
 
 </project>

toolset/toolset-mybatis/src/main/java/com/yonge/toolset/mybatis/support/PageUtil.java

@@ -110,20 +110,6 @@ public class PageUtil {
         return resultPage;
     }
 
-    public static <T> PageInfo<T> pageInfo(com.microsvc.toolkit.common.response.paging.PageInfo<T> source) {
-        if (Objects.isNull(source)) {
-            return new PageInfo<>(1, 20);
-        }
-        int total = Integer.parseInt(String.valueOf(source.getTotal()));
-        int limit = Integer.parseInt(String.valueOf(source.getLimit()));
-        PageInfo<T> resultPage = new PageInfo<>();
-        resultPage.setRows(source.getRows());
-        resultPage.setPageNo(Long.valueOf(source.getCurrent()).intValue());
-        resultPage.setLimit(limit);
-        resultPage.setTotal(total);
-        return resultPage;
-    }
-
     /**
      * 将mybatisPlus的分页模型 转换为本项目的分页模型
      * @param wrapper IPage<?>