From 0654ce036a3deb724e51c907680f0a2c61ec7fa0 Mon Sep 17 00:00:00 2001 From: dxc Date: Mon, 22 Nov 2021 14:58:16 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectrecord/service/impl/ProjectRecordServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index a2210e9..8836f53 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -159,6 +159,10 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl Date: Wed, 24 Nov 2021 15:28:13 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=AB=9E=E8=B0=88?= =?UTF-8?q?=E9=82=80=E8=AF=B7=E6=96=B9=E5=BC=8F=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectRecordServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index 8836f53..15262b5 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -673,10 +673,11 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl Date: Wed, 24 Nov 2021 16:34:29 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E7=AB=9E=E8=B0=88=E9=82=80=E8=AF=B7=E6=96=B9=E5=BC=8F=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectRecordServiceImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index 15262b5..8836f53 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -673,11 +673,10 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl Date: Fri, 3 Dec 2021 14:05:42 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=A0=87=E6=AE=B5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=88=E6=A0=87=E6=AE=B5?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectSectionServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java index 2a47a77..da5741f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java @@ -105,6 +105,10 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl Date: Thu, 23 Dec 2021 09:09:22 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=A2=E4=BB=B7?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E5=90=8D=E7=A7=B0=E5=92=8C=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=AD=A3=E5=88=99=E6=A0=A1=E9=AA=8C=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E8=BE=93=E5=85=A5=E6=96=87=E4=BB=B6=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebtp/project/common/InquiryCommonUtil.java | 5 +++++ .../ebtp/project/common/ProjectExceptionEnum.java | 4 ++++ .../impl/ProjectEntrustInquiryServiceImpl.java | 14 ++++++++++++++ 3 files changed, 23 insertions(+) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/common/InquiryCommonUtil.java b/src/main/java/com/chinaunicom/mall/ebtp/project/common/InquiryCommonUtil.java index 3fb02e2..79f81a1 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/common/InquiryCommonUtil.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/common/InquiryCommonUtil.java @@ -112,4 +112,9 @@ public class InquiryCommonUtil { put(SELECT_TYPE_0,ProjectCommonUtil.EVAL_METHOD_2); put(SELECT_TYPE_1,ProjectCommonUtil.EVAL_METHOD_1); }}; + + /** + * 文件名称特殊字符校验规则 + */ + public static final String FILE_NAME_PATTERN = "[\\s\\\\/:\\*\\?\\\"<>\\|]"; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java index 6721732..d9ef8f1 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java @@ -177,6 +177,10 @@ public enum ProjectExceptionEnum implements BusinessExceptionAssert { FRAME_EXCEPTION_PROJECT_ENTRUST_AGENCY_COMPANY_EMPTY(110082, "项目委托信息代理机构ID为空！"), FRAME_EXCEPTION_USER_PROVINCE_EMPTY(110083, "用户信息或者用户的所属省分编码为空！"), + + FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_NAME_ERROR(110084,"询价应答格式列表数据中目录名称包含特殊字符"), + + FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_CATEGORY_NAME_ERROR(110085,"询价应答格式列表数据中类别名称包含特殊字符"), ; /** diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java index 472ae99..8abcb13 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java @@ -30,6 +30,7 @@ import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.regex.Pattern; /** * 项目询价serviceImpl @@ -286,6 +287,19 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl 0){ ProjectExceptionEnum.FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_CODE_EMPTY.throwException(); } + + Pattern pattern = Pattern.compile(InquiryCommonUtil.FILE_NAME_PATTERN); + //获取目录名称中包含特殊字符 + long isNamePatternCount = inquiryVO.getResponseFormatList().stream().filter(n -> StringUtils.isNotBlank(n.getName()) && pattern.matcher(n.getName()).find()).count(); + if(isNamePatternCount > 0){ + ProjectExceptionEnum.FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_NAME_ERROR.throwException(); + } + + //获取目录名称中包含特殊字符 + long isCategoryNamePatternCount = inquiryVO.getResponseFormatList().stream().filter(n -> StringUtils.isNotBlank(n.getCategoryName()) && pattern.matcher(n.getCategoryName()).find()).count(); + if(isCategoryNamePatternCount > 0){ + ProjectExceptionEnum.FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_CATEGORY_NAME_ERROR.throwException(); + } } } } From 8a8650ac4a528f7962dde965312eb3b1bbb1548e Mon Sep 17 00:00:00 2001 From: dxc Date: Mon, 27 Dec 2021 08:45:51 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=A2=E4=BB=B7?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E5=90=8D=E7=A7=B0=E4=B8=8D=E8=83=BD=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/project/common/ProjectExceptionEnum.java | 2 ++ .../service/impl/ProjectEntrustInquiryServiceImpl.java | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java index d9ef8f1..c9d4d3e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java @@ -181,6 +181,8 @@ public enum ProjectExceptionEnum implements BusinessExceptionAssert { FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_NAME_ERROR(110084,"询价应答格式列表数据中目录名称包含特殊字符"), FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_CATEGORY_NAME_ERROR(110085,"询价应答格式列表数据中类别名称包含特殊字符"), + + FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_NAME_EMPTY(110086,"询价应答格式列表数据中目录名称为空"), ; /** diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java index 8abcb13..35390f0 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java @@ -288,6 +288,12 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl StringUtils.isEmpty(n.getName())).count(); + if(isEmptyNameCount > 0){ + ProjectExceptionEnum.FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_NAME_EMPTY.throwException(); + } + Pattern pattern = Pattern.compile(InquiryCommonUtil.FILE_NAME_PATTERN); //获取目录名称中包含特殊字符 long isNamePatternCount = inquiryVO.getResponseFormatList().stream().filter(n -> StringUtils.isNotBlank(n.getName()) && pattern.matcher(n.getName()).find()).count(); From 83662fc6dd169e35636707eb747ff69e3970a6be Mon Sep 17 00:00:00 2001 From: dxc Date: Mon, 27 Dec 2021 08:56:57 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=A2=E4=BB=B7?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E5=90=8D=E7=A7=B0=E4=B8=8D=E8=83=BD=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E5=92=8C30=E4=B8=AA=E5=AD=97=E7=AC=A6=E7=9A=84?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/project/common/ProjectExceptionEnum.java | 2 +- .../service/impl/ProjectEntrustInquiryServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java index c9d4d3e..eee6bf1 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java @@ -182,7 +182,7 @@ public enum ProjectExceptionEnum implements BusinessExceptionAssert { FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_CATEGORY_NAME_ERROR(110085,"询价应答格式列表数据中类别名称包含特殊字符"), - FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_NAME_EMPTY(110086,"询价应答格式列表数据中目录名称为空"), + FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_NAME_EMPTY(110086,"询价应答格式列表数据中目录名称不能为空字符并且不能超过30个字符"), ; /** diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java index 35390f0..a58a20c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java @@ -289,7 +289,7 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl StringUtils.isEmpty(n.getName())).count(); + long isEmptyNameCount = inquiryVO.getResponseFormatList().stream().filter(n -> StringUtils.isEmpty(n.getName()) || n.getName().length() > 30).count(); if(isEmptyNameCount > 0){ ProjectExceptionEnum.FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_NAME_EMPTY.throwException(); } From e8017b1d7f493fec3afe163c2afc998b4dcbcbc3 Mon Sep 17 00:00:00 2001 From: dxc Date: Mon, 27 Dec 2021 15:08:27 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9redis=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 91528ae..29750c9 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.chinaunicom.ebtp mall-ebtp-cloud-parent - 2.0.0-SNAPSHOT + 2.0.1-SNAPSHOT com.chinaunicom.mall.ebtp biz_service_ebtp_project @@ -18,7 +18,7 @@ com.chinaunicom.mall.ebtp uboot-core - 2.0.0-SNAPSHOT + 2.0.1-SNAPSHOT From ff1362c885789c2d044a7235a9a467cfef8aacbd Mon Sep 17 00:00:00 2001 From: dxc Date: Tue, 4 Jan 2022 13:41:56 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=A2=9E=E5=8A=A0=E6=AD=A3=E5=88=99=E8=A1=A8?= =?UTF-8?q?=E8=BE=BE=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/project/common/ProjectCommonUtil.java | 5 +++++ .../service/impl/ProjectReEvaluationServiceImpl.java | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java index 1f6067d..a9567e0 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java @@ -569,4 +569,9 @@ public class ProjectCommonUtil { * 集团编码 */ public static final String PROVINCES_BLOC = "001000"; + + /** + * 账号兼职正则表达式 + */ + public static final String REG_PATTEN = "^.+_\\d*$"; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java index 237241d..d72760c 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java @@ -43,6 +43,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.*; +import java.util.regex.Pattern; import java.util.stream.Collectors; /** @@ -247,6 +248,13 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl Date: Tue, 4 Jan 2022 13:47:16 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=A2=9E=E5=8A=A0=E6=AD=A3=E5=88=99=E8=A1=A8?= =?UTF-8?q?=E8=BE=BE=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectReEvaluationServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java index d72760c..e7ced23 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java @@ -268,8 +268,8 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl