项目库-删除: 关联删除收集清单

2022-09-16 12:52:09 +08:00
parent 650d7006f4
commit 84362ef72f
152 changed files with 228 additions and 104 deletions
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.jero.boot</groupId>
-        <artifactId>jero-boot</artifactId>
-        <version>2.4.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>jero-boot-module-certification</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.jero.boot</groupId>
-            <artifactId>jero-boot-modules</artifactId>
-            <version>${jero.version}</version>
-        </dependency>
-    </dependencies>
-</project>
@@ -1,22 +1,13 @@
 package com.jero.modules.cert.collect.controller;

-import java.util.Arrays;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import com.jero.common.api.vo.Result;
-import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestUserTypeLogEO;
 import com.jero.modules.cert.collect.service.IParamsCollectManifestUserTypeLogEOService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.jero.common.aspect.annotation.AutoLog;
@@ -1,17 +1,13 @@
 package com.jero.modules.cert.collect.entity;

-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;

 import java.io.Serializable;

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;

 import java.io.Serializable;

@@ -1,11 +1,8 @@
 package com.jero.modules.cert.collect.enums;

 import cn.hutool.core.collection.CollectionUtil;
-import com.jero.modules.project.entity.ConditionAssessmentEO;
-import com.jero.modules.split.enums.StandFileClassifyEnum;

 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;

@@ -1,7 +1,6 @@
 package com.jero.modules.cert.collect.enums;

 import com.jero.common.constant.enums.CutEnum;
-import com.jero.modules.cert.report.enums.ExportTemplateStateEnum;

 import java.util.HashMap;
 import java.util.Map;
@@ -1,8 +1,5 @@
 package com.jero.modules.cert.collect.mapper;

-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestUserTypeLogEO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

@@ -1,8 +1,5 @@
 package com.jero.modules.cert.collect.mapper;

-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
 import com.jero.modules.cert.collect.entity.ParamsConfigHistoryEO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

@@ -51,6 +51,13 @@ public interface IParamsManifestEOService extends IService<ParamsManifestEO> {
 	 */
    boolean deleteByIds(List<String> ids, String cut);

+	/**
+	 * 删除项目下的所有收集清单
+	 * @param projectId
+	 * @return
+	 */
+    boolean deleteByProjectId(String projectId);
+
 	/**
 	 * 通过id查询
 	 *
@@ -282,6 +282,47 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
        return removeByIds(ids);
    }

+	/**
+	 * 删除项目下的所有收集清单
+	 *
+	 * @param projectId
+	 * @return
+	 */
+	@Override
+    public boolean deleteByProjectId(String projectId) {
+		// 查询项目下的所有清单
+		LambdaQueryWrapper<ParamsManifestEO> manifestEOQueryWrapper = new LambdaQueryWrapper<>();
+		manifestEOQueryWrapper.eq(ParamsManifestEO :: getProjectId, projectId);
+		List<ParamsManifestEO> paramsManifestEOList = list(manifestEOQueryWrapper);
+		List<String> ids = new ArrayList<>();
+		if (CollectionUtil.isNotEmpty(paramsManifestEOList)) {
+			ids = paramsManifestEOList.stream().map(ParamsManifestEO::getId).collect(Collectors.toList());
+
+			// 关联删除配置
+			LambdaQueryWrapper<ParamsConfigEO> configEOQueryWrapper = new LambdaQueryWrapper<>();
+			configEOQueryWrapper.in(ParamsConfigEO::getParamsManifestId, ids);
+			paramsConfigEOMapper.delete(configEOQueryWrapper);
+
+			// 关联删除收集的参数项（包含配置数据）
+			LambdaQueryWrapper<ParamsCollectManifestEO> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.in(ParamsCollectManifestEO::getParamsManifestId, ids);
+			List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOService.list(queryWrapper);
+			if (CollectionUtil.isNotEmpty(paramsCollectManifestEOList)) {
+				List<String> paramsCollectManifestIdList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getId).collect(Collectors.toList());
+				paramsCollectManifestEOService.deleteByIds(paramsCollectManifestIdList);
+
+			}
+
+			// 删除对应的历史版本数据
+			paramsManifestHistoryEOService.deleteAllHistoryVersion(ids);
+
+			// 添加上报库的项目名称和清单标题
+			paramsReportEOService.setProjectNameAndTitle(ids);
+
+		}
+		return removeByIds(ids);
+    }
+
 	/**
 	 * 通过id查询
 	 *
@@ -1,10 +1,8 @@
 package com.jero.modules.cert.report.entity;

-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestBaseEO;
-import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -2,7 +2,6 @@ package com.jero.modules.cert.report.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
 import com.jero.modules.cert.report.vo.ParamsReportDetailVO;
 import org.apache.ibatis.annotations.Param;
@@ -1,7 +1,5 @@
 package com.jero.modules.cert.report.mapper;

-import java.util.List;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO;
--- a/Show More
+++ b/Show More