From b238a9cb6ce6be515e3f1803a88ab6fcf27b3b07 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Thu, 28 Apr 2022 15:29:15 +0800 Subject: [PATCH] =?UTF-8?q?20220428=20=E6=96=B0=E5=A2=9E=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AF=B9=E5=A7=94=E6=89=98=E9=A1=B9=E7=9B=AE=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E3=80=81=E6=A0=87=E6=AE=B5=E5=90=8D=E7=A7=B0=E3=80=81?= =?UTF-8?q?=E6=A0=87=E6=AE=B5=E7=BC=96=E5=8F=B7\t\r\n=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checkSpecialCharacters/CheckSc.java | 20 +++++++++++++++++++ .../checkSpecialCharacters/CheckUtil.java | 16 +++++++++++++++ .../ProjectEntrustInquiryServiceImpl.java | 4 ++++ .../impl/ProjectEntrustServiceImpl.java | 8 ++++++++ .../controller/ProjectRecordController.java | 6 ++++-- .../projectrecord/entity/ProjectRecord.java | 9 +++++++++ .../controller/ProjectSectionController.java | 7 +++++-- 7 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckSc.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckSc.java b/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckSc.java new file mode 100644 index 0000000..512d225 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckSc.java @@ -0,0 +1,20 @@ +package com.chinaunicom.mall.ebtp.project.checkSpecialCharacters; + +import com.baomidou.mybatisplus.annotation.FieldFill; + +import javax.validation.Constraint; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target({ElementType.FIELD,ElementType.PARAMETER}) +@Retention(RetentionPolicy.RUNTIME) +public @interface CheckSc { + /** + * 被注解方法的描述 + * + * @return + */ + boolean check() default false; +} 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 new file mode 100644 index 0000000..9f337f0 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java @@ -0,0 +1,16 @@ +package com.chinaunicom.mall.ebtp.project.checkSpecialCharacters; + +import com.chinaunicom.mall.ebtp.common.exception.common.CommonExceptionEnum; + +import java.lang.reflect.Field; + +public class CheckUtil { + + public static void check(String s) { + if (s!=null&&s instanceof String) { + CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA__ERROR.customValidName("不能包含\\t\\n\\r等特殊字符",s.toString().indexOf("\t")>0 + ||s.toString().indexOf("\n")>0 + ||s.toString().indexOf("\r")>0) ; + } + } +} 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 a58a20c..dc17040 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 @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; +import com.chinaunicom.mall.ebtp.project.checkSpecialCharacters.CheckUtil; import com.chinaunicom.mall.ebtp.project.common.InquiryCommonUtil; import com.chinaunicom.mall.ebtp.project.common.ProjectCommonUtil; import com.chinaunicom.mall.ebtp.project.common.ProjectExceptionEnum; @@ -87,6 +88,9 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl{ + CheckUtil.check(s.getProjBaseInfoVO().getPurpName()); + CheckUtil.check(s.getProjBaseInfoVO().getProjNo()); + }); + if(null == purpImplementSendVO || null == purpImplementSendVO.getPurpSuperVo()){ ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_PURP_SUPER_VO_EMPTY.throwException(); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/controller/ProjectRecordController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/controller/ProjectRecordController.java index d3046dc..eb7ee69 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/controller/ProjectRecordController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/controller/ProjectRecordController.java @@ -4,6 +4,8 @@ package com.chinaunicom.mall.ebtp.project.projectrecord.controller; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.project.checkSpecialCharacters.CheckSc; +import com.chinaunicom.mall.ebtp.project.checkSpecialCharacters.CheckUtil; import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecord; import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecordVO; import com.chinaunicom.mall.ebtp.project.projectrecord.service.IProjectRecordService; @@ -45,7 +47,7 @@ public class ProjectRecordController{ @PostMapping("") @PreAuthorize("hasAnyAuthority('ebtp-purchase','ebtp-agency-project-manager')") public BaseResponse insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid ProjectRecordVO projectRecord){ - + CheckUtil.check(projectRecord.getProjectName()); boolean save = projectRecordService.save(projectRecord); return BaseResponse.success(save); @@ -63,7 +65,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()); return BaseResponse.success(projectRecordService.updateProject(projectRecord)); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecord.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecord.java index 96bdf89..474d8b0 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecord.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/entity/ProjectRecord.java @@ -1,7 +1,11 @@ package com.chinaunicom.mall.ebtp.project.projectrecord.entity; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import com.chinaunicom.mall.ebtp.common.config.CustomLocalDateTimeTypeHandler; +import com.chinaunicom.mall.ebtp.project.checkSpecialCharacters.CheckSc; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -12,6 +16,7 @@ import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; import org.springframework.format.annotation.DateTimeFormat; +import javax.validation.constraints.Pattern; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -60,6 +65,10 @@ public class ProjectRecord extends BaseEntity implements Serializable { /** * 招标项目名称 */ + @TableField( + fill = FieldFill.INSERT, + typeHandler = CustomLocalDateTimeTypeHandler.class + ) @ApiModelProperty(value = "招标项目名称") private String projectName; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/controller/ProjectSectionController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/controller/ProjectSectionController.java index 5c62d69..6f1189e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/controller/ProjectSectionController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/controller/ProjectSectionController.java @@ -3,6 +3,7 @@ package com.chinaunicom.mall.ebtp.project.projectsection.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.project.checkSpecialCharacters.CheckUtil; import com.chinaunicom.mall.ebtp.project.feign.entity.SectionFlowVO; import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSection; import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSectionVO; @@ -43,7 +44,8 @@ public class ProjectSectionController{ @PostMapping("") @PreAuthorize("hasAnyAuthority('ebtp-purchase','ebtp-agency-project-manager')") public BaseResponse insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid ProjectSectionVO projectSection){ - + CheckUtil.check(projectSection.getBidSectName()); + CheckUtil.check(projectSection.getBidSectBizNum()); boolean save = projectSectionService.save(projectSection); return BaseResponse.success(save); @@ -60,7 +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()); return BaseResponse.success(projectSectionService.update(projectSection)); }