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 c368a71..4bbf3e9 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 @@ -10,6 +10,7 @@ import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecord; import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSection; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; import java.lang.reflect.Field; @@ -21,11 +22,12 @@ import java.util.Map; @Service public class CheckUtil { @Value("${check.porject.value}") - private static String checkValue[];//"= {"\t","\n","\r","<",">","|","\\","?",":","*","\""} + private String checkValue[];//"= {"\t","\n","\r","<",">","|","\\","?",":","*","\""} @Value("${check.porject.length}") // = 200; - private static int checkLengh; + private int checkLengh; + //zhqbin 20220428 update 增加对委托项目名称\t\r\n字符校验 - public static void checkEntrust(PurpImplementSendVO implementSendVO) { + public void checkEntrust(PurpImplementSendVO implementSendVO) { log.error("---------对"+Arrays.toString(checkValue)+"..等字符---------------校验非法字符----------------------------"); if(implementSendVO.getPurpImplementName()!=null){ log.error("------------------------校验非法字符----------------------------项目名称:"+implementSendVO.getPurpImplementName()); @@ -37,14 +39,14 @@ public class CheckUtil { 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()); + this.check(s.getPurpName()); + this.check(s.getPurpNo()); + this.checkBdNameLengh("标段名称+标段编号",s.getPurpName()+s.getPurpNo()); }); } } //zhqbin 20220428 update 增加对委托项目名称\t\r\n字符校验 - public static void checkInquiryVO(Map map) { + public void checkInquiryVO(Map map) { log.error("------------------------校验非法字符----------------------------"); if(map.get("projectRecord")!=null){ ProjectRecord record = (ProjectRecord)map.get("projectRecord"); @@ -57,14 +59,14 @@ public class CheckUtil { sectionList.forEach(s->{ log.error("------------------------校验非法字符----------------------------标段名称:"+s.getBidSectName()); log.error("------------------------校验非法字符----------------------------标段编号:"+s.getBidSectBizNum()); - CheckUtil.check(s.getBidSectName()); - CheckUtil.check(s.getBidSectBizNum()); - CheckUtil.checkBdNameLengh("标段名称+标段编号",s.getBidSectName()+s.getBidSectBizNum()); + this.check(s.getBidSectName()); + this.check(s.getBidSectBizNum()); + this.checkBdNameLengh("标段名称+标段编号",s.getBidSectName()+s.getBidSectBizNum()); }); } } - public static void check(String s) { + public void check(String s) { //< > | \ / ? : * " if (s!=null&&s instanceof String) { log.info("----------校验参数--------"+s); @@ -75,7 +77,7 @@ public class CheckUtil { } } - public static void checkBdNameLengh(String name,String value) { + public void checkBdNameLengh(String name,String value) { log.info("-----长度限制"+checkLengh+"-----对"+name+"进行校验--------"); CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA_OTHER_ERROR.customValidName("该委托,"+name+"长度过长", getLength(value)>checkLengh) ; 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 8664ab4..b6d46f9 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 @@ -226,8 +226,8 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid ProjectRecordVO projectRecord){ - CheckUtil.check(projectRecord.getProjectName()); + new CheckUtil().check(projectRecord.getProjectName()); boolean save = projectRecordService.save(projectRecord); return BaseResponse.success(save); @@ -64,7 +64,7 @@ public class ProjectRecordController{ @PreAuthorize("hasAnyAuthority('ebtp-purchase','ebtp-agency-project-manager')") public BaseResponse update( @ApiParam(value = "对象数据", required = true) @RequestBody ProjectRecordVO projectRecord){ - CheckUtil.check(projectRecord.getProjectName()); + new CheckUtil().check(projectRecord.getProjectName()); return BaseResponse.success(projectRecordService.updateProject(projectRecord)); } 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 68f6e95..20b501d 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 @@ -1024,7 +1024,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid ProjectSectionVO projectSection){ - CheckUtil.check(projectSection.getBidSectName()); - CheckUtil.check(projectSection.getBidSectBizNum()); + new CheckUtil().check(projectSection.getBidSectName()); + new CheckUtil().check(projectSection.getBidSectBizNum()); boolean save = projectSectionService.save(projectSection); return BaseResponse.success(save); @@ -62,8 +62,8 @@ public class ProjectSectionController{ @PutMapping("") @PreAuthorize("hasAnyAuthority('ebtp-purchase','ebtp-agency-project-manager')") public BaseResponse update(@ApiParam(value = "对象数据", required = true) @RequestBody ProjectSectionVO projectSection){ - CheckUtil.check(projectSection.getBidSectName()); - CheckUtil.check(projectSection.getBidSectBizNum()); + new CheckUtil().check(projectSection.getBidSectName()); + new CheckUtil().check(projectSection.getBidSectBizNum()); return BaseResponse.success(projectSectionService.update(projectSection)); }