开始优化构建部署日志接口

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/BuildDeployController.java

@@ -7,13 +7,8 @@ import cn.reghao.autodop.dmaster.app.vo.SuccessfullyBuildVO;
 import cn.reghao.autodop.dmaster.app.service.BuildService;
 import cn.reghao.autodop.dmaster.common.db.PageList;
 import cn.reghao.autodop.dmaster.app.vo.log.BuildDeployAppVO;
-import cn.reghao.autodop.dmaster.app.vo.log.BuildLogVO;
-import cn.reghao.autodop.dmaster.app.vo.log.CommitLogVO;
-import cn.reghao.autodop.dmaster.app.vo.log.DeployLogVO;
 import cn.reghao.autodop.dmaster.app.service.BuildDeployDispatcher;
 import cn.reghao.autodop.common.result.WebResult;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -94,79 +89,4 @@ public class BuildDeployController {
         PageList<SuccessfullyBuildVO> pageList = buildService.successfullyBuilds(appId, pageRequest);
         return ResponseEntity.ok().body(WebResult.success(pageList));
     }
-
-    @ApiOperation(value = "代码日志")
-    @GetMapping("/logs/commit")
-    public ResponseEntity<String> commitLogs(@RequestParam("env") String env,
-                                             @RequestParam("page") int page,
-                                             @RequestParam("size") int size) {
-        String env1 = EnvType.valueOf(env).name();
-        PageRequest pageRequest =
-                PageRequest.of(page-1, size, Sort.by(Sort.Direction.DESC, "createTime"));
-        PageList<CommitLogVO> pageList = buildService.commitLogs(env1, null, pageRequest);
-        return ResponseEntity.ok().body(WebResult.success(pageList));
-    }
-
-    @ApiOperation(value = "某个应用的代码日志")
-    @GetMapping("/logs/commit/{appId}")
-    public ResponseEntity<String> commitLogsByApp(@PathVariable("appId") String appId,
-                                                  @RequestParam("env") String env,
-                                                  @RequestParam("page") int page,
-                                                  @RequestParam("size") int size) {
-        String env1 = EnvType.valueOf(env).name();
-        PageRequest pageRequest =
-                PageRequest.of(page-1, size, Sort.by(Sort.Direction.DESC, "createTime"));
-        PageList<CommitLogVO> pageList = buildService.commitLogs(env1, appId, pageRequest);
-        return ResponseEntity.ok().body(WebResult.success(pageList));
-    }
-
-    @ApiOperation(value = "构建日志")
-    @GetMapping("/logs/build")
-    public ResponseEntity<String> buildLogs(@RequestParam("env") String env,
-                                            @RequestParam("page") int page,
-                                            @RequestParam("size") int size) {
-        String env1 = EnvType.valueOf(env).name();
-        PageRequest pageRequest =
-                PageRequest.of(page-1, size, Sort.by(Sort.Direction.DESC, "createTime"));
-        PageList<BuildLogVO> pageList = buildService.buildLogs(env1, null, pageRequest);
-        return ResponseEntity.ok().body(WebResult.success(pageList));
-    }
-
-    @ApiOperation(value = "某个应用的构建日志")
-    @GetMapping("/logs/build/{appId}")
-    public ResponseEntity<String> buildLogsByApp(@PathVariable("appId") String appId,
-                                                 @RequestParam("env") String env,
-                                                 @RequestParam("page") int page,
-                                                 @RequestParam("size") int size) {
-        String env1 = EnvType.valueOf(env).name();
-        PageRequest pageRequest =
-                PageRequest.of(page-1, size, Sort.by(Sort.Direction.DESC, "createTime"));
-        PageList<BuildLogVO> pageList = buildService.buildLogs(env1, appId, pageRequest);
-        return ResponseEntity.ok().body(WebResult.success(pageList));
-    }
-
-    @ApiOperation(value = "部署日志")
-    @GetMapping("/logs/deploy")
-    public ResponseEntity<String> deployLogs(@RequestParam("env") String env,
-                                             @RequestParam("page") int page,
-                                             @RequestParam("size") int size) {
-        String env1 = EnvType.valueOf(env).name();
-        PageRequest pageRequest =
-                PageRequest.of(page-1, size, Sort.by(Sort.Direction.DESC, "createTime"));
-        PageList<DeployLogVO> pageList = buildService.deployLogs(env1, null, pageRequest);
-        return ResponseEntity.ok().body(WebResult.success(pageList));
-    }
-
-    @ApiOperation(value = "某个应用的部署日志")
-    @GetMapping("/logs/deploy/{appId}")
-    public ResponseEntity<String> deployLogsByApp(@PathVariable("appId") String appId,
-                                                  @RequestParam("env") String env,
-                                                  @RequestParam("page") int page,
-                                                  @RequestParam("size") int size) {
-        String env1 = EnvType.valueOf(env).name();
-        PageRequest pageRequest =
-                PageRequest.of(page-1, size, Sort.by(Sort.Direction.DESC, "createTime"));
-        PageList<DeployLogVO> pageList = buildService.deployLogs(env1, appId, pageRequest);
-        return ResponseEntity.ok().body(WebResult.success(pageList));
-    }
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/controller/BuildDeployLogController.java

@@ -0,0 +1,107 @@
+package cn.reghao.autodop.dmaster.app.controller;
+
+import cn.reghao.autodop.common.result.WebResult;
+import cn.reghao.autodop.dmaster.app.constant.EnvType;
+import cn.reghao.autodop.dmaster.app.service.BuildService;
+import cn.reghao.autodop.dmaster.app.vo.log.BuildLogVO;
+import cn.reghao.autodop.dmaster.app.vo.log.CommitLogVO;
+import cn.reghao.autodop.dmaster.app.vo.log.DeployLogVO;
+import cn.reghao.autodop.dmaster.common.db.PageList;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author reghao
+ * @date 2019-08-30 18:49:15
+ */
+@Slf4j
+@Api(tags = "应用构建部署日志接口")
+@RestController
+@RequestMapping("/api/app/bd")
+public class BuildDeployLogController {
+    private BuildService buildService;
+
+    public BuildDeployLogController(BuildService buildService) {
+        this.buildService = buildService;
+    }
+
+    @ApiOperation(value = "代码日志")
+    @GetMapping("/log/commit")
+    public ResponseEntity<String> commitLogs(@RequestParam("env") String env,
+                                             @RequestParam("page") int page,
+                                             @RequestParam("size") int size) {
+        String env1 = EnvType.valueOf(env).name();
+        PageRequest pageRequest =
+                PageRequest.of(page-1, size, Sort.by(Sort.Direction.DESC, "createTime"));
+        PageList<CommitLogVO> pageList = buildService.commitLogs(env1, null, pageRequest);
+        return ResponseEntity.ok().body(WebResult.success(pageList));
+    }
+
+    @ApiOperation(value = "某个应用的代码日志")
+    @GetMapping("/log/commit/{appId}")
+    public ResponseEntity<String> commitLogsByApp(@PathVariable("appId") String appId,
+                                                  @RequestParam("env") String env,
+                                                  @RequestParam("page") int page,
+                                                  @RequestParam("size") int size) {
+        String env1 = EnvType.valueOf(env).name();
+        PageRequest pageRequest =
+                PageRequest.of(page-1, size, Sort.by(Sort.Direction.DESC, "createTime"));
+        PageList<CommitLogVO> pageList = buildService.commitLogs(env1, appId, pageRequest);
+        return ResponseEntity.ok().body(WebResult.success(pageList));
+    }
+
+    @ApiOperation(value = "构建日志")
+    @GetMapping("/log/build")
+    public ResponseEntity<String> buildLogs(@RequestParam("env") String env,
+                                            @RequestParam("page") int page,
+                                            @RequestParam("size") int size) {
+        String env1 = EnvType.valueOf(env).name();
+        PageRequest pageRequest =
+                PageRequest.of(page-1, size, Sort.by(Sort.Direction.DESC, "createTime"));
+        PageList<BuildLogVO> pageList = buildService.buildLogs(env1, null, pageRequest);
+        return ResponseEntity.ok().body(WebResult.success(pageList));
+    }
+
+    @ApiOperation(value = "某个应用的构建日志")
+    @GetMapping("/log/build/{appId}")
+    public ResponseEntity<String> buildLogsByApp(@PathVariable("appId") String appId,
+                                                 @RequestParam("env") String env,
+                                                 @RequestParam("page") int page,
+                                                 @RequestParam("size") int size) {
+        String env1 = EnvType.valueOf(env).name();
+        PageRequest pageRequest =
+                PageRequest.of(page-1, size, Sort.by(Sort.Direction.DESC, "createTime"));
+        PageList<BuildLogVO> pageList = buildService.buildLogs(env1, appId, pageRequest);
+        return ResponseEntity.ok().body(WebResult.success(pageList));
+    }
+
+    @ApiOperation(value = "部署日志")
+    @GetMapping("/log/deploy")
+    public ResponseEntity<String> deployLogs(@RequestParam("env") String env,
+                                             @RequestParam("page") int page,
+                                             @RequestParam("size") int size) {
+        String env1 = EnvType.valueOf(env).name();
+        PageRequest pageRequest =
+                PageRequest.of(page-1, size, Sort.by(Sort.Direction.DESC, "createTime"));
+        PageList<DeployLogVO> pageList = buildService.deployLogs(env1, null, pageRequest);
+        return ResponseEntity.ok().body(WebResult.success(pageList));
+    }
+
+    @ApiOperation(value = "某个应用的部署日志")
+    @GetMapping("/log/deploy/{appId}")
+    public ResponseEntity<String> deployLogsByApp(@PathVariable("appId") String appId,
+                                                  @RequestParam("env") String env,
+                                                  @RequestParam("page") int page,
+                                                  @RequestParam("size") int size) {
+        String env1 = EnvType.valueOf(env).name();
+        PageRequest pageRequest =
+                PageRequest.of(page-1, size, Sort.by(Sort.Direction.DESC, "createTime"));
+        PageList<DeployLogVO> pageList = buildService.deployLogs(env1, appId, pageRequest);
+        return ResponseEntity.ok().body(WebResult.success(pageList));
+    }
+}