diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java index 7307250e9..28d1194ec 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java @@ -101,6 +101,23 @@ public class ParamsReportEOController extends JeroController delete(@RequestParam(name="id",required=true) String id) { + boolean isSuccess = paramsReportEOService.deleteById(id); + if (isSuccess) { + return Result.OK("删除成功!"); + } else { + return Result.error("删除失败!"); + } + } @@ -147,20 +164,6 @@ public class ParamsReportEOController extends JeroController delete(@RequestParam(name="id",required=true) String id) { - paramsReportEOService.deleteById(id); - return Result.OK("删除成功!"); - } - /** * 批量删除 * diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java index dc3818c1d..e4b308c54 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java @@ -30,4 +30,11 @@ public interface IParamsReportConfigDataEOService extends IService queryListByConfigIdList(List configIdList); + + /** + * 批量删除清单的所有配置数据 + * @param paramsReportDetailIdList + * @return + */ + int deleteByParamsReportDetailIdList(List paramsReportDetailIdList); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java index 9f377b597..7dece4f71 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java @@ -59,4 +59,6 @@ public interface IParamsReportDetailEOService extends IService> configDataList, String paramsManifestId); + // 删除 + boolean deleteByIds(List ids); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java index 51f147836..6c2c6bcac 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java @@ -36,7 +36,7 @@ public interface IParamsReportEOService extends IService { * @param id * @return */ - void deleteById(String id); + boolean deleteById(String id); /** * 批量删除 diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java index c69874c9c..a9e55f27a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java @@ -61,4 +61,6 @@ public interface IParamsReportExportHistoryEOService extends IService queryList(); IPage queryPage(IPage page, ParamsReportExportHistoryEO paramsReportExportHistoryEO, String cut); + + void deleteByParamsManifestId(String paramsManifestId); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java index cce1ae4ed..5396e71ab 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java @@ -55,4 +55,11 @@ public class ParamsReportConfigDataEOServiceImpl extends ServiceImpl paramsReportDetailIdList) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(ParamsReportConfigDataEO::getParamsCollectManifestId, paramsReportDetailIdList); + return baseMapper.delete(queryWrapper); + } + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 2e219d6ab..4879c80b5 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -1711,6 +1711,19 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl ids) { + // 关联删除配置数据 + paramsReportConfigDataEOService.deleteByParamsReportDetailIdList(ids); + return removeByIds(ids); + } + /** * 实体对象转成Map * @param obj 实体对象 diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java index 76c937679..a3d285a7a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java @@ -6,9 +6,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.cert.collect.mapper.ParamsManifestEOMapper; import com.jero.modules.cert.collect.vo.ParamsManifestVO; +import com.jero.modules.cert.report.entity.ParamsReportConfigEO; +import com.jero.modules.cert.report.entity.ParamsReportDetailEO; import com.jero.modules.cert.report.entity.ParamsReportEO; +import com.jero.modules.cert.report.mapper.ParamsReportConfigEOMapper; import com.jero.modules.cert.report.mapper.ParamsReportEOMapper; +import com.jero.modules.cert.report.service.IParamsReportDetailEOService; import com.jero.modules.cert.report.service.IParamsReportEOService; +import com.jero.modules.cert.report.service.IParamsReportExportHistoryEOService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,6 +37,15 @@ public class ParamsReportEOServiceImpl extends ServiceImpl configEOQueryWrapper = new LambdaQueryWrapper<>(); + configEOQueryWrapper.eq(ParamsReportConfigEO::getParamsManifestId, id); + paramsReportConfigEOMapper.delete(configEOQueryWrapper); + + // 关联删除收集的参数项(包含配置数据) + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsReportDetailEO::getParamsManifestId, id); + List paramsReportDetailEOList = paramsReportDetailEOService.list(queryWrapper); + if (CollectionUtil.isNotEmpty(paramsReportDetailEOList)) { + List paramsReportDetailIdList = paramsReportDetailEOList.stream().map(ParamsReportDetailEO::getId).collect(Collectors.toList()); + paramsReportDetailEOService.deleteByIds(paramsReportDetailIdList); + } + + // 关联删除导出历史 + paramsReportExportHistoryEOService.deleteByParamsManifestId(id); + + return removeById(id); } /** diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportExportHistoryEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportExportHistoryEOServiceImpl.java index f4444d91a..a296e3492 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportExportHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportExportHistoryEOServiceImpl.java @@ -1,7 +1,9 @@ package com.jero.modules.cert.report.service.impl; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO; import com.jero.modules.cert.report.enums.ExportTypeEnum; import com.jero.modules.cert.report.mapper.ParamsReportExportHistoryEOMapper; @@ -10,11 +12,10 @@ import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Date; -import java.util.Map; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.Date; +import java.util.List; +import java.util.Map; /** * @Description: 上报库导出历史 @@ -119,4 +120,11 @@ public class ParamsReportExportHistoryEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsReportExportHistoryEO::getParamsManifestId, paramsManifestId); + paramsReportExportHistoryEOMapper.delete(queryWrapper); + } }