update

mec-application/pom.xml

@@ -19,25 +19,6 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>com.dayaedu.cbs.openfeign</groupId>
-            <artifactId>dayaedu-openfeign-client</artifactId>
-            <version>1.0.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.alibaba.cloud</groupId>
-                    <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework.cloud</groupId>
-                    <artifactId>spring-cloud-loadbalancer</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework.cloud</groupId>
-                    <artifactId>spring-cloud-starter-openfeign</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>

mec-application/src/main/java/com/ym/mec/vo/PageUtil.java

@@ -0,0 +1,26 @@
+package com.ym.mec.vo;
+
+import com.ym.mec.common.page.PageInfo;
+
+import java.util.Objects;
+
+/**
+ * @author hgw
+ * Created by 2021-12-03
+ */
+public class PageUtil {
+
+    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;
+    }
+}

mec-application/src/main/java/com/ym/mec/web/controller/LessonCoursewareController.java

@@ -39,7 +39,7 @@ 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(com.ym.mec.vo.PageUtil.pageInfo(coursewareFeignService.lessonCoursewarePage(query).feignData()));
 	}
 
 	@ApiOperation(value = "获取已添加的课件id列表")

mec-common/common-core/src/main/java/com/ym/mec/common/page/PageUtil.java

@@ -2,7 +2,6 @@ package com.ym.mec.common.page;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ym.mec.common.tenant.TenantContextHolder;
 
 import java.util.Map;
 import java.util.Objects;
@@ -47,20 +46,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;
-    }
-
     /**
      * 分页有需要拼接时分秒要求的可以使用这个方法
      */