From 445a1c03f2d911bb6b7f30b29aba0f6c62ffe45a Mon Sep 17 00:00:00 2001 From: lixuetao Date: Thu, 30 Jun 2022 10:53:28 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=86=8D=E5=86=B3=E5=AE=9A=E8=83=BD?= =?UTF-8?q?=E5=90=A6=E8=BF=9B=E5=85=A5=E6=94=B6=E9=9B=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/TaskParameterCollection.vue | 26 ++++++++++++++----- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 9d0b387a8..d6793169d 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -729,6 +729,7 @@ module.exports = { ParameteItemCollectionList: 'Parameter item collection list', Areyousureparameteritems: 'Are you sure to submit the selected parameter items?', Theselectedconfiguration: 'The configuration can only be added when the parameter items in the parameter list are to be collected or changed', + NoConfigurationNotStart: 'No configuration added, unable to start collection, please check', theCurrent: 'The current status of this data is', thisbuttonCompleted: 'This button can only be operated when the status is completed', Frozenstatus: 'Frozen status, can only be viewed', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 5866766a0..9a78d7916 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -740,6 +740,7 @@ module.exports = { ParameteItemCollectionList: '参数项收集清单', Areyousureparameteritems: '确认提交所选参数项嘛?', Theselectedconfiguration: '参数清单中参数项均为待发起收集或变更时，才能添加配置', + NoConfigurationNotStart: '未添加任何配置，无法开始收集，请检查', theCurrent: '此数据当前状态为', thisbuttonCompleted: '当状态为"已完成"时，才可操作此按钮', Frozenstatus: '冻结状态,仅可以查看', diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 5d7eae391..cc059baea 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -107,6 +107,7 @@ import axios from 'axios' import Vue from 'vue' import { ACCESS_TOKEN } from '@/store/mutation-types' + import eventBUs from '@/common/event' export default { name: 'TaskParameterCollection', @@ -177,7 +178,8 @@ deleteAll: 'params/manifest/deleteBatch', conAdd: 'params/config/addBatch', conList: 'params/config/list', - changeExtension:'params/manifest/changeExtension' + changeExtension:'params/manifest/changeExtension', + verifyConfig: 'params/manifest/verifyConfig' }, loading: false, dataSource: [], @@ -206,12 +208,22 @@ }, methods: { paramsManifestClick(item) { - localStorage.setItem('paramsManifest', JSON.stringify(item)) - let newUrl = this.$router.resolve({ - path: '/ParameterItemCollection', - query: item, + let _this = this + // 先调取接口判断是否有配置信息 + getAction(this.url.verifyConfig, { paramsManifestId: item.id }).then((res) => { + if (res.result) { + localStorage.setItem('paramsManifest', JSON.stringify(item)) + let newUrl = _this.$router.resolve({ + path: '/ParameterItemCollection', + query: item, + }) + window.open(newUrl.href, '_blank') + } else { + _this.$message.success(_this.$t('NoConfigurationNotStart')) + } }) - window.open(newUrl.href, '_blank') + + }, deleteLib(val) { if(val.state === '已完成' || val.state === 'Finished' ) { @@ -381,7 +393,7 @@ /deep/ .ant-table td { white-space: normal; } - + .doc-detail { background: #fff; height: 100%; From 4473fd9489977e4491a796d20e3bf6bcf9dfc493 Mon Sep 17 00:00:00 2001 From: lixuetao Date: Thu, 30 Jun 2022 11:16:45 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=9A=84=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E5=8F=A0=E5=9C=A8=E4=B8=80=E8=B5=B7=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 ++ jero-web/src/common/lang/zh-cn.js | 2 ++ .../components/TaskParameterCollection.vue | 8 +++----- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index d6793169d..864996229 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -772,7 +772,9 @@ module.exports = { configure: 'Configure', parameter: 'Parameter', changeExtension: 'Change Extension', + addDetailList: 'Add', detailedList: 'DetailedList', + copyParamDetailList: 'Copy Parameter List', collectionCompletionTime: 'Collection Completion Time', parameterTemplateName: 'Parameter Template Name', onlyThree: 'Only letters, numbers and horizontal bars (-) can be entered', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 9a78d7916..be54f48e2 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -783,7 +783,9 @@ module.exports = { configure: '配置', parameter: '参数', changeExtension: '变更扩展', + addDetailList: '添加清单', detailedList: '清单', + copyParamDetailList: '复制参数清单', collectionCompletionTime: '收集完成时间', parameterTemplateName: '参数模板名称', onlyThree: '只能输入字母，数字，横杠（-）三种内容', diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index cc059baea..6ed9e5364 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -24,7 +24,7 @@
- {{$t('add')}}{{ $t('detailedList') }} + {{$t('addDetailList')}}
@@ -32,9 +32,9 @@
- {{$t('copy')}}{{$t('parameter')}}{{ $t('detailedList') }} + {{$t('copyParamDetailList')}}
-
+
{{$t('BatchDelete')}}
@@ -222,8 +222,6 @@ _this.$message.success(_this.$t('NoConfigurationNotStart')) } }) - - }, deleteLib(val) { if(val.state === '已完成' || val.state === 'Finished' ) { From 4fa98da31a6c7471381c77f8a36d929f551ae3c1 Mon Sep 17 00:00:00 2001 From: lixuetao Date: Thu, 30 Jun 2022 11:43:27 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E9=97=AE=E9=A2=98=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/TaskParameterCollection.vue | 3 +-- .../dialog/ProjectCollectionParameters.vue | 14 ++++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 6ed9e5364..571641062 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -92,8 +92,7 @@ - - + diff --git a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue index b4104eaaa..8b4388419 100644 --- a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue +++ b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue @@ -52,8 +52,13 @@ :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}' @change='handleTableChange'> - {{ text }} + + + + {{ text }} + +
Date: Thu, 30 Jun 2022 11:46:47 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9-bug55113?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsInfoEOServiceImpl.java | 65 +++++++++++++++---- 1 file changed, 52 insertions(+), 13 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index a02b651ac..e4a311b2e 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -127,7 +127,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl ccParamsInfoList = certCategoryParamsInfoEOList.stream() .collect(Collectors.collectingAndThen(Collectors - .toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getCertCategory() + ";" + o.getParamsNumber()))), ArrayList::new)); + .toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getParamsNumber()))), ArrayList::new)); if (ccParamsInfoList.size() < certCategoryParamsInfoEOList.size()) { if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) { throw new JeroBootException("不同类别间参数编号必须唯一！"); @@ -212,7 +212,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl ccParamsInfoList = certCategoryParamsInfoEOList.stream() .collect(Collectors.collectingAndThen(Collectors - .toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getCertCategory() + ";" + o.getParamsNumber()))), ArrayList::new)); + .toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getParamsNumber()))), ArrayList::new)); if (ccParamsInfoList.size() < certCategoryParamsInfoEOList.size()) { if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) { throw new JeroBootException("不同类别间参数编号必须唯一！"); @@ -260,7 +260,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl 不能删 发布版用的同一文件 return removeById(id); } @@ -280,7 +280,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl nioNumberList = paramsInfoEOList.stream().map(ParamsInfoEO::getNioNumber).collect(Collectors.toList()); // 关联删除认证类别参数项 certCategoryParamsInfoEOService.deleteByNioNumberList(nioNumberList, paramsTemplateId); - // TODO 关联删除附件模板文件信息和文件 + // 关联删除附件模板文件信息和文件 ---> 不能删 发布版用的同一文件 } return removeByIds(ids); @@ -1098,11 +1098,11 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl nioNumberImport = new ArrayList<>(); // 记录导入的nio编号 int i = 1; //记录行号 - int num = 0; //记录是第几条数据 //循环验证数据 for (ParamsInfoCnImport dto : paramsInfoEOList) { //判断此行数据是否全部为空,是则不读取 if (checkObjAllFieldsIsNull(dto)) { + i++; continue; } @@ -1318,10 +1318,14 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl> ccDtoMap : certCategoryParamsInfoEOListMap.entrySet()) { String certCategory = ccDtoMap.getKey(); List ccDtoList = ccDtoMap.getValue(); + + List ccNioNumberImport = new ArrayList<>(); // 记录导入的nio编号 + int j = 1; for (CertCategoryParamsInfoCnImport ccDto : ccDtoList) { //判断此行数据是否全部为空,是则不读取 if (checkObjAllFieldsIsNull(ccDto)) { + j++; continue; } @@ -1351,6 +1355,20 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl ccDtoAfterDistinct = ccDtoList.stream() + .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> + new TreeSet<>(Comparator.comparing(o -> o.getNioNumber() + ";" + o.getCertCategory()))), ArrayList::new)); + if (ccDtoAfterDistinct.size() < ccDtoList.size()) { + // 取差集 + String reduceOne = ccDtoList.stream() + .filter(e->!ccDtoAfterDistinct.contains(e)).map(CertCategoryParamsInfoCnImport::getNioNumber).collect(Collectors.joining(",")); + if (StringUtils.isNotBlank(reduceOne)) { + if (CutEnum.CN.getValue().equals(cut)) { + stringMessage.add("导入数据中NIO编号：" + reduceOne + "下存在重复认证类别；"); + } else { + stringMessage.add("Repeat cert category exist in NIO Number: " + reduceOne + ";"); + } + } + } + certCategoryParamsInfoEOList.addAll(ccDtoList); } // 校验同 nio下认证参数编号唯一 - List ccDtoAfterDistinct = certCategoryParamsInfoEOList.stream() + List ccDtoAfterDistinctTwo = certCategoryParamsInfoEOList.stream() .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> - new TreeSet<>(Comparator.comparing(o -> o.getNioNumber() + ";" + o.getCertCategory()))), ArrayList::new)); - if (ccDtoAfterDistinct.size() < certCategoryParamsInfoEOList.size()) { - if(CutEnum.CN.getValue().equals(cut)) { - stringMessage.add("导入数据中存在重复认证编号；"); - } else { - stringMessage.add("Repeat number exist in the Import Data;"); + new TreeSet<>(Comparator.comparing(o -> o.getNioNumber() + ";" + o.getParamsNumber()))), ArrayList::new)); + if (ccDtoAfterDistinctTwo.size() < certCategoryParamsInfoEOList.size()) { + // 取差集 + String reduceTwo = certCategoryParamsInfoEOList.stream() + .filter(e->!ccDtoAfterDistinctTwo.contains(e)).map(CertCategoryParamsInfoCnImport::getNioNumber).collect(Collectors.joining(",")); + if (StringUtils.isNotBlank(reduceTwo)) { + if (CutEnum.CN.getValue().equals(cut)) { + stringMessage.add("导入数据中NIO编号：" + reduceTwo + "下存在重复认证编号；"); + } else { + stringMessage.add("Repeat number exist in NIO Number: " + reduceTwo + ";"); + } } } - Map map = new HashMap(); if (stringMessage.isEmpty()) { map.put("result", true); From 92536a12f09d8711e6a703277010fd74f015d2c0 Mon Sep 17 00:00:00 2001 From: lixuetao Date: Thu, 30 Jun 2022 12:13:45 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E4=BB=A3=E7=A0=81=E6=96=87=E4=BB=B6=E6=89=80?= =?UTF-8?q?=E5=9C=A8=E7=9A=84=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ProjectDetails => }/index.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) rename jero-web/src/views/projectManagement/ParameterItemCollection/{ProjectDetails => }/index.vue (92%) diff --git a/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ParameterItemCollection/index.vue similarity index 92% rename from jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue rename to jero-web/src/views/projectManagement/ParameterItemCollection/index.vue index 8ada0ce43..b43b77d8c 100644 --- a/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ParameterItemCollection/index.vue @@ -71,15 +71,15 @@