wangbo 3 years ago
parent
commit
bfee7d9556

+ 8 - 4
user_center/src/main/java/com/huaxu/controller/VerManageController.java

@@ -59,12 +59,16 @@ public class VerManageController {
      */
     @RequestMapping(value = "findVerManage", method = RequestMethod.GET)
     @ApiOperation(value = "查询app版本信息")
-    public AjaxMessage<List<VerManageEntity>> findVerManage(
+    public AjaxMessage<Pagination<VerManageEntity>> findVerManage(
+            @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
+            @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
             @ApiParam(value = "版本ID", required = false) @RequestParam(required = false) String verId,
             @ApiParam(value = "产品类型", required = false) @RequestParam(required = false) String productType) {
-        List<VerManageEntity> list = verManageService.findVerManage(verId,productType);
-        setName(list);
-        return new AjaxMessage<>(ResultStatus.OK, list);
+        IPage<VerManageEntity> iPage = new Page<>(pageNum, pageSize);
+        iPage = verManageService.findVerManage(iPage,verId,productType);
+        Pagination<VerManageEntity> pages = new Pagination<>(iPage);
+        setName(pages.getList());
+        return new AjaxMessage<>(ResultStatus.OK, pages);
     }
 
     /**

+ 3 - 2
user_center/src/main/java/com/huaxu/dao/VerManageMapper.java

@@ -1,10 +1,11 @@
 package com.huaxu.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huaxu.entity.VerManageEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import java.util.List;
 
 /**
  *
@@ -15,7 +16,7 @@ import java.util.List;
 @Mapper
 public interface VerManageMapper extends BaseMapper<VerManageEntity> {
 
-    List<VerManageEntity> findVerManage(@Param("verId") String verId,@Param("productType") String productType);
+    Page<VerManageEntity> findVerManage(IPage<VerManageEntity> page, @Param("verId") String verId, @Param("productType") String productType);
 
     int insertSelective(VerManageEntity verManageEntity);
 

+ 2 - 2
user_center/src/main/java/com/huaxu/service/VerManageService.java

@@ -52,8 +52,8 @@ public class VerManageService extends ServiceImpl<VerManageMapper, VerManageEnti
 		return res;
 	}
 
-	public List<VerManageEntity> findVerManage(String verId, String productType){
-		return verManageMapper.findVerManage(verId,productType);
+	public Page<VerManageEntity> findVerManage(IPage<VerManageEntity> page,String verId, String productType){
+		return verManageMapper.findVerManage(page, verId, productType);
 	}
 
 	public int insertSelective(VerManageEntity verManageEntity){