Sfoglia il codice sorgente

优化OrgVO分页查询接口

luoshi 2 anni fa
parent
commit
d20fd9f013

+ 3 - 3
src/main/java/com/qmth/ops/api/controller/admin/OrgController.java

@@ -1,10 +1,10 @@
 package com.qmth.ops.api.controller.admin;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.core.solar.enums.OrgType;
 import com.qmth.ops.api.constants.OpsApiConstants;
-import com.qmth.ops.api.vo.OrgPageVO;
 import com.qmth.ops.api.vo.OrgTypeVO;
 import com.qmth.ops.api.vo.OrgVO;
 import com.qmth.ops.api.vo.SuccessVO;
@@ -38,8 +38,8 @@ public class OrgController {
     }
 
     @PostMapping("/query")
-    public OrgPageVO query(OrgQuery query) {
-        return new OrgPageVO(orgService.findByQuery(query));
+    public IPage<OrgVO> query(OrgQuery query) {
+        return orgService.findByQuery(query).convert(OrgVO::new);
     }
 
     @PostMapping("/insert")

+ 0 - 20
src/main/java/com/qmth/ops/api/vo/OrgPageVO.java

@@ -1,20 +0,0 @@
-package com.qmth.ops.api.vo;
-
-import com.qmth.boot.mybatis.query.BaseQuery;
-import com.qmth.ops.biz.query.OrgQuery;
-
-import java.util.stream.Collectors;
-
-public class OrgPageVO extends BaseQuery<OrgVO> {
-
-    public OrgPageVO(OrgQuery query) {
-        setRecords(query.getRecords().stream().map(OrgVO::new).collect(Collectors.toList()));
-        setPageNumber(query.getPageNumber());
-        setPageSize(query.getPageSize());
-        setTotal(query.getTotal());
-        setCurrent(query.getCurrent());
-        setPages(query.getPages());
-        setSize(query.getSize());
-    }
-
-}