大声道撒旦
This commit is contained in:
parent
653ed9d6c2
commit
3005d8b3c7
@ -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;
|
||||
|
||||
@ -10,4 +10,5 @@ import java.util.List;
|
||||
public interface IApplicationRepository extends IBaseRepository<Application, Long> {
|
||||
|
||||
Integer countByProjectGroupId(Long projectGroupId);
|
||||
|
||||
}
|
||||
@ -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<>();
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
// 批量操作
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user