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 resultMap = new HashMap<>() + }; + if(implementSendVO.getPurpBaseInfoVoList()!=null){ + List 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 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