调整构建部署配置相关代码

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

@@ -77,7 +77,6 @@ public class BuildDeployController {
     @ApiOperation(value = "刷新应用构建, 部署和运行列表")
     @PostMapping(value = "/refresh", produces = MediaType.APPLICATION_JSON_VALUE)
     public String refreshAppBuilding() {
-        buildService.refresh();
         return WebBody.success();
     }
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/BuildDeployConfigService.java

@@ -2,17 +2,13 @@ package cn.reghao.autodop.dmaster.app.service;
 
 import cn.reghao.autodop.dmaster.app.model.po.config.AppConfig;
 
-import java.util.List;
-import java.util.Set;
-
 /**
  * @author reghao
  * @date 2021-09-17 11:30:16
  */
 public interface BuildDeployConfigService {
-    void refresh();
-    void refreshApp(AppConfig app);
-    void refreshAppBuilding(List<AppConfig> apps, Set<String> appIds);
-    void refreshAppDeployingAndRunning(List<AppConfig> apps, Set<String> appIds);
+    void refreshAppBuilding(AppConfig appConfig);
+    void refreshAppDeploying(AppConfig appConfig);
+    void refreshAppRunning(AppConfig appConfig);
     void delete(String appId);
 }

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/impl/BuildDeployConfigServiceImpl.java

@@ -12,8 +12,6 @@ import cn.reghao.autodop.dmaster.app.service.BuildDeployConfigService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Objects;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -37,36 +35,6 @@ public class BuildDeployConfigServiceImpl implements BuildDeployConfigService {
         this.runningRepository = runningRepository;
     }
 
-    // TODO 启用 env 和 appType 字段，根据环境和应用类型来刷新，避免一次刷新过多应用
-    @Override
-    public void refresh() {
-        List<AppConfig> apps = appConfigQuery.findAll();
-        Set<String> appIds = apps.stream().map(AppConfig::getAppId).collect(Collectors.toSet());
-
-        refreshAppBuilding(apps, appIds);
-        refreshAppDeployingAndRunning(apps, appIds);
-    }
-
-    @Override
-    public void refreshApp(AppConfig app) {
-        refreshAppBuilding(app);
-        refreshAppDeploying(app);
-        refreshAppRunning(app);
-    }
-
-    @Override
-    public void refreshAppBuilding(List<AppConfig> apps, Set<String> appIds) {
-        Set<String> appsToDelete = buildingRepository.findAll().stream()
-                .map(appBuilding -> {
-                    String appId = appBuilding.getAppId();
-                    return appIds.contains(appId) ? null : appId;
-                })
-                .filter(Objects::nonNull)
-                .collect(Collectors.toSet());
-
-        apps.forEach(this::refreshAppBuilding);
-    }
-
     /**
      * 刷新应用构建信息
      *
@@ -74,6 +42,7 @@ public class BuildDeployConfigServiceImpl implements BuildDeployConfigService {
      * @return
      * @date 2021-06-18 下午5:24
      */
+    @Override
     public void refreshAppBuilding(AppConfig app) {
         AppBuilding appBuilding = buildingRepository.findByAppId(app.getAppId());
         if (appBuilding == null) {
@@ -84,35 +53,6 @@ public class BuildDeployConfigServiceImpl implements BuildDeployConfigService {
         buildingRepository.save(appBuilding);
     }
 
-    @Override
-    public void refreshAppDeployingAndRunning(List<AppConfig> apps, Set<String> appIds) {
-        Set<String> appsToDelete = deployingRepository.findAll().stream()
-                .map(appDeploying -> {
-                    String appId = appDeploying.getAppId();
-                    return appIds.contains(appId) ? null : appId;
-                })
-                .filter(Objects::nonNull)
-                .collect(Collectors.toSet());
-
-        runningRepository.findAll().stream()
-                .map(appRunning -> {
-                    String appId = appRunning.getAppId();
-                    return appIds.contains(appId) ? null : appId;
-                })
-                .filter(Objects::nonNull)
-                .collect(Collectors.toSet());
-
-        // 配置了 DeployConfig 的应用
-        List<AppConfig> appsWithDeployConfig = apps.stream()
-                .filter(app -> !app.getDeployConfigs().isEmpty())
-                // TODO 使用 peek
-                //.peek()
-                .collect(Collectors.toList());
-
-        appsWithDeployConfig.forEach(this::refreshAppDeploying);
-        appsWithDeployConfig.forEach(this::refreshAppRunning);
-    }
-
     /**
      * 刷新应用部署信息
      *
@@ -120,6 +60,7 @@ public class BuildDeployConfigServiceImpl implements BuildDeployConfigService {
      * @return
      * @date 2021-06-18 下午5:25
      */
+    @Override
     public void refreshAppDeploying(AppConfig app) {
         String appId = app.getAppId();
         List<AppDeploying> list = app.getDeployConfigs().stream()
@@ -144,6 +85,7 @@ public class BuildDeployConfigServiceImpl implements BuildDeployConfigService {
      * @return
      * @date 2021-06-18 下午5:29
      */
+    @Override
     public void refreshAppRunning(AppConfig app) {
         String appId = app.getAppId();
         List<AppRunning> list = app.getDeployConfigs().stream()