From 3005d8b3c7c3d2826ed347fe1571d30487a8ce56 Mon Sep 17 00:00:00 2001
From: dengqichen <dengqichen@iscmtech.com>
Date: Fri, 10 Jan 2025 16:55:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=A3=B0=E9=81=93=E6=92=92=E6=97=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deploy/backend/deploy/entity/Application.java     |  1 +
 .../deploy/repository/IApplicationRepository.java     |  1 +
 .../deploy/service/impl/ApplicationServiceImpl.java   | 11 ++++++++++-
 .../backend/framework/repository/IBaseRepository.java |  8 +++-----
 .../framework/service/impl/BaseServiceImpl.java       |  2 +-
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/Application.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/Application.java
index d581acbd..bf25f3e1 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/Application.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/Application.java
@@ -2,6 +2,7 @@ package com.qqchen.deploy.backend.deploy.entity;
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.qqchen.deploy.backend.deploy.enums.DevelopmentLanguageTypeEnum;
+import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
 import com.qqchen.deploy.backend.framework.domain.Entity;
 import jakarta.persistence.Column;
 import jakarta.persistence.FetchType;
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IApplicationRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IApplicationRepository.java
index 1e32c806..5ce76d27 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IApplicationRepository.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IApplicationRepository.java
@@ -10,4 +10,5 @@ import java.util.List;
 public interface IApplicationRepository extends IBaseRepository<Application, Long> {
 
     Integer countByProjectGroupId(Long projectGroupId);
+
 }
\ No newline at end of file
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/ApplicationServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/ApplicationServiceImpl.java
index 3dd803c4..5fb64bb3 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/ApplicationServiceImpl.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/ApplicationServiceImpl.java
@@ -1,6 +1,5 @@
 package com.qqchen.deploy.backend.deploy.service.impl;
 
-import com.qqchen.deploy.backend.deploy.converter.ApplicationConverter;
 import com.qqchen.deploy.backend.deploy.converter.ExternalSystemConverter;
 import com.qqchen.deploy.backend.deploy.converter.ProjectGroupConverter;
 import com.qqchen.deploy.backend.deploy.converter.RepositoryGroupConverter;
@@ -14,6 +13,7 @@ import com.qqchen.deploy.backend.deploy.entity.RepositoryGroup;
 import com.qqchen.deploy.backend.deploy.entity.RepositoryProject;
 import com.qqchen.deploy.backend.deploy.enums.DevelopmentLanguageTypeEnum;
 import com.qqchen.deploy.backend.deploy.query.ApplicationQuery;
+import com.qqchen.deploy.backend.deploy.repository.IApplicationRepository;
 import com.qqchen.deploy.backend.deploy.repository.IExternalSystemRepository;
 import com.qqchen.deploy.backend.deploy.repository.IProjectGroupRepository;
 import com.qqchen.deploy.backend.deploy.repository.IRepositoryGroupRepository;
@@ -59,6 +59,9 @@ public class ApplicationServiceImpl extends BaseServiceImpl<Application, Applica
     @Resource
     private ExternalSystemConverter externalSystemConverter;
 
+    @Resource
+    private IApplicationRepository applicationRepository;
+
     public Page<ApplicationDTO> page(ApplicationQuery query) {
         Page<ApplicationDTO> page = super.page(query);
         List<ApplicationDTO> result = page.getContent().stream().peek(application -> {
@@ -81,6 +84,12 @@ public class ApplicationServiceImpl extends BaseServiceImpl<Application, Applica
         return new PageImpl<>(result, page.getPageable(), page.getTotalElements());
     }
 
+
+    @Override
+    public void delete(Long id) {
+        applicationRepository.logicDeleteById(id);
+    }
+
     @Override
     public List<DevelopmentLanguageTypeDTO> getAllDevelopmentLanguageTypes() {
         List<DevelopmentLanguageTypeDTO> result = new ArrayList<>();
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/framework/repository/IBaseRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/repository/IBaseRepository.java
index 82b94321..7e983cab 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/framework/repository/IBaseRepository.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/repository/IBaseRepository.java
@@ -32,15 +32,13 @@ public interface IBaseRepository<T extends Entity<ID>, ID extends Serializable>
     Optional<T> findById(ID id);
 
     // 逻辑删除
-    @Override
-    default void delete(T entity) {
+    default void logicDelete(T entity) {
         entity.setDeleted(true);
         save(entity);
     }
 
-    @Override
-    default void deleteById(ID id) {
-        findById(id).ifPresent(this::delete);
+    default void logicDeleteById(ID id) {
+        findById(id).ifPresent(this::logicDelete);
     }
 
     // 批量操作
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/framework/service/impl/BaseServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/framework/service/impl/BaseServiceImpl.java
index 6ec086a2..a7396c46 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/framework/service/impl/BaseServiceImpl.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/framework/service/impl/BaseServiceImpl.java
@@ -84,7 +84,7 @@ public abstract class BaseServiceImpl<T extends Entity<ID>, D extends BaseDTO, Q
     @Transactional
     public void delete(ID id) {
         validateDatabaseOperation("delete");
-        repository.deleteById(id);
+        repository.logicDeleteById(id);
     }
 
     @Override