Bladeren bron

更新 AppConfig 删除接口

reghao 1 jaar geleden
bovenliggende
commit
30f286aad2

+ 2 - 0
web/src/main/java/cn/reghao/devops/web/mgr/app/db/repository/AppBuildingRepository.java

@@ -10,6 +10,8 @@ import org.springframework.data.jpa.repository.JpaRepository;
  * @date 2023-11-15 21:24:50
  */
 public interface AppBuildingRepository extends JpaRepository<AppBuilding, Integer> {
+    void deleteByAppConfig_AppId(String appId);
+
     Page<AppBuilding> findAllByAppConfig_EnvAndAppConfig_AppType(String env, String type, Pageable pageable);
     Page<AppBuilding> findAllByAppConfig_AppName(String appName, Pageable pageable);
     AppBuilding findAllByAppConfig_AppId(String appId);

+ 1 - 1
web/src/main/java/cn/reghao/devops/web/mgr/app/db/repository/log/BuildLogRepository.java

@@ -14,7 +14,7 @@ import java.util.List;
  */
 public interface BuildLogRepository extends JpaRepository<BuildLog, String> {
     void deleteByBuildLogId(String buildLogId);
-    void deleteByAppConfig(AppConfig appConfig);
+    void deleteByAppConfig_AppId(String appId);
 
     Page<BuildLog> findByAppConfig(AppConfig appConfig, Pageable pageable);
     List<BuildLog> findByAppConfig(AppConfig appConfig);

+ 5 - 6
web/src/main/java/cn/reghao/devops/web/mgr/app/service/impl/AppBuildServiceImpl.java

@@ -12,6 +12,7 @@ import cn.reghao.devops.web.mgr.app.model.po.config.AppConfig;
 import cn.reghao.devops.web.mgr.app.model.po.log.BuildLog;
 import cn.reghao.devops.web.mgr.app.service.AppBuildService;
 import cn.reghao.devops.web.mgr.app.service.AppDeployService;
+import cn.reghao.devops.web.mgr.build.chain.BuildTools;
 import cn.reghao.devops.web.mgr.build.chain.impl.BuildChainResult;
 import cn.reghao.devops.web.mgr.build.model.AppDto;
 import cn.reghao.devops.web.mgr.build.model.LocalBuildDir;
@@ -170,13 +171,11 @@ public class AppBuildServiceImpl implements AppBuildService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Result deleteAppBuild(String appId) {
+        //deployConfigService.delete(app);
+        buildLogRepository.deleteByAppConfig_AppId(appId);
+        buildingRepository.deleteByAppConfig_AppId(appId);
         appConfigRepository.deleteByAppId(appId);
-        AppBuilding appBuilding1 = buildingRepository.findAllByAppConfig_AppId(appId);
-        buildingRepository.delete(appBuilding1);
-
-        /*deployConfigService.delete(app);
-        appConfigRepository.delete(app);
-        BuildTools.removeApp(app.getAppId());*/
+        BuildTools.removeApp(appId);
         return Result.result(ResultStatus.SUCCESS);
     }