将 AppDeploying 中的 AppBuilding 字段修改为 BuildLog

manager/src/main/java/cn/reghao/devops/manager/app/model/po/AppDeploying.java

@@ -4,6 +4,7 @@ import cn.reghao.devops.common.msg.event.EvtAppStatResult;
 import cn.reghao.devops.common.util.NotAvailable;
 import cn.reghao.devops.manager.app.model.constant.DeployStatus;
 import cn.reghao.devops.manager.app.model.po.config.AppDeployConfig;
+import cn.reghao.devops.manager.app.model.po.log.BuildLog;
 import cn.reghao.devops.manager.app.model.po.log.DeployLog;
 import cn.reghao.devops.manager.util.db.BaseEntity;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
@@ -29,7 +30,7 @@ public class AppDeploying extends BaseEntity {
     @OneToOne
     private AppDeployConfig appDeployConfig;
     @OneToOne
-    private AppBuilding appBuilding;
+    private BuildLog buildLog;
     private LocalDateTime deployTime;
     private String deployResult;
     private String deployBy;
@@ -58,8 +59,7 @@ public class AppDeploying extends BaseEntity {
 
     public AppDeploying(AppDeployConfig appDeployConfig, AppBuilding appBuilding) {
         this.appDeployConfig = appDeployConfig;
-        this.appBuilding = appBuilding;
-        //this.buildLogId = appBuilding.getBuildLogId();
+        this.buildLog = appBuilding.getBuildLog();
         this.deployResult = DeployStatus.neverDeploy.getDesc();
         this.deployTime = LocalDateTime.now();
         this.deployBy = appBuilding.getBuildBy();
@@ -74,7 +74,7 @@ public class AppDeploying extends BaseEntity {
 
     public AppDeploying(AppDeployConfig appDeployConfig, AppBuilding appBuilding, DeployLog deployLog) {
         this.appDeployConfig = appDeployConfig;
-        this.appBuilding = appBuilding;
+        this.buildLog = appBuilding.getBuildLog();
         this.deployResult = deployLog.getMsg();
         this.deployTime = deployLog.getDeployTime();
         this.deployBy = deployLog.getDeployBy();
@@ -88,14 +88,14 @@ public class AppDeploying extends BaseEntity {
     }
 
     public void afterBuild(AppBuilding appBuilding) {
-        this.appBuilding = appBuilding;
+        this.buildLog = appBuilding.getBuildLog();
         this.deployResult = DeployStatus.neverDeploy.getDesc();
         this.onDeploying = false;
         this.deployed = false;
     }
 
     public void beforeDeploy(AppBuilding appBuilding, String deployBy) {
-        this.appBuilding = appBuilding;
+        this.buildLog = appBuilding.getBuildLog();
         this.deployBy = deployBy;
         this.deployResult = DeployStatus.onDeploying.getDesc();
         this.onDeploying = true;

manager/src/main/java/cn/reghao/devops/manager/app/model/vo/AppDeployingVO.java

@@ -3,6 +3,7 @@ package cn.reghao.devops.manager.app.model.vo;
 import cn.reghao.devops.common.util.NotAvailable;
 import cn.reghao.devops.manager.app.model.po.AppBuilding;
 import cn.reghao.devops.manager.app.model.po.AppDeploying;
+import cn.reghao.devops.manager.app.model.po.log.BuildLog;
 import cn.reghao.devops.manager.machine.model.po.MachineHost;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import lombok.Data;
@@ -28,10 +29,10 @@ public class AppDeployingVO {
         this.machineIpv4 = machineHost.getMachineIpv4();
         this.machineStatus = machineStatus;
 
-        AppBuilding appBuilding = appDeploying.getAppBuilding();
-        if (appBuilding != null) {
-            this.commitId = appBuilding.getCommitId() != null ? appBuilding.getCommitId() : NotAvailable.na.getDesc();
-            this.packagePath = appBuilding.getPackagePath() != null ? appBuilding.getPackagePath() : NotAvailable.na.getDesc();
+        BuildLog buildLog = appDeploying.getBuildLog();
+        if (buildLog != null) {
+            this.commitId = buildLog.getCommitId() != null ? buildLog.getCommitId() : NotAvailable.na.getDesc();
+            this.packagePath = buildLog.getPackagePath() != null ? buildLog.getPackagePath() : NotAvailable.na.getDesc();
         } else {
             this.commitId = NotAvailable.na.getDesc();
             this.packagePath = NotAvailable.na.getDesc();
@@ -50,10 +51,10 @@ public class AppDeployingVO {
         this.machineIpv4 = machineHost.getMachineIpv4();
         this.machineStatus = machineStatus;
 
-        AppBuilding appBuilding = appDeploying.getAppBuilding();
-        if (appBuilding != null) {
-            this.commitId = appBuilding.getCommitId() != null ? appBuilding.getCommitId() : NotAvailable.na.getDesc();
-            this.packagePath = appBuilding.getPackagePath() != null ? appBuilding.getPackagePath() : NotAvailable.na.getDesc();
+        BuildLog buildLog = appDeploying.getBuildLog();
+        if (buildLog != null) {
+            this.commitId = buildLog.getCommitId() != null ? buildLog.getCommitId() : NotAvailable.na.getDesc();
+            this.packagePath = buildLog.getPackagePath() != null ? buildLog.getPackagePath() : NotAvailable.na.getDesc();
         } else {
             this.commitId = NotAvailable.na.getDesc();
             this.packagePath = NotAvailable.na.getDesc();

manager/src/main/java/cn/reghao/devops/manager/app/model/vo/AppRunning.java

@@ -3,6 +3,7 @@ package cn.reghao.devops.manager.app.model.vo;
 import cn.reghao.devops.manager.app.model.po.AppBuilding;
 import cn.reghao.devops.manager.app.model.po.AppDeploying;
 import cn.reghao.devops.manager.app.model.po.config.AppConfig;
+import cn.reghao.devops.manager.app.model.po.log.BuildLog;
 import cn.reghao.devops.manager.machine.model.po.MachineHost;
 import cn.reghao.devops.common.util.NotAvailable;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
@@ -36,9 +37,9 @@ public class AppRunning {
         this.bindPorts = appConfig.getBindPorts();
         this.healthCheck = appConfig.getHealthCheck();
 
-        AppBuilding appBuilding = appDeploying.getAppBuilding();
-        if (appBuilding != null) {
-            this.packagePath = appBuilding.getPackagePath();
+        BuildLog buildLog = appDeploying.getBuildLog();
+        if (buildLog != null) {
+            this.packagePath = buildLog.getPackagePath();
             this.status = appDeploying.getStatus();
             this.startTime = DateTimeConverter.format(appDeploying.getStartTime());
             this.pid = appDeploying.getPid();

manager/src/main/java/cn/reghao/devops/manager/app/service/bd/impl/DeployStatImpl.java

@@ -128,7 +128,7 @@ public class DeployStatImpl implements DeployStat {
 
                 MachineHost machineHost = appDeploying.getAppDeployConfig().getMachineHost();
                 // BuildLog buildLog = buildLogRepository.findByBuildLogId(appDeploying.getAppBuilding().getBuildLogId());
-                BuildLog buildLog = appDeploying.getAppBuilding().getBuildLog();
+                BuildLog buildLog = appDeploying.getBuildLog();
                 DeployLog deployLog = new DeployLog(buildLog, machineHost, deployResult);
                 deployLogRepository.save(deployLog);
 
@@ -188,7 +188,7 @@ public class DeployStatImpl implements DeployStat {
                     }
 
                     AppDeployingVO appDeployingVO;
-                    String buildLogId1 = appDeploying.getAppBuilding().getBuildLog().getBuildLogId();
+                    String buildLogId1 = appDeploying.getBuildLog().getBuildLogId();
                     if (buildLogId1.equals(appBuilding.getBuildLog().getBuildLogId())) {
                         appDeployingVO = new AppDeployingVO(appDeploying, machineStatus);
                     } else {
@@ -210,7 +210,7 @@ public class DeployStatImpl implements DeployStat {
             String appId = appConfig.getAppId();
             String appName = appConfig.getAppName();
             String bindPorts = appConfig.getBindPorts();
-            String packagePath = appDeploying.getAppBuilding().getPackagePath();
+            String packagePath = appDeploying.getBuildLog().getPackagePath();
             int totalDeployed = 0;
             return new AppRunningVO(appId, appName, bindPorts, packagePath, totalDeployed);
         }).collect(Collectors.toList());