From ad1a9067e9d256221a5f4ba22e46a750faa0e3a2 Mon Sep 17 00:00:00 2001
From: zhangqinbin <181961702@qq.com>
Date: Fri, 6 May 2022 16:35:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E5=A7=94=E6=89=98=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E3=80=81=E6=A0=87=E6=AE=B5=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E3=80=81=E6=A0=87=E6=AE=B5=E7=BC=96=E5=8F=B7=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=96=B0=E7=9A=84=E9=9D=9E=E6=B3=95=E5=AD=97=E7=AC=A6=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../checkSpecialCharacters/CheckUtil.java     | 25 +++++++++++++++++--
 .../ProjectEntrustInquiryServiceImpl.java     |  4 +++
 .../impl/ProjectEntrustServiceImpl.java       |  3 +++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java b/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java
index f9bfa18..09d80e6 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java
@@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum;
 import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ProjectEntrustVO;
+import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity.PurpBaseInfoVO;
+import com.chinaunicom.mall.ebtp.project.projectentrust.entity.ebpentity.PurpImplementSendVO;
 import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecord;
 import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSection;
 import lombok.extern.slf4j.Slf4j;
@@ -19,6 +21,25 @@ public class CheckUtil {
 
     private static int checkBdNameLengh = 200;
     //zhqbin 20220428 update 增加对委托项目名称\t\r\n字符校验
+    public static void checkEntrust(PurpImplementSendVO implementSendVO) {
+        log.error("------------------------校验非法字符----------------------------");
+        if(implementSendVO.getPurpImplementName()!=null){
+            log.error("------------------------校验非法字符----------------------------项目名称:"+implementSendVO.getPurpImplementName());
+            check(implementSendVO.getPurpImplementName());
+//        Map<String, Object> resultMap = new HashMap<>()
+        };
+        if(implementSendVO.getPurpBaseInfoVoList()!=null){
+            List<PurpBaseInfoVO> sectionList = implementSendVO.getPurpBaseInfoVoList();
+            sectionList.forEach(s->{
+                log.error("------------------------校验非法字符----------------------------标段名称:"+s.getPurpName());
+                log.error("------------------------校验非法字符----------------------------标段编号:"+s.getPurpNo());
+                CheckUtil.check(s.getPurpName());
+                CheckUtil.check(s.getPurpNo());
+                CheckUtil.checkBdNameLengh("标段名称+标段编号",s.getPurpName()+s.getPurpNo());
+            });
+        }
+    }
+    //zhqbin 20220428 update 增加对委托项目名称\t\r\n字符校验
     public static void checkInquiryVO(Map<String,Object> map) {
         log.error("------------------------校验非法字符----------------------------");
         if(map.get("projectRecord")!=null){
@@ -43,14 +64,14 @@ public class CheckUtil {
         //< > | \ / ? : * "
         if (s!=null&&s instanceof String) {
             for(String s1:checkValue){
-                CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA__ERROR.customValidName("存在特殊字符",
+                CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA_OTHER_ERROR.customValidName("该委托项目名称或标段名称存在特殊字符，无法执行",
                         s.toString().indexOf(s1)>0) ;
             }
         }
     }
 
     public static void checkBdNameLengh(String name,String value) {
-         CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA__ERROR.customValidName(name+"长度过长",
+         CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA_OTHER_ERROR.customValidName("该委托,"+name+"长度过长",
                  getLength(value)>checkBdNameLengh) ;
     }
 
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 62ede09..8664ab4 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
@@ -224,6 +224,10 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl<ProjectEnt
      * @param inquiryVO 询价实体类
      */
     private void checkInquiryVO(InquiryVO inquiryVO){
+
+        //zhqbin 20220506 inset 校验项目名称非法字符
+        CheckUtil.check(inquiryVO.getTitle());
+        CheckUtil.checkBdNameLengh("询价但标题与单号",inquiryVO.getTitle()+inquiryVO.getInquiryNo());
         //询价单ID
         if(StringUtils.isEmpty(inquiryVO.getInquiryId())){
             ProjectExceptionEnum.FRAME_EXCEPTION_INQUIRY_ID_EMPTY.throwException();
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java
index 42513d0..12456ee 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java
@@ -619,6 +619,9 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
             ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_ENTRUST_PURP_IMPLEMENT_NAME_EMPTY.throwException();
         }
 
+        //zhqbin 20220506 inset 校验项目名称非法字符
+        CheckUtil.checkEntrust(implementSendVO);
+
         //实施项目ID
         if(StringUtils.isEmpty(implementSendVO.getId())){
             ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_ENTRUST_PURP_IMPLEMENT_ID_EMPTY.throwException();