From b4c7a13bf4fbe7c3a708c4bb5e4dbcfe43c227f6 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 8 Jul 2022 16:00:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E6=B8=85?= =?UTF-8?q?=E5=8D=95-=E5=85=B3=E8=81=94=E5=88=A0=E9=99=A4=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/ParamsManifestEOMapper.java | 5 +++ .../mapper/xml/ParamsManifestEOMapper.xml | 21 +++++++++++ ...ParamsCollectManifestHistoryEOService.java | 8 ++++ .../IParamsConfigDataHistoryEOService.java | 4 +- .../IParamsManifestHistoryEOService.java | 2 + ...msCollectManifestHistoryEOServiceImpl.java | 13 +++++++ .../ParamsConfigDataHistoryEOServiceImpl.java | 12 ++++++ .../impl/ParamsManifestEOServiceImpl.java | 19 ++++++++++ .../ParamsManifestHistoryEOServiceImpl.java | 37 ++++++++++++++++++- .../cert/collect/vo/ParamsManifestVO.java | 2 + 10 files changed, 121 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java index a099fd871..280efb58f 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsManifestEOMapper.java @@ -3,8 +3,11 @@ package com.jero.modules.cert.collect.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.cert.collect.entity.ParamsManifestEO; +import com.jero.modules.cert.collect.vo.ParamsManifestVO; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @Description: 参数清单 * @Author: jero-boot @@ -18,4 +21,6 @@ public interface ParamsManifestEOMapper extends BaseMapper { @Param("state") String state, IPage page); + List listInfoAll(@Param("idList") List idList); + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml index be1ffc81c..5ed28fbca 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml @@ -20,6 +20,7 @@ + @@ -72,6 +73,7 @@ select pm.id as id, pm.title as title, + pm.version as version, pm.project_id as project_id, pm.state as state, concat(pni.project_name,'-',pyni.year_name) as project_name, @@ -91,4 +93,23 @@ order by create_time desc + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java index ca3d42c9d..8d97915fc 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestHistoryEOService.java @@ -34,4 +34,12 @@ public interface IParamsCollectManifestHistoryEOService extends IService> getHeader(String paramsManifestId, String flag, String cut); + /** + * 批量删除 + * + * @param ids + * @return + */ + boolean deleteByIds(List ids); + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java index d7f6f1f41..13fb9d79c 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataHistoryEOService.java @@ -1,7 +1,6 @@ package com.jero.modules.cert.collect.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.cert.collect.entity.ParamsConfigDataEO; import com.jero.modules.cert.collect.entity.ParamsConfigDataHistoryEO; import java.util.List; @@ -29,4 +28,7 @@ public interface IParamsConfigDataHistoryEOService extends IService queryListByConfigIdList(List configIdList); + + int deleteByParamsCollectManifestIdList(List paramsCollectManifestIdList); + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java index c66c62790..5d30be7c2 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java @@ -17,4 +17,6 @@ public interface IParamsManifestHistoryEOService extends IService getHistoryVersionList(String paramsManifestId); + + void deleteAllHistoryVersion(List paramsManifestIdList); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java index cc8457f40..9deb0dc6a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java @@ -455,6 +455,19 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl ids) { + // 关联删除配置数据 + paramsConfigDataHistoryEOService.deleteByParamsCollectManifestIdList(ids); + return removeByIds(ids); + } + /** * 获取一个类和其父类的所有属性 * diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java index 08ac676f1..620f6da2b 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataHistoryEOServiceImpl.java @@ -7,6 +7,7 @@ import com.jero.modules.cert.collect.entity.ParamsConfigDataEO; import com.jero.modules.cert.collect.entity.ParamsConfigDataHistoryEO; import com.jero.modules.cert.collect.mapper.ParamsConfigDataHistoryEOMapper; import com.jero.modules.cert.collect.service.IParamsConfigDataHistoryEOService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -20,6 +21,9 @@ import java.util.List; @Service public class ParamsConfigDataHistoryEOServiceImpl extends ServiceImpl implements IParamsConfigDataHistoryEOService { + @Autowired + private ParamsConfigDataHistoryEOMapper paramsConfigDataHistoryEOMapper; + /** * 通过id查询 * @@ -50,4 +54,12 @@ public class ParamsConfigDataHistoryEOServiceImpl extends ServiceImpl paramsCollectManifestIdList) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(ParamsConfigDataEO::getParamsCollectManifestId, paramsCollectManifestIdList); + return paramsConfigDataHistoryEOMapper.delete(queryWrapper); + } + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 843676384..49a3b33ab 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -20,6 +20,7 @@ import com.jero.modules.cert.collect.mapper.ParamsConfigEOMapper; import com.jero.modules.cert.collect.mapper.ParamsManifestEOMapper; import com.jero.modules.cert.collect.service.*; import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO; +import com.jero.modules.cert.report.service.IParamsReportEOService; import com.jero.modules.cert.template.entity.ParamsInfoPublishEO; import com.jero.modules.cert.template.entity.ParamsTemplateEO; import com.jero.modules.cert.template.service.IParamsInfoPublishEOService; @@ -81,6 +82,9 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl idList = new ArrayList<>(); + idList.add(id); + paramsManifestHistoryEOService.deleteAllHistoryVersion(idList); + + // 添加上报库的项目名称和清单标题 + paramsReportEOService.setProjectNameAndTitle(idList); + return removeById(id); } @@ -251,6 +263,13 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl getHistoryVersionList(String paramsManifestId) { - // 同一项目下标题时唯一的，历史版本和当前版本通过标题进行关联 + // 历史版本和当前版本通过id进行关联 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ParamsManifestHistoryEO::getSourceParamsManifestId, paramsManifestId) .orderByAsc(ParamsManifestHistoryEO::getVersion); @@ -149,4 +151,37 @@ public class ParamsManifestHistoryEOServiceImpl extends ServiceImpl paramsManifestIdList) { + LambdaQueryWrapper manifestHistoryEOLambdaQueryWrapper = new LambdaQueryWrapper<>(); + manifestHistoryEOLambdaQueryWrapper.in(ParamsManifestHistoryEO::getSourceParamsManifestId, paramsManifestIdList); + List list = list(manifestHistoryEOLambdaQueryWrapper); + if (CollectionUtil.isNotEmpty(list)) { + List ids = list.stream().map(ParamsManifestHistoryEO::getId).collect(Collectors.toList()); + + // 关联删除配置 + LambdaQueryWrapper configEOQueryWrapper = new LambdaQueryWrapper<>(); + configEOQueryWrapper.in(ParamsConfigHistoryEO::getParamsManifestId, ids); + paramsConfigHistoryEOMapper.delete(configEOQueryWrapper); + + // 关联删除收集的参数项（包含配置数据） + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(ParamsCollectManifestHistoryEO::getParamsManifestId, ids); + List paramsCollectManifestHistoryEOList = paramsCollectManifestHistoryEOService.list(queryWrapper); + if (CollectionUtil.isNotEmpty(paramsCollectManifestHistoryEOList)) { + List paramsCollectManifestIdList = paramsCollectManifestHistoryEOList.stream().map(ParamsCollectManifestHistoryEO::getId).collect(Collectors.toList()); + paramsCollectManifestHistoryEOService.deleteByIds(paramsCollectManifestIdList); + + } + + // 删除清单对应的所有历史版本清单 + paramsManifestHistoryEOMapper.delete(manifestHistoryEOLambdaQueryWrapper); + } + } + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java index 187fe1d54..cec703acd 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java @@ -1,5 +1,6 @@ package com.jero.modules.cert.collect.vo; +import io.swagger.models.auth.In; import lombok.Data; /** @@ -12,6 +13,7 @@ public class ParamsManifestVO { private String id; private String title; + private Integer version; private String projectName; private String projectId; private String state;