liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/uat' into uat-examination

Browse Source
This commit is contained in:
fuqingji
2022-05-23 14:18:02 +08:00
parent 3ea757723a a0a31b9d68
commit 4c2c72fc05
6 changed files with 59 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java
View File

@ -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<String,Object> map) {
public void checkInquiryVO(Map<String,Object> 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<String> 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<String> values = JSON.parseArray(checkValue,String.class);
System.out.println(values);
}
}

7
src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java
View File

@ -62,6 +62,9 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl<ProjectEnt
@Resource
TransactionDefinition transactionDefinition;
@Resource
private CheckUtil checkUtil;
@Override
@Transactional(rollbackFor = Exception.class)
public boolean initProjectEntrust(InquiryVO inquiryVO) {
@ -226,8 +229,8 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl<ProjectEnt
private void checkInquiryVO(InquiryVO inquiryVO){
//zhqbin 20220506 inset 校验项目名称非法字符
CheckUtil.check(inquiryVO.getTitle());
CheckUtil.checkBdNameLengh("询价但标题与单号",inquiryVO.getTitle()+inquiryVO.getInquiryNo());
checkUtil.check(inquiryVO.getTitle());
checkUtil.checkBdNameLengh("询价但标题与单号",inquiryVO.getTitle()+inquiryVO.getInquiryNo());
//询价单ID
if(StringUtils.isEmpty(inquiryVO.getInquiryId())){
ProjectExceptionEnum.FRAME_EXCEPTION_INQUIRY_ID_EMPTY.throwException();

5
src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java
View File

@ -97,7 +97,8 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
private static final String REASON = "代理机构拒绝";
@Resource
private CheckUtil checkUtil;
/**
* 获取查询条件
@ -630,7 +631,7 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
}
//zhqbin 20220506 inset 校验项目名称非法字符
CheckUtil.checkEntrust(implementSendVO);
checkUtil.checkEntrust(implementSendVO);
//实施项目ID
if(StringUtils.isEmpty(implementSendVO.getId())){

9
src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/controller/ProjectRecordController.java
View File

@ -34,7 +34,10 @@ public class ProjectRecordController{
@Resource
private IProjectRecordService projectRecordService;
@Resource
private CheckUtil checkUtil;
/**
* 插入新数据
*
@ -46,7 +49,7 @@ public class ProjectRecordController{
@PostMapping("")
@PreAuthorize("hasAnyAuthority('ebtp-purchase','ebtp-agency-project-manager')")
public BaseResponse<Boolean> 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<Boolean> update(
@ApiParam(value = "对象数据", required = true) @RequestBody ProjectRecordVO projectRecord){
CheckUtil.check(projectRecord.getProjectName());
checkUtil.check(projectRecord.getProjectName());
return BaseResponse.success(projectRecordService.updateProject(projectRecord));
}

4
src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
View File

@ -124,6 +124,8 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
@Resource
private EbtpArchiveApi archiveApi;
@Resource
private CheckUtil checkUtil;
/**
* 查询条件拼接
@ -1034,7 +1036,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
resultMap.put("materialList", materialList);
resultMap.put("supplierList", supplierList);
//zhqbin 校验非法字符，长度
CheckUtil.checkInquiryVO(resultMap);
checkUtil.checkInquiryVO(resultMap);
return resultMap;
}

13
src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/controller/ProjectSectionController.java
View File

@ -32,7 +32,10 @@ public class ProjectSectionController{
@Resource
private IProjectSectionService projectSectionService;
@Resource
private CheckUtil checkUtil;
/**
* 插入新数据
*
@ -44,8 +47,8 @@ public class ProjectSectionController{
@PostMapping("")
@PreAuthorize("hasAnyAuthority('ebtp-purchase','ebtp-agency-project-manager')")
public BaseResponse<Boolean> 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<Boolean> 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));
}