系统功能调整

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java

@@ -1,10 +1,11 @@
 package com.njcn.supervision.pojo.param.user;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.njcn.common.pojo.constant.PatternRegex;
 import com.njcn.supervision.pojo.po.user.UserReportProjectPO;
 import com.njcn.supervision.pojo.po.user.UserReportSensitivePO;
 import com.njcn.supervision.pojo.po.user.UserReportSubstationPO;
+import com.njcn.web.constant.ValidMessage;
 import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -12,6 +13,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.Pattern;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
@@ -78,6 +80,7 @@ public class UserReportParam {
      * 归口管理部门
      */
     @ApiModelProperty(value = "归口管理部门")
+    @Pattern(regexp = PatternRegex.DES32_REGEX, message = ValidMessage.DATA_TOO_LONG)
     private String responsibleDepartment;
 
     /**
@@ -90,6 +93,7 @@ public class UserReportParam {
      * 变电站
      */
     @ApiModelProperty(value = "变电站")
+    @Pattern(regexp = PatternRegex.DES32_REGEX, message = ValidMessage.DATA_TOO_LONG)
     private String substation;
 
     /**
@@ -102,6 +106,7 @@ public class UserReportParam {
      * 工程名称
      */
     @ApiModelProperty(value = "工程名称")
+    @Pattern(regexp = PatternRegex.DES32_REGEX, message = ValidMessage.DATA_TOO_LONG)
     private String projectName;
 
     /**
@@ -114,6 +119,7 @@ public class UserReportParam {
      * 预测评估结论
      */
     @ApiModelProperty(value = "预测评估结论")
+    @Pattern(regexp = PatternRegex.DES400_REGEX, message = ValidMessage.DATA_TOO_LONG)
     private String evaluationConclusion;
 
     @ApiModelProperty("发起人自选审批人 Map")

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportProjectPO.java

@@ -32,6 +32,7 @@ public class UserReportProjectPO extends BaseEntity {
      * 用户协议容量
      */
     @TableField(value = "agreement_capacity")
+
     private Double agreementCapacity;
 
     /**