|
@@ -1,12 +1,16 @@
|
|
package com.qmth.ops.api.controller.admin;
|
|
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.Aac;
|
|
import com.qmth.boot.api.annotation.BOOL;
|
|
import com.qmth.boot.api.annotation.BOOL;
|
|
import com.qmth.boot.api.exception.ApiException;
|
|
import com.qmth.boot.api.exception.ApiException;
|
|
import com.qmth.boot.tools.device.DeviceInfo;
|
|
import com.qmth.boot.tools.device.DeviceInfo;
|
|
import com.qmth.ops.api.constants.OpsApiConstants;
|
|
import com.qmth.ops.api.constants.OpsApiConstants;
|
|
import com.qmth.ops.api.dto.DeployForm;
|
|
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.Deploy;
|
|
import com.qmth.ops.biz.domain.DeployMode;
|
|
import com.qmth.ops.biz.domain.DeployMode;
|
|
import com.qmth.ops.biz.query.DeployQuery;
|
|
import com.qmth.ops.biz.query.DeployQuery;
|
|
@@ -50,8 +54,8 @@ public class DeployController {
|
|
}
|
|
}
|
|
|
|
|
|
@PostMapping("/query")
|
|
@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")
|
|
@PostMapping("/insert")
|