diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 2cee5351c..de2030c9c 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -60,4 +60,16 @@ CREATE TABLE `laws_process_history` ( -- 参数项收集清单表 添加字段 ALTER TABLE `laws_weilai`.`params_collect_manifest` - ADD COLUMN `del_flag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标识' AFTER `change_flag`; \ No newline at end of file + ADD COLUMN `del_flag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标识' AFTER `change_flag`; +-- 参数配置数据表 修改字段长度 +ALTER TABLE `laws_weilai`.`params_config_data` + MODIFY COLUMN `text_data` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文本类型数据' AFTER `sys_org_code`, + MODIFY COLUMN `pull_data` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '下拉类型数据' AFTER `text_data`; +-- 参数配置数据历史版本表 修改字段长度 +ALTER TABLE `laws_weilai`.`params_config_data_history` + MODIFY COLUMN `text_data` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文本类型数据' AFTER `sys_org_code`, + MODIFY COLUMN `pull_data` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '下拉类型数据' AFTER `text_data`; +-- 上报库参数配置数据表 修改字段长度 +ALTER TABLE `laws_weilai`.`params_report_config_data` + MODIFY COLUMN `text_data` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文本类型数据' AFTER `sys_org_code`, + MODIFY COLUMN `pull_data` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '下拉类型数据' AFTER `text_data`; \ 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 2d619154b..68430dd6e 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 @@ -1,9 +1,6 @@ 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.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -74,6 +71,7 @@ public class ParamsManifestEO implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "收集完成时间") + @TableField(updateStrategy = FieldStrategy.IGNORED) private java.util.Date finishTime; /**版本*/ diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 78b56eb9b..957d0cb9a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -250,7 +250,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列 TODO 添加用户类型权限 + List list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列 List paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列 // 普通数据字典 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 a33e6ac74..ecf1459c8 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 @@ -300,15 +300,14 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl map = paramsCollectManifestEOService.isCollectFinished(sourceManifestId); + Boolean finish = (Boolean) map.get("finish"); + if (!finish) { + if (CutEnum.CN.getValue().equals(paramsManifestEO.getCut())) { + throw new JeroBootException("清单收集中，无法复制！"); + } else { + throw new JeroBootException("Manifest collection, and cannot be copied!"); + } + } + String paramsTemplateId = paramsManifestEO.getParamsTemplateId(); int paramsTemplatePublishVersion = paramsManifestEO.getParamsTemplatePublishVersion(); @@ -547,24 +557,26 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl sysDictItemList = sysDictItemService.selectItemsByDictCode("cert_category"); + sysDictItemList.sort(Comparator.comparing(SysDictItem::getSortOrder)); // 升序 Map certCategoryMap = new HashMap<>(); if (CutEnum.CN.getValue().equals(cut)) { certCategoryMap = sysDictItemList.stream().collect(Collectors.toMap(c -> c.getItemValue(), c -> c.getItemText())); } else { certCategoryMap = sysDictItemList.stream().collect(Collectors.toMap(c -> c.getItemValue(), c -> c.getEnName())); } - for (CertCategoryParamsInfoEO certCategoryParamsInfoEO : certCategoryParamsInfoEOList) { - certCategoryParamsInfoEO.setCertCategory_dictText(certCategoryMap.get(certCategoryParamsInfoEO.getCertCategory())); + + List certCategoryParamsInfoEOListOrdered = new ArrayList<>(); + for (SysDictItem sysDictItem : sysDictItemList) { + List certCategoryParamsInfoEOS = certCategoryParamsInfoEOList.stream() + .filter(e->sysDictItem.getItemValue().equals(e.getCertCategory())).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(certCategoryParamsInfoEOS)) { + CertCategoryParamsInfoEO certCategoryParamsInfoEO = certCategoryParamsInfoEOS.get(0); + certCategoryParamsInfoEO.setCertCategory_dictText(certCategoryMap.get(certCategoryParamsInfoEO.getCertCategory())); + + certCategoryParamsInfoEOListOrdered.add(certCategoryParamsInfoEO); + } } + paramsInfoEO.setCertCategoryParamsInfoEOList(certCategoryParamsInfoEOList); return paramsInfoEO; }