diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index f20a9f262..e1434cab5 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -506,6 +506,7 @@ INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `co INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1552484136976973825', '1539426795780005889', '新增', NULL, NULL, NULL, NULL, 2, 'report:exportTemplate:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-07-28 10:40:37', NULL, NULL, 0, 0, '1', 0, 'Add'); UPDATE `laws_weilai`.`sys_permission` SET `parent_id` = '1516964175944798210', `name` = '上报库管理', `url` = '/escalationlibrary', `component` = 'parameter/escalationlibrary/index', `component_name` = NULL, `redirect` = NULL, `menu_type` = 1, `perms` = 'params:report:page', `perms_type` = '1', `sort_no` = 3.00, `always_show` = 0, `icon` = NULL, `is_route` = 1, `is_leaf` = 0, `keep_alive` = 0, `hidden` = 0, `description` = NULL, `create_by` = 'admin', `create_time` = '2022-06-22 10:05:03', `update_by` = 'admin', `update_time` = '2022-07-28 10:52:00', `del_flag` = 0, `rule_flag` = 0, `status` = '1', `internal_or_external` = 0, `menu_en` = 'Escalation library management' WHERE `id` = '1539429224550457346'; UPDATE `laws_weilai`.`sys_permission` SET `parent_id` = '1516964175944798210', `name` = '参数导出模板管理', `url` = '/Parameterexport', `component` = 'parameter/parameterexport/index', `component_name` = NULL, `redirect` = NULL, `menu_type` = 1, `perms` = 'report:exportTemplate:page', `perms_type` = '1', `sort_no` = 2.00, `always_show` = 0, `icon` = NULL, `is_route` = 1, `is_leaf` = 0, `keep_alive` = 0, `hidden` = 0, `description` = NULL, `create_by` = 'admin', `create_time` = '2022-06-22 09:55:24', `update_by` = 'admin', `update_time` = '2022-07-28 10:40:02', `del_flag` = 0, `rule_flag` = 0, `status` = '1', `internal_or_external` = 0, `menu_en` = 'Parameter export template management' WHERE `id` = '1539426795780005889'; +INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1554745894282264577', '1552487412749369345', '保存', NULL, NULL, NULL, NULL, 2, 'report:detail:export:save', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-08-03 16:28:02', NULL, NULL, 0, 0, '1', 0, 'Save'); -- 角色表-增加对外报告管理员角色 2022-7-28 已同步生产环境 INSERT INTO `sys_role` VALUES ('1552536424587862017', '对外报告管理员', 'ExternalReportsManager', '对外报告文件夹列表的管理员', 'admin', '2022-7-28 14:08:23', NULL, NULL, NULL, NULL); @@ -692,3 +693,9 @@ CREATE TABLE `laws_weilai`.`problem_knowledge_base_collect` ( `collect_status` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收藏状态', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库收藏表' ROW_FORMAT = Dynamic; + +-- 参数清单 添加字段 2022-08-04 +ALTER TABLE `laws_weilai`.`params_manifest` + ADD COLUMN `params_template_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数模板名称' AFTER `params_template_publish_version`; +ALTER TABLE `laws_weilai`.`params_manifest_history` + ADD COLUMN `params_template_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数模板名称' AFTER `source_params_manifest_id`; \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java index 0e5fa32ec..9d9cb0d9b 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java @@ -94,7 +94,7 @@ public class ParamsManifestEO implements Serializable { @ApiModelProperty(value = "对应参数模板发布版本") private Integer paramsTemplatePublishVersion; - @TableField(exist = false) + @ApiModelProperty(value = "参数模板名称") private String paramsTemplateName; @TableField(exist = false) 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 a27b4ca68..12e46fcfd 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 @@ -43,7 +43,7 @@ pm.project_id as project_id, pm.params_template_id as params_template_id, pm.params_template_publish_version as params_template_publish_version, - pt.params_template_name as params_template_name + if (pt.params_template_name is not null, pt.params_template_name, pm.params_template_name) as params_template_name diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java index ea5d647c5..cbfd3c68c 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java @@ -87,4 +87,7 @@ public interface IParamsManifestEOService extends IService { List> labelListForProjectDetails(String projectId); Map getStatisticsForProjectDetails(String paramsManifestId, String cut); + + // 参数模板删除时，记录参数模板名称到清单 + boolean setTemplateName(List paramsTemplateIds); } 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 18b513804..66829d8f5 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 @@ -705,6 +705,40 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl paramsTemplateIds) { + List updateManifestEOList = new ArrayList<>(); + + // 查询被删除模板信息 + LambdaQueryWrapper paramsTemplateEOLambdaQueryWrapper = new LambdaQueryWrapper<>(); + paramsTemplateEOLambdaQueryWrapper.in(ParamsTemplateEO::getId, paramsTemplateIds); + List paramsTemplateEOList = paramsTemplateEOService.list(paramsTemplateEOLambdaQueryWrapper); + List paramsTemplateIdList = paramsTemplateEOList.stream().map(ParamsTemplateEO::getId).collect(Collectors.toList()); + + // 查询被删除模板的所有清单 + LambdaQueryWrapper paramsManifestEOLambdaQueryWrapper = new LambdaQueryWrapper<>(); + paramsManifestEOLambdaQueryWrapper.in(ParamsManifestEO::getParamsTemplateId, paramsTemplateIdList); + List paramsManifestEOList = list(paramsManifestEOLambdaQueryWrapper); + + paramsTemplateEOList.forEach(templateEO-> { + // 查询使用该模板的所有清单 + List paramsManifestEOS = paramsManifestEOList.stream() + .filter(e-> templateEO.getId().equals(e.getParamsTemplateId())) + .collect(Collectors.toList()); + + paramsManifestEOS.forEach(manifestEO -> { + ParamsManifestEO updateManifestEO = new ParamsManifestEO(); + updateManifestEO.setId(manifestEO.getId()); + updateManifestEO.setParamsTemplateName(templateEO.getParamsTemplateName()); + updateManifestEO.setFinishTime(manifestEO.getFinishTime()); + + updateManifestEOList.add(updateManifestEO); + }); + + }); + return updateBatchById(updateManifestEOList); + } + private void getData(List> data, double quantity, String percentage) { Map map = new HashMap<>(); map.put("quantity", quantity); 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 20b992308..76c937679 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 @@ -1,5 +1,6 @@ package com.jero.modules.cert.report.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -14,6 +15,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * @Description: 上报库 @@ -132,18 +134,31 @@ public class ParamsReportEOServiceImpl extends ServiceImpl updateEOList = new ArrayList<>(); List paramsManifestEOList = paramsManifestEOMapper.listInfoAll(oldParamsManifestIdList); + List paramsManifestIdList = paramsManifestEOList.stream().map(ParamsManifestVO::getId).collect(Collectors.toList()); + List paramsManifestVersionList = paramsManifestEOList.stream().map(ParamsManifestVO::getVersion).collect(Collectors.toList()); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(ParamsReportEO::getOldParamsManifestId, paramsManifestIdList) + .in(ParamsReportEO::getVersion, paramsManifestVersionList); + List paramsReportEOList = list(queryWrapper); + paramsManifestEOList.forEach(paramsManifestVO -> { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ParamsReportEO::getOldParamsManifestId, paramsManifestVO.getId()) - .eq(ParamsReportEO::getVersion, paramsManifestVO.getVersion()); - ParamsReportEO paramsReportEO = getOne(queryWrapper); - ParamsReportEO updateEO = new ParamsReportEO(); - updateEO.setId(paramsReportEO.getId()); - updateEO.setTitle(paramsManifestVO.getTitle()); - updateEO.setProjectName(paramsManifestVO.getProjectName()); + List paramsReportEOS = paramsReportEOList.stream() + .filter(e-> paramsManifestVO.getId().equals(e.getOldParamsManifestId()) && paramsManifestVO.getVersion().equals(e.getVersion())) + .collect(Collectors.toList()); + + if (CollectionUtil.isNotEmpty(paramsReportEOS)) { + ParamsReportEO paramsReportEO = paramsReportEOS.get(0); + + ParamsReportEO updateEO = new ParamsReportEO(); + updateEO.setId(paramsReportEO.getId()); + updateEO.setTitle(paramsManifestVO.getTitle()); + updateEO.setProjectName(paramsManifestVO.getProjectName()); + + updateEOList.add(updateEO); + } - updateEOList.add(updateEO); }); return updateBatchById(updateEOList); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java index 8e69d4f13..4d44a3fa7 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java @@ -2,6 +2,7 @@ package com.jero.modules.cert.template.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.system.vo.LoginUser; +import com.jero.modules.cert.collect.service.IParamsManifestEOService; import com.jero.modules.cert.template.entity.CertCategoryParamsInfoEO; import com.jero.modules.cert.template.entity.ParamsInfoEO; import com.jero.modules.cert.template.entity.ParamsTemplateEO; @@ -16,10 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.transaction.Transactional; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.UUID; +import java.util.*; /** * @Description: 参数模板表 @@ -37,6 +35,9 @@ public class ParamsTemplateEOServiceImpl extends ServiceImpl