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 aa20f42..fe1fcbe 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,9 +10,11 @@ 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; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -20,12 +22,15 @@ 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; + @Value("${check.porject.checkBoolen}") // = 200; + private Boolean checkBoolen = false; + //zhqbin 20220428 update 增加对委托项目名称\t\r\n字符校验 - public static void checkEntrust(PurpImplementSendVO implementSendVO) { - log.error("---------对"+checkValue+"..等---------------校验非法字符----------------------------"); + public void checkEntrust(PurpImplementSendVO implementSendVO) { + log.error("---------对"+checkValue+"..等字符---------------校验非法字符----------------------------"); if(implementSendVO.getPurpImplementName()!=null){ log.error("------------------------校验非法字符----------------------------项目名称:"+implementSendVO.getPurpImplementName()); check(implementSendVO.getPurpImplementName()); @@ -36,14 +41,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"); @@ -56,28 +61,35 @@ 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) { + if (s!=null&&s instanceof String&&checkBoolen) { log.info("----------校验参数--------"+s); - for(String s1:checkValue){ + List values = JSON.parseArray(checkValue,String.class); + for(String s1:values){ CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA_OTHER_ERROR.customValidName("该委托项目名称或标段名称存在特殊字符，无法执行", s.toString().indexOf(s1)>0) ; } + }else{ + log.info("-----checkBoolen : " + checkBoolen + "---- 不校验"); } } - public static void checkBdNameLengh(String name,String value) { - log.info("-----长度限制"+checkLengh+"-----对"+name+"进行校验--------"); - CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA_OTHER_ERROR.customValidName("该委托,"+name+"长度过长", - getLength(value)>checkLengh) ; + public void checkBdNameLengh(String name,String value) { + if(checkBoolen) { + log.info("-----长度限制" + checkLengh + "-----对" + name + "进行校验--------"); + CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA_OTHER_ERROR.customValidName("该委托," + name + "长度过长", + getLength(value) > checkLengh); + }else{ + log.info("-----checkBoolen : " + checkBoolen + "---- 不校验"); + } } /** @@ -107,7 +119,10 @@ public class CheckUtil { } public static void main(String args[]){ - check("whw综合评分"); + String checkValue = "[\"\\t\",\"\\n\",\"\\r\",\"<\",\">\",\"|\",\"\\\\\",\"?\",\":\",\"*\",\"\\\"\"]"; + + List values = JSON.parseArray(checkValue,String.class); + System.out.println(values); } } 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..1370912 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 @@ -62,6 +62,9 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid ProjectRecordVO projectRecord){ - CheckUtil.check(projectRecord.getProjectName()); + checkUtil.check(projectRecord.getProjectName()); boolean save = projectRecordService.save(projectRecord); return BaseResponse.success(save); @@ -64,7 +67,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()); + 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 b168176..d546e69 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 @@ -124,6 +124,8 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid ProjectSectionVO projectSection){ - CheckUtil.check(projectSection.getBidSectName()); - CheckUtil.check(projectSection.getBidSectBizNum()); + checkUtil.check(projectSection.getBidSectName()); + checkUtil.check(projectSection.getBidSectBizNum()); boolean save = projectSectionService.save(projectSection); return BaseResponse.success(save); @@ -62,8 +65,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()); + checkUtil.check(projectSection.getBidSectName()); + checkUtil.check(projectSection.getBidSectBizNum()); return BaseResponse.success(projectSectionService.update(projectSection)); }