瀏覽代碼

优化DeployVO分页查询接口

luoshi 2 年之前
父節點
當前提交
c837bef686

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

@@ -1,12 +1,16 @@
 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.api.exception.ApiException;
 import com.qmth.boot.tools.device.DeviceInfo;
 import com.qmth.ops.api.constants.OpsApiConstants;
 import com.qmth.ops.api.dto.DeployForm;
-import com.qmth.ops.api.vo.*;
+import com.qmth.ops.api.vo.CodeNameVO;
+import com.qmth.ops.api.vo.DeployVO;
+import com.qmth.ops.api.vo.OrgVO;
+import com.qmth.ops.api.vo.SuccessVO;
 import com.qmth.ops.biz.domain.Deploy;
 import com.qmth.ops.biz.domain.DeployMode;
 import com.qmth.ops.biz.query.DeployQuery;
@@ -50,8 +54,8 @@ public class DeployController {
     }
 
     @PostMapping("/query")
-    public DeployPageVO query(DeployQuery query) {
-        return new DeployPageVO(deployService.query(query), appService);
+    public IPage<DeployVO> query(DeployQuery query) {
+        return deployService.query(query).convert(deploy -> new DeployVO(deploy, appService));
     }
 
     @PostMapping("/insert")

+ 0 - 24
src/main/java/com/qmth/ops/api/vo/DeployPageVO.java

@@ -1,24 +0,0 @@
-package com.qmth.ops.api.vo;
-
-import com.qmth.boot.mybatis.query.BaseQuery;
-import com.qmth.ops.biz.query.DeployQuery;
-import com.qmth.ops.biz.service.AppService;
-
-import java.util.stream.Collectors;
-
-public class DeployPageVO extends BaseQuery<DeployVO> {
-
-    private static final long serialVersionUID = -6041621112178518570L;
-
-    public DeployPageVO(DeployQuery query, AppService appService) {
-        setRecords(query.getRecords().stream().map(deploy -> new DeployVO(deploy, appService))
-                .collect(Collectors.toList()));
-        setPageNumber(query.getPageNumber());
-        setPageSize(query.getPageSize());
-        setTotal(query.getTotal());
-        setCurrent(query.getCurrent());
-        setPages(query.getPages());
-        setSize(query.getSize());
-    }
-
-}