bug fix

safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingCommitmentChangeAddCmd.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -27,11 +28,13 @@ public class QualFilingCommitmentChangeAddCmd implements Serializable {
      * 承诺内容
      */
     @ApiModelProperty(value = "承诺内容")
+    @Size(max = 512, message = "承诺内容不能超过512个字符")
     private String commitmentContent;
     /**
      * 法定代表人签名图片地址
      */
     @ApiModelProperty(value = "法定代表人签名图片地址")
+    @Size(max = 512, message = "法定代表人签名图片地址不能超过512个字符")
     private String legalRepSignatureUrl;
     /**
      * 签署日期
@@ -47,11 +50,13 @@ public class QualFilingCommitmentChangeAddCmd implements Serializable {
      * 法定代表人姓名
      */
     @ApiModelProperty(value = "法定代表人姓名")
+    @Size(max = 128, message = "法定代表人姓名不能超过128个字符")
     private String legalRepName;
     /**
      * 环境
      */
     @ApiModelProperty(value = "环境")
+    @Size(max = 32, message = "环境不能超过32个字符")
     private String env;
 
 }

safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingEquipmentChangeAddCmd.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -34,41 +35,49 @@ public class QualFilingEquipmentChangeAddCmd implements Serializable {
      */
     @ApiModelProperty(value = "设备名称", required = true)
     @NotBlank(message = "设备名称不能为空")
+    @Size(max = 128, message = "设备名称不能超过128个字符")
     private String deviceName;
     /**
      * 设备型号
      */
     @ApiModelProperty(value = "设备型号")
+    @Size(max = 512, message = "设备型号不能超过512个字符")
     private String deviceModel;
     /**
      * 仪器类型编码
      */
     @ApiModelProperty(value = "仪器类型编码")
+    @Size(max = 512, message = "仪器类型编码不能超过512个字符")
     private String instrumentTypeCode;
     /**
      * 仪器类型名称
      */
     @ApiModelProperty(value = "仪器类型名称")
+    @Size(max = 128, message = "仪器类型名称不能超过128个字符")
     private String instrumentTypeName;
     /**
      * 设备类型编码
      */
     @ApiModelProperty(value = "设备类型编码")
+    @Size(max = 512, message = "设备类型编码不能超过512个字符")
     private String deviceTypeCode;
     /**
      * 设备类型名称
      */
     @ApiModelProperty(value = "设备类型名称")
+    @Size(max = 128, message = "设备类型名称不能超过128个字符")
     private String deviceTypeName;
     /**
      * 厂家
      */
     @ApiModelProperty(value = "厂家")
+    @Size(max = 512, message = "厂家不能超过512个字符")
     private String manufacturer;
     /**
      * 设备流量说明
      */
     @ApiModelProperty(value = "设备流量说明")
+    @Size(max = 512, message = "设备流量说明不能超过512个字符")
     private String flowDesc;
     /**
      * 最小流量
@@ -84,21 +93,25 @@ public class QualFilingEquipmentChangeAddCmd implements Serializable {
      * 校准单位
      */
     @ApiModelProperty(value = "校准单位")
+    @Size(max = 512, message = "校准单位不能超过512个字符")
     private String calibrationUnit;
     /**
      * 校准初始值
      */
     @ApiModelProperty(value = "校准初始值")
+    @Size(max = 512, message = "校准初始值不能超过512个字符")
     private String calibrationInitValue;
     /**
      * 现场校验类型编码
      */
     @ApiModelProperty(value = "现场校验类型编码")
+    @Size(max = 512, message = "现场校验类型编码不能超过512个字符")
     private String fieldCalibrationTypeCode;
     /**
      * 现场校验类型名称
      */
     @ApiModelProperty(value = "现场校验类型名称")
+    @Size(max = 128, message = "现场校验类型名称不能超过128个字符")
     private String fieldCalibrationTypeName;
     /**
      * 是否双路(1是2否)
@@ -109,11 +122,13 @@ public class QualFilingEquipmentChangeAddCmd implements Serializable {
      * 计量检定报告地址
      */
     @ApiModelProperty(value = "计量检定报告地址")
+    @Size(max = 512, message = "计量检定报告地址不能超过512个字符")
     private String calibrationReportUrl;
     /**
      * 环境
      */
     @ApiModelProperty(value = "环境")
+    @Size(max = 32, message = "环境不能超过32个字符")
     private String env;
 
 }

safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingMaterialChangeAddCmd.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 
 /**
@@ -34,11 +35,13 @@ public class QualFilingMaterialChangeAddCmd implements Serializable {
      */
     @ApiModelProperty(value = "材料内容", required = true)
     @NotBlank(message = "材料内容不能为空")
+    @Size(max = 512, message = "材料内容不能超过512个字符")
     private String materialContent;
     /**
      * 材料格式
      */
     @ApiModelProperty(value = "材料格式")
+    @Size(max = 512, message = "材料格式不能超过512个字符")
     private String materialFormat;
     /**
      * 排序序号
@@ -59,21 +62,25 @@ public class QualFilingMaterialChangeAddCmd implements Serializable {
      * 上传状态名称
      */
     @ApiModelProperty(value = "上传状态名称")
+    @Size(max = 128, message = "上传状态名称不能超过128个字符")
     private String uploadStatusName;
     /**
      * 上传附件说明
      */
     @ApiModelProperty(value = "上传附件说明")
+    @Size(max = 512, message = "上传附件说明不能超过512个字符")
     private String attachmentDesc;
     /**
      * 上传附件地址
      */
     @ApiModelProperty(value = "上传附件地址")
+    @Size(max = 512, message = "上传附件地址不能超过512个字符")
     private String attachmentUrl;
     /**
      * 注释
      */
     @ApiModelProperty(value = "注释")
+    @Size(max = 512, message = "注释不能超过512个字符")
     private String materialRemark;
     /**
      * 是否符合(1符合2不符合)
@@ -84,6 +91,7 @@ public class QualFilingMaterialChangeAddCmd implements Serializable {
      * 环境
      */
     @ApiModelProperty(value = "环境")
+    @Size(max = 32, message = "环境不能超过32个字符")
     private String env;
 
 }

safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeAddCmd.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -33,46 +34,55 @@ public class QualFilingPersonnelCertChangeAddCmd implements Serializable {
      * 证照名称
      */
     @ApiModelProperty(value = "证照名称")
+    @Size(max = 128, message = "证照名称不能超过128个字符")
     private String certName;
     /**
      * 证书类型编码
      */
     @ApiModelProperty(value = "证书类型编码")
+    @Size(max = 512, message = "证书类型编码不能超过512个字符")
     private String certTypeCode;
     /**
      * 证书类型名称
      */
     @ApiModelProperty(value = "证书类型名称")
+    @Size(max = 128, message = "证书类型名称不能超过128个字符")
     private String certTypeName;
     /**
      * 证书类别编码
      */
     @ApiModelProperty(value = "证书类别编码")
+    @Size(max = 512, message = "证书类别编码不能超过512个字符")
     private String certCategoryCode;
     /**
      * 证书类别名称
      */
     @ApiModelProperty(value = "证书类别名称")
+    @Size(max = 128, message = "证书类别名称不能超过128个字符")
     private String certCategoryName;
     /**
      * 证书作业类别编码
      */
     @ApiModelProperty(value = "证书作业类别编码")
+    @Size(max = 512, message = "证书作业类别编码不能超过512个字符")
     private String operationCategoryCode;
     /**
      * 证书作业类别名称
      */
     @ApiModelProperty(value = "证书作业类别名称")
+    @Size(max = 128, message = "证书作业类别名称不能超过128个字符")
     private String operationCategoryName;
     /**
      * 证书编号
      */
     @ApiModelProperty(value = "证书编号")
+    @Size(max = 512, message = "证书编号不能超过512个字符")
     private String certNo;
     /**
      * 发证机关
      */
     @ApiModelProperty(value = "发证机关")
+    @Size(max = 512, message = "发证机关不能超过512个字符")
     private String issueOrg;
     /**
      * 证书有效开始日期
@@ -93,6 +103,7 @@ public class QualFilingPersonnelCertChangeAddCmd implements Serializable {
      * 证书附件地址
      */
     @ApiModelProperty(value = "证书附件地址")
+    @Size(max = 512, message = "证书附件地址不能超过512个字符")
     private String certAttachmentUrl;
     /**
      * 来源人员证书id
@@ -103,6 +114,7 @@ public class QualFilingPersonnelCertChangeAddCmd implements Serializable {
      * 环境
      */
     @ApiModelProperty(value = "环境")
+    @Size(max = 32, message = "环境不能超过32个字符")
     private String env;
 
 }

safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeAddCmd.java

@@ -8,6 +8,7 @@ import org.qinan.safetyeval.client.common.jackson.DateToLocalDateTimeDeserialize
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -37,26 +38,31 @@ public class QualFilingPersonnelChangeAddCmd implements Serializable {
      */
     @ApiModelProperty(value = "人员姓名", required = true)
     @NotBlank(message = "人员姓名不能为空")
+    @Size(max = 128, message = "人员姓名不能超过128个字符")
     private String personName;
     /**
      * 人员类型编码
      */
     @ApiModelProperty(value = "人员类型编码")
+    @Size(max = 64, message = "人员类型编码不能超过64个字符")
     private String personTypeCode;
     /**
      * 人员类型名称
      */
     @ApiModelProperty(value = "人员类型名称")
+    @Size(max = 128, message = "人员类型名称不能超过128个字符")
     private String personTypeName;
     /**
      * 职务
      */
     @ApiModelProperty(value = "职务")
+    @Size(max = 128, message = "职务不能超过128个字符")
     private String positionName;
     /**
      * 职称
      */
     @ApiModelProperty(value = "职称")
+    @Size(max = 128, message = "职称不能超过128个字符")
     private String titleName;
     /**
      * 性别编码
@@ -67,6 +73,7 @@ public class QualFilingPersonnelChangeAddCmd implements Serializable {
      * 性别名称
      */
     @ApiModelProperty(value = "性别名称")
+    @Size(max = 128, message = "性别名称不能超过128个字符")
     private String genderName;
     /**
      * 出生日期
@@ -86,51 +93,61 @@ public class QualFilingPersonnelChangeAddCmd implements Serializable {
      * 身份证号
      */
     @ApiModelProperty(value = "身份证号")
+    @Size(max = 32, message = "身份证号不能超过32个字符")
     private String idCardNo;
     /**
      * 现住地址
      */
     @ApiModelProperty(value = "现住地址")
+    @Size(max = 128, message = "现住地址不能超过128个字符")
     private String currentAddress;
     /**
      * 办公地址
      */
     @ApiModelProperty(value = "办公地址")
+    @Size(max = 128, message = "办公地址不能超过128个字符")
     private String officeAddress;
     /**
      * 学历编码
      */
     @ApiModelProperty(value = "学历编码")
+    @Size(max = 64, message = "学历编码不能超过64个字符")
     private String educationCode;
     /**
      * 学历名称
      */
     @ApiModelProperty(value = "学历名称")
+    @Size(max = 128, message = "学历名称不能超过128个字符")
     private String educationName;
     /**
      * 毕业院校
      */
     @ApiModelProperty(value = "毕业院校")
+    @Size(max = 128, message = "毕业院校不能超过128个字符")
     private String graduateSchool;
     /**
      * 专业
      */
     @ApiModelProperty(value = "专业")
+    @Size(max = 128, message = "专业不能超过128个字符")
     private String major;
     /**
      * 资质范围
      */
     @ApiModelProperty(value = "资质范围")
+    @Size(max = 1024, message = "资质范围不能超过1024个字符")
     private String qualScope;
     /**
      * 出版学术专著专利获奖论文等
      */
     @ApiModelProperty(value = "出版学术专著专利获奖论文等")
+    @Size(max = 512, message = "出版学术专著专利获奖论文等不能超过512个字符")
     private String publications;
     /**
      * 职业等级及证书编号
      */
     @ApiModelProperty(value = "职业等级及证书编号")
+    @Size(max = 64, message = "职业等级及证书编号不能超过64个字符")
     private String professionalLevelCert;
     /**
      * 是否具有注册安全工程师资格(1是2否)
@@ -141,21 +158,25 @@ public class QualFilingPersonnelChangeAddCmd implements Serializable {
      * 自我申报的专业能力及认定方式
      */
     @ApiModelProperty(value = "自我申报的专业能力及认定方式")
+    @Size(max = 512, message = "自我申报的专业能力及认定方式不能超过512个字符")
     private String abilityDeclaration;
     /**
      * 主要学习工作经历
      */
     @ApiModelProperty(value = "主要学习工作经历")
+    @Size(max = 512, message = "主要学习工作经历不能超过512个字符")
     private String workExperience;
     /**
      * 申报专业能力证明材料地址
      */
     @ApiModelProperty(value = "申报专业能力证明材料地址")
+    @Size(max = 512, message = "申报专业能力证明材料地址不能超过512个字符")
     private String proofMaterialUrl;
     /**
      * 环境
      */
     @ApiModelProperty(value = "环境")
+    @Size(max = 32, message = "环境不能超过32个字符")
     private String env;
 
 }

safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AggregationSaveOrEditQualFilingChangeCmd.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.qinan.safetyeval.client.change.request.*;
 
+import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -15,20 +16,26 @@ public class AggregationSaveOrEditQualFilingChangeCmd {
 
     @ApiModelProperty(value = "基本信息")
     @NotNull
+    @Valid
     private QualFilingChangeAddCmd qualFilingChangeAddCmd;
 
     @ApiModelProperty(value = "备案承诺书")
+    @Valid
     private QualFilingCommitmentChangeAddCmd qualFilingCommitmentChangeAddCmd;
 
     @ApiModelProperty(value = "备案装备")
+    @Valid
     private List<QualFilingEquipmentChangeAddCmd> qualFilingEquipmentChangeAddCmds;
 
     @ApiModelProperty(value = "备案材料清单")
+    @Valid
     private List<QualFilingMaterialChangeAddCmd> qualFilingMaterialChangeAddCmds;
 
     @ApiModelProperty(value = "备案人员")
+    @Valid
     private List<QualFilingPersonnelChangeAddCmd> qualFilingPersonnelChangeAddCmds;
 
     @ApiModelProperty(value = "备案人员证书列表")
+    @Valid
     private List<QualFilingPersonnelCertChangeAddCmd> qualFilingPersonnelCertChangeAddCmds;
 }

safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingChangeAddCmd.java

@@ -3,7 +3,10 @@ package org.qinan.safetyeval.client.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.DecimalMax;
+import javax.validation.constraints.Max;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.math.BigDecimal;
 
 /**
@@ -27,71 +30,94 @@ public class QualFilingChangeAddCmd {
     private Long changeFilingId;
 
     @ApiModelProperty(value = "备案属地编码")
+    @Size(max = 64, message = "备案属地编码不能超过64个字符")
     private String filingTerritoryCode;
 
     @ApiModelProperty(value = "备案属地名称")
+    @Size(max = 128, message = "备案属地名称不能超过128个字符")
     private String filingTerritoryName;
 
     @ApiModelProperty(value = "备案单位")
+    @Size(max = 128, message = "备案单位不能超过128个字符")
     private String filingUnitName;
 
     @ApiModelProperty(value = "备案单位类型编码")
+    @Size(max = 64, message = "备案单位类型编码不能超过64个字符")
     private String filingUnitTypeCode;
 
     @ApiModelProperty(value = "备案单位类型名称")
+    @Size(max = 128, message = "备案单位类型名称不能超过128个字符")
     private String filingUnitTypeName;
 
     @ApiModelProperty(value = "备案编号")
+    @Size(max = 64, message = "备案编号不能超过64个字符")
     private String filingNo;
 
     @ApiModelProperty(value = "备案安全评价业务范围")
+    @Size(max = 512, message = "备案安全评价业务范围不能超过512个字符")
     private String businessScope;
 
     @ApiModelProperty(value = "注册地址")
+    @Size(max = 128, message = "注册地址不能超过128个字符")
     private String registerAddress;
 
     @ApiModelProperty(value = "办公地址")
+    @Size(max = 128, message = "办公地址不能超过128个字符")
     private String officeAddress;
 
     @ApiModelProperty(value = "统一社会信用代码")
+    @Size(max = 64, message = "统一社会信用代码不能超过64个字符")
     private String creditCode;
 
     @ApiModelProperty(value = "资质证书编号")
+    @Size(max = 64, message = "资质证书编号不能超过64个字符")
     private String qualCertNo;
 
     @ApiModelProperty(value = "法人代表及电话")
+    @Size(max = 12, message = "法人代表及电话不能超过12个字符")
     private String legalPersonPhone;
 
     @ApiModelProperty(value = "联系人及电话")
+    @Size(max = 12, message = "联系人及电话不能超过12个字符")
     private String contactPhone;
 
     @ApiModelProperty(value = "信息公开网址")
+    @Size(max = 512, message = "信息公开网址不能超过512个字符")
     private String infoDisclosureUrl;
 
     @ApiModelProperty(value = "固定资产总值(单位:分)")
+    @Max(value = 9999999999L, message = "固定资产总值不能超过10位数")
     private Long fixedAssetAmount;
 
     @ApiModelProperty(value = "档案室面积(平方米)")
+    @DecimalMax(value = "9999999999", message = "档案室面积不能超过10位数")
     private BigDecimal archiveRoomArea;
 
     @ApiModelProperty(value = "专职安全评价师数量")
+    @Max(value = 999999, message = "档案室面积不能超过999999")
     private Integer fulltimeEvaluatorCount;
 
     @ApiModelProperty(value = "注册安全工程师数量")
+    @Max(value = 999999, message = "注册安全工程师数量不能超过999999")
     private Integer registeredEngineerCount;
 
     @ApiModelProperty(value = "工作场所建筑面积(平方米)")
+    @DecimalMax(value = "999999", message = "工作场所建筑面积不能超过999999")
     private BigDecimal workplaceArea;
 
     @ApiModelProperty(value = "单位基本情况介绍")
+    @Size(max = 512, message = "单位基本情况介绍不能超过512个字符")
     private String unitIntro;
 
     @ApiModelProperty(value = "上传附件地址")
+    @Size(max = 5120, message = "上传附件地址不能超过5120个字符")
     private String attachmentUrl;
 
     @ApiModelProperty(value = "备案状态编码(1已备案2审核中3已打回4变更审核中5暂存)")
+    @Max(value = 99, message = "备案状态编码(1已备案2审核中3已打回4变更审核中5暂存)")
     private Integer filingStatusCode;
 
     @ApiModelProperty(value = "备案状态名称")
+    @Size(max = 128, message = "备案状态名称不能超过128个字符")
     private String filingStatusName;
 }