Merge branch 'duhanyu' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/TcAssetVerificationJava into dongdingding

ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetOfficialAccount.java

@@ -164,7 +164,7 @@ public class AssetOfficialAccount extends BaseClass implements Serializable {
     /**
      * 菜单类型
      */
-    @Excel(name = "菜单信息（菜单类型）", sort = 22)
+    @Excel(name = "菜单信息（菜单类型）",dictType = "gzh_cdlx", comboReadDict = true, sort = 22)
     @ApiModelProperty("菜单类型")
     private String cdlx;
 

ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentCpPo.java

@@ -7,10 +7,12 @@ import com.ruoyi.tc.entity.request.Acomma;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -62,9 +64,9 @@ public class AssetCurrentCpPo extends BaseClass implements Serializable {
     private String xtym;
 
     @ApiModelProperty("访问网址-协议类型")
-    @TableField(exist = false)
     private String fwwzXylx;
 
+
     /**
      * 访问网址
      */
@@ -160,7 +162,8 @@ public class AssetCurrentCpPo extends BaseClass implements Serializable {
      */
 
     @ApiModelProperty("使用时间")
-    private String sysj;
+    @DateTimeFormat(pattern = "yyyy:mm:dd hh:mm:ss")
+    private Date sysj;
     /**
      * 是否是互联网系统（字典）
      */
@@ -666,7 +669,7 @@ public class AssetCurrentCpPo extends BaseClass implements Serializable {
 
 
     @ApiModelProperty("等保信息-测评得分")
-    private String dbxxCpdf;
+    private Integer dbxxCpdf;
     /**
      * 第三方测评-测评机构名称
      */
@@ -762,7 +765,7 @@ public class AssetCurrentCpPo extends BaseClass implements Serializable {
      */
 
     @ApiModelProperty("密评信息-密评得分")
-    private String mpMpdf;
+    private Integer mpMpdf;
 
     /**
      * 供应链信息列表
@@ -917,7 +920,7 @@ public class AssetCurrentCpPo extends BaseClass implements Serializable {
 
 
     @ApiModelProperty("数据资产-数据领域")
-    private String sjzcSjly;
+    private Integer sjzcSjly;
     /**
      * 数据资产-更新周期
      */

ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentJyPo.java

@@ -10,11 +10,13 @@ import com.ruoyi.tc.entity.request.Acomma;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -70,7 +72,6 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
 
     @Excel(name = "访问网址-协议类型", sort = 12, width = 26)
     @ApiModelProperty("访问网址-协议类型")
-    @TableField(exist = false)
     private String fwwzXylx;
     /**
      * 访问网址
@@ -177,11 +178,11 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
     /**
      * 使用时间
      */
-    @NotBlank
-    @Size(max = 50, message = "使用时间长度不能超过50")
+    @NotNull
     @ApiModelProperty("使用时间")
     @Excel(name = "使用时间", sort = 116)
-    private String sysj;
+    @DateTimeFormat(pattern = "yyyy:mm:dd hh:mm:ss")
+    private Date sysj;
     /**
      * 是否是互联网系统（字典）
      */
@@ -714,9 +715,8 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
      * 等保信息-测评得分
      */
     @Excel(name = "*测评得分", sort = 49)
-    @Size(max = 50, message = "等保信息-测评得分长度不能超过50")
     @ApiModelProperty("等保信息-测评得分")
-    private String dbxxCpdf;
+    private Integer dbxxCpdf;
     /**
      * 第三方测评-测评机构名称
      */
@@ -810,9 +810,8 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
      * 密评信息-密评得分
      */
     @Excel(name = "密评得分", sort = 51)
-    @Size(max = 50, message = "密评信息-密评得分长度不能超过50")
     @ApiModelProperty("密评信息-密评得分")
-    private String mpMpdf;
+    private Integer mpMpdf;
 
     /**
      * 供应链信息列表
@@ -975,11 +974,10 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
     /**
      * 数据资产-数据量
      */
-    @NotBlank
+    @NotNull
     @Excel(name = "*数据量", sort = 108)
-    @Size(max = 255, message = "数据资产-数据量长度不能超过255")
     @ApiModelProperty("数据资产-数据量")
-    private String sjzcSjl;
+    private Integer sjzcSjl;
 
     @Excel(name = "*数据量单位",sort = 116,readConverterExp = "1=Gb,2=条")
     @ApiModelProperty("数据资产-数据量单位")

ruoyi-admin/src/main/java/com/ruoyi/tc/regular/entity/AssetDbxx.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -31,7 +30,7 @@ public class AssetDbxx {
     private String dbcpbah;
 
     @ApiModelProperty("等保测评得分")
-    private String dbcpdf;
+    private Integer dbcpdf;
 
     @ApiModelProperty("等保测评时间")
     private String dbcpsj;
@@ -50,7 +49,7 @@ public class AssetDbxx {
     private String mmcpbh;
 
     @ApiModelProperty("密评信息-密评得分")
-    private String mpdf;
+    private Integer mpdf;
 
 
     @ApiModelProperty("ICP备案信息-是否备案")