feat：初始化门禁

web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserAddCmd.java

@@ -1,4 +1,4 @@
-package com.zcloud.primeport.dto;
+package com.zcloud.primeport.dto;
 
 import com.alibaba.cola.dto.Command;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 
 /**
  * web-client
@@ -21,34 +22,34 @@ import javax.validation.constraints.NotEmpty;
 @AllArgsConstructor
 public class MkmjApprovalUserAddCmd extends Command {
     @ApiModelProperty(value = "主键ID", name = "id", required = true)
-    @NotEmpty(message = "主键ID不能为空")
+    @NotNull(message = "主键ID不能为空")
     private Long id;
     @ApiModelProperty(value = "审批人企业id", name = "corpId", required = true)
-    @NotEmpty(message = "审批人企业id不能为空")
+    @NotNull(message = "审批人企业id不能为空")
     private Long corpId;
     @ApiModelProperty(value = "审批人企业名称", name = "corpName", required = true)
     @NotEmpty(message = "审批人企业名称不能为空")
     private String corpName;
     @ApiModelProperty(value = "审批人部门id", name = "deptId", required = true)
-    @NotEmpty(message = "审批人部门id不能为空")
+    @NotNull(message = "审批人部门id不能为空")
     private Long deptId;
     @ApiModelProperty(value = "审批人部门名称", name = "deptName", required = true)
     @NotEmpty(message = "审批人部门名称不能为空")
     private String deptName;
     @ApiModelProperty(value = "审批人id", name = "userId", required = true)
-    @NotEmpty(message = "审批人id不能为空")
+    @NotNull(message = "审批人id不能为空")
     private Long userId;
     @ApiModelProperty(value = "审批人名称", name = "userName", required = true)
     @NotEmpty(message = "审批人名称不能为空")
     private String userName;
     @ApiModelProperty(value = "人员审核权限(1-无权限,2-有权限)", name = "personnelPermissionFlag", required = true)
-    @NotEmpty(message = "人员审核权限(1-无权限,2-有权限)不能为空")
+    @NotNull(message = "人员审核权限(1-无权限,2-有权限)不能为空")
     private Integer personnelPermissionFlag;
     @ApiModelProperty(value = "车辆审核权限(1-无权限,2-有权限)", name = "vehiclePermissionFlag", required = true)
-    @NotEmpty(message = "车辆审核权限(1-无权限,2-有权限)不能为空")
+    @NotNull(message = "车辆审核权限(1-无权限,2-有权限)不能为空")
     private Integer vehiclePermissionFlag;
     @ApiModelProperty(value = "临时审核权限(1-无权限,2-有权限)", name = "temporaryPermissionFlag", required = true)
-    @NotEmpty(message = "临时审核权限(1-无权限,2-有权限)不能为空")
+    @NotNull(message = "临时审核权限(1-无权限,2-有权限)不能为空")
     private Integer temporaryPermissionFlag;
     @ApiModelProperty(value = "备注", name = "remarks", required = true)
     @NotEmpty(message = "备注不能为空")

web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserUpdateCmd.java

@@ -1,4 +1,4 @@
-package com.zcloud.primeport.dto;
+package com.zcloud.primeport.dto;
 
 import com.alibaba.cola.dto.Command;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 
 /**
  * web-client
@@ -21,34 +22,34 @@ import javax.validation.constraints.NotEmpty;
 @AllArgsConstructor
 public class MkmjApprovalUserUpdateCmd extends Command {
     @ApiModelProperty(value = "主键ID", name = "id", required = true)
-    @NotEmpty(message = "主键ID不能为空")
+    @NotNull(message = "主键ID不能为空")
     private Long id;
     @ApiModelProperty(value = "审批人企业id", name = "corpId", required = true)
-    @NotEmpty(message = "审批人企业id不能为空")
+    @NotNull(message = "审批人企业id不能为空")
     private Long corpId;
     @ApiModelProperty(value = "审批人企业名称", name = "corpName", required = true)
     @NotEmpty(message = "审批人企业名称不能为空")
     private String corpName;
     @ApiModelProperty(value = "审批人部门id", name = "deptId", required = true)
-    @NotEmpty(message = "审批人部门id不能为空")
+    @NotNull(message = "审批人部门id不能为空")
     private Long deptId;
     @ApiModelProperty(value = "审批人部门名称", name = "deptName", required = true)
     @NotEmpty(message = "审批人部门名称不能为空")
     private String deptName;
     @ApiModelProperty(value = "审批人id", name = "userId", required = true)
-    @NotEmpty(message = "审批人id不能为空")
+    @NotNull(message = "审批人id不能为空")
     private Long userId;
     @ApiModelProperty(value = "审批人名称", name = "userName", required = true)
     @NotEmpty(message = "审批人名称不能为空")
     private String userName;
     @ApiModelProperty(value = "人员审核权限(1-无权限,2-有权限)", name = "personnelPermissionFlag", required = true)
-    @NotEmpty(message = "人员审核权限(1-无权限,2-有权限)不能为空")
+    @NotNull(message = "人员审核权限(1-无权限,2-有权限)不能为空")
     private Integer personnelPermissionFlag;
     @ApiModelProperty(value = "车辆审核权限(1-无权限,2-有权限)", name = "vehiclePermissionFlag", required = true)
-    @NotEmpty(message = "车辆审核权限(1-无权限,2-有权限)不能为空")
+    @NotNull(message = "车辆审核权限(1-无权限,2-有权限)不能为空")
     private Integer vehiclePermissionFlag;
     @ApiModelProperty(value = "临时审核权限(1-无权限,2-有权限)", name = "temporaryPermissionFlag", required = true)
-    @NotEmpty(message = "临时审核权限(1-无权限,2-有权限)不能为空")
+    @NotNull(message = "临时审核权限(1-无权限,2-有权限)不能为空")
     private Integer temporaryPermissionFlag;
 }
 

web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateAddCmd.java

@@ -1,4 +1,4 @@
-package com.zcloud.primeport.dto;
+package com.zcloud.primeport.dto;
 
 import com.alibaba.cola.dto.Command;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 
 /**
  * web-client
@@ -39,7 +40,7 @@ public class MkmjGateAddCmd extends Command {
     @NotEmpty(message = "闸机类型名称不能为空")
     private String gateTypeName;
     @ApiModelProperty(value = "闸机状态 1- 停用 2-正常", name = "gateStatus", required = true)
-    @NotEmpty(message = "闸机状态 1- 停用 2-正常不能为空")
+    @NotNull(message = "闸机状态 1- 停用 2-正常不能为空")
     private Integer gateStatus;
     @ApiModelProperty(value = "闸机类别", name = "gateCategory", required = true)
     @NotEmpty(message = "闸机类别不能为空")

web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateUpdateCmd.java

@@ -1,4 +1,4 @@
-package com.zcloud.primeport.dto;
+package com.zcloud.primeport.dto;
 
 import com.alibaba.cola.dto.Command;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 
 /**
  * web-client
@@ -21,7 +22,7 @@ import javax.validation.constraints.NotEmpty;
 @AllArgsConstructor
 public class MkmjGateUpdateCmd extends Command {
     @ApiModelProperty(value = "主键", name = "id", required = true)
-    @NotEmpty(message = "主键不能为空")
+    @NotNull(message = "主键不能为空")
     private Long id;
     @ApiModelProperty(value = "口门区域id", name = "mkmjId", required = true)
     @NotEmpty(message = "口门区域id不能为空")
@@ -42,7 +43,7 @@ public class MkmjGateUpdateCmd extends Command {
     @NotEmpty(message = "闸机类型名称不能为空")
     private String gateTypeName;
     @ApiModelProperty(value = "闸机状态 1- 停用 2-正常", name = "gateStatus", required = true)
-    @NotEmpty(message = "闸机状态 1- 停用 2-正常不能为空")
+    @NotNull(message = "闸机状态 1- 停用 2-正常不能为空")
     private Integer gateStatus;
     @ApiModelProperty(value = "闸机类别", name = "gateCategory", required = true)
     @NotEmpty(message = "闸机类别不能为空")

web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassageAddCmd.java

@@ -1,4 +1,4 @@
-package com.zcloud.primeport.dto;
+package com.zcloud.primeport.dto;
 
 import com.alibaba.cola.dto.Command;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 
 /**
  * web-client
@@ -24,10 +25,10 @@ public class MkmjPassageAddCmd extends Command {
     @NotEmpty(message = "通道名称不能为空")
     private String passageName;
     @ApiModelProperty(value = "通道类型 1-人行 2-车行 3-综合", name = "passageType", required = true)
-    @NotEmpty(message = "通道类型 1-人行 2-车行 3-综合不能为空")
+    @NotNull(message = "通道类型 1-人行 2-车行 3-综合不能为空")
     private Integer passageType;
     @ApiModelProperty(value = "通道状态  1-停用 2-正常", name = "passageStatus", required = true)
-    @NotEmpty(message = "通道状态  1-停用 2-正常不能为空")
+    @NotNull(message = "通道状态  1-停用 2-正常不能为空")
     private Integer passageStatus;
     @ApiModelProperty(value = "口门区域id", name = "mkmjId", required = true)
     @NotEmpty(message = "口门区域id不能为空")

web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassageUpdateCmd.java

@@ -1,4 +1,4 @@
-package com.zcloud.primeport.dto;
+package com.zcloud.primeport.dto;
 
 import com.alibaba.cola.dto.Command;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 
 /**
  * web-client
@@ -21,16 +22,16 @@ import javax.validation.constraints.NotEmpty;
 @AllArgsConstructor
 public class MkmjPassageUpdateCmd extends Command {
     @ApiModelProperty(value = "主键", name = "id", required = true)
-    @NotEmpty(message = "主键不能为空")
+    @NotNull(message = "主键不能为空")
     private Long id;
     @ApiModelProperty(value = "通道名称", name = "passageName", required = true)
     @NotEmpty(message = "通道名称不能为空")
     private String passageName;
     @ApiModelProperty(value = "通道类型 1-人行 2-车行 3-综合", name = "passageType", required = true)
-    @NotEmpty(message = "通道类型 1-人行 2-车行 3-综合不能为空")
+    @NotNull(message = "通道类型 1-人行 2-车行 3-综合不能为空")
     private Integer passageType;
     @ApiModelProperty(value = "通道状态  1-停用 2-正常", name = "passageStatus", required = true)
-    @NotEmpty(message = "通道状态  1-停用 2-正常不能为空")
+    @NotNull(message = "通道状态  1-停用 2-正常不能为空")
     private Integer passageStatus;
     @ApiModelProperty(value = "口门区域id", name = "mkmjId", required = true)
     @NotEmpty(message = "口门区域id不能为空")

web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyAddCmd.java

@@ -1,4 +1,4 @@
-package com.zcloud.primeport.dto;
+package com.zcloud.primeport.dto;
 
 import com.alibaba.cola.dto.Command;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -28,10 +29,10 @@ public class PersonApplyAddCmd extends Command {
     @NotEmpty(message = "授权范围港区与区域不能为空")
     private Object gateLevelAuthArea;
     @ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）)", name = "auditFlag", required = true)
-    @NotEmpty(message = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）)不能为空")
+    @NotNull(message = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）)不能为空")
     private Integer auditFlag;
     @ApiModelProperty(value = "进出港权限(1:有 2：无)", name = "mkmjPermission", required = true)
-    @NotEmpty(message = "进出港权限(1:有 2：无)不能为空")
+    @NotNull(message = "进出港权限(1:有 2：无)不能为空")
     private Integer mkmjPermission;
     @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true)
     @NotEmpty(message = "访问起始时间不能为空")
@@ -40,19 +41,19 @@ public class PersonApplyAddCmd extends Command {
     @NotEmpty(message = "访问结束时间不能为空")
     private Date visitEndTime;
     @ApiModelProperty(value = "待审批人员所属企业ID", name = "personCorpId", required = true)
-    @NotEmpty(message = "待审批人员所属企业ID不能为空")
+    @NotNull(message = "待审批人员所属企业ID不能为空")
     private Long personCorpId;
     @ApiModelProperty(value = "待审批人员所属企业名称", name = "personCorpName", required = true)
     @NotEmpty(message = "待审批人员所属企业名称不能为空")
     private String personCorpName;
     @ApiModelProperty(value = "待审批人员所属部门id", name = "personDepartmentId", required = true)
-    @NotEmpty(message = "待审批人员所属部门id不能为空")
+    @NotNull(message = "待审批人员所属部门id不能为空")
     private Long personDepartmentId;
     @ApiModelProperty(value = "待审批人员部门名称", name = "personDepartmentName", required = true)
     @NotEmpty(message = "待审批人员部门名称不能为空")
     private String personDepartmentName;
     @ApiModelProperty(value = "待审批人员id", name = "employeePersonUserId", required = true)
-    @NotEmpty(message = "待审批人员id不能为空")
+    @NotNull(message = "待审批人员id不能为空")
     private Long employeePersonUserId;
     @ApiModelProperty(value = "待审批人员姓名", name = "employeePersonUserName", required = true)
     @NotEmpty(message = "待审批人员姓名不能为空")
@@ -67,10 +68,10 @@ public class PersonApplyAddCmd extends Command {
     @NotEmpty(message = "身份证号码不能为空")
     private String userCard;
     @ApiModelProperty(value = "告知签字", name = "informSignId", required = true)
-    @NotEmpty(message = "告知签字不能为空")
+    @NotNull(message = "告知签字不能为空")
     private Long informSignId;
     @ApiModelProperty(value = "项目id", name = "projectId", required = true)
-    @NotEmpty(message = "项目id不能为空")
+    @NotNull(message = "项目id不能为空")
     private Long projectId;
     @ApiModelProperty(value = "项目名称", name = "projectName", required = true)
     @NotEmpty(message = "项目名称不能为空")

web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyUpdateCmd.java

@@ -1,4 +1,4 @@
-package com.zcloud.primeport.dto;
+package com.zcloud.primeport.dto;
 
 import com.alibaba.cola.dto.Command;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -22,19 +23,19 @@ import java.util.Date;
 @AllArgsConstructor
 public class PersonApplyUpdateCmd extends Command {
     @ApiModelProperty(value = "id", name = "id", required = true)
-    @NotEmpty(message = "id不能为空")
+    @NotNull(message = "id不能为空")
     private Long id;
     @ApiModelProperty(value = "1股份2分公司3相关方4临时人员", name = "personBelongType", required = true)
-    @NotEmpty(message = "1股份2分公司3相关方4临时人员不能为空")
+    @NotNull(message = "1股份2分公司3相关方4临时人员不能为空")
     private Integer personBelongType;
     @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea", required = true)
     @NotEmpty(message = "授权范围港区与区域不能为空")
     private String gateLevelAuthArea;
     @ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）)", name = "auditFlag", required = true)
-    @NotEmpty(message = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）)不能为空")
+    @NotNull(message = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）)不能为空")
     private Integer auditFlag;
     @ApiModelProperty(value = "进出港权限(1:有 2：无)", name = "mkmjPermission", required = true)
-    @NotEmpty(message = "进出港权限(1:有 2：无)不能为空")
+    @NotNull(message = "进出港权限(1:有 2：无)不能为空")
     private Integer mkmjPermission;
     @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true)
     @NotEmpty(message = "访问起始时间不能为空")
@@ -43,19 +44,19 @@ public class PersonApplyUpdateCmd extends Command {
     @NotEmpty(message = "访问结束时间不能为空")
     private Date visitEndTime;
     @ApiModelProperty(value = "待审批人员所属企业ID", name = "personCorpId", required = true)
-    @NotEmpty(message = "待审批人员所属企业ID不能为空")
+    @NotNull(message = "待审批人员所属企业ID不能为空")
     private Long personCorpId;
     @ApiModelProperty(value = "待审批人员所属企业名称", name = "personCorpName", required = true)
     @NotEmpty(message = "待审批人员所属企业名称不能为空")
     private String personCorpName;
     @ApiModelProperty(value = "待审批人员所属部门id", name = "personDepartmentId", required = true)
-    @NotEmpty(message = "待审批人员所属部门id不能为空")
+    @NotNull(message = "待审批人员所属部门id不能为空")
     private Long personDepartmentId;
     @ApiModelProperty(value = "待审批人员部门名称", name = "personDepartmentName", required = true)
     @NotEmpty(message = "待审批人员部门名称不能为空")
     private String personDepartmentName;
     @ApiModelProperty(value = "待审批人员id", name = "employeePersonUserId", required = true)
-    @NotEmpty(message = "待审批人员id不能为空")
+    @NotNull(message = "待审批人员id不能为空")
     private Long employeePersonUserId;
     @ApiModelProperty(value = "待审批人员姓名", name = "employeePersonUserName", required = true)
     @NotEmpty(message = "待审批人员姓名不能为空")
@@ -70,10 +71,10 @@ public class PersonApplyUpdateCmd extends Command {
     @NotEmpty(message = "身份证号码不能为空")
     private String userCard;
     @ApiModelProperty(value = "告知签字", name = "informSignId", required = true)
-    @NotEmpty(message = "告知签字不能为空")
+    @NotNull(message = "告知签字不能为空")
     private Long informSignId;
     @ApiModelProperty(value = "项目id", name = "projectId", required = true)
-    @NotEmpty(message = "项目id不能为空")
+    @NotNull(message = "项目id不能为空")
     private Long projectId;
     @ApiModelProperty(value = "项目名称", name = "projectName", required = true)
     @NotEmpty(message = "项目名称不能为空")

web-client/src/main/java/com/zcloud/primeport/dto/PersonMessageAddCmd.java

@@ -1,4 +1,4 @@
-package com.zcloud.primeport.dto;
+package com.zcloud.primeport.dto;
 
 import com.alibaba.cola.dto.Command;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -22,10 +23,10 @@ import java.util.Date;
 @AllArgsConstructor
 public class PersonMessageAddCmd extends Command {
     @ApiModelProperty(value = "人员申请id", name = "personApplyId", required = true)
-    @NotEmpty(message = "人员申请id不能为空")
+    @NotNull(message = "人员申请id不能为空")
     private Long personApplyId;
     @ApiModelProperty(value = "1股份2分公司3相关方4临时人员", name = "personBelongType", required = true)
-    @NotEmpty(message = "1股份2分公司3相关方4临时人员不能为空")
+    @NotNull(message = "1股份2分公司3相关方4临时人员不能为空")
     private Integer personBelongType;
     @ApiModelProperty(value = "头像", name = "userFaceUrl", required = true)
     @NotEmpty(message = "头像不能为空")
@@ -46,7 +47,7 @@ public class PersonMessageAddCmd extends Command {
     @NotEmpty(message = "备注不能为空")
     private String remarks;
     @ApiModelProperty(value = "对接状态，1对接完成，2未对接", name = "syncStatus", required = true)
-    @NotEmpty(message = "对接状态，1对接完成，2未对接不能为空")
+    @NotNull(message = "对接状态，1对接完成，2未对接不能为空")
     private Integer syncStatus;
     @ApiModelProperty(value = "对接说明", name = "syncRemarks", required = true)
     @NotEmpty(message = "对接说明不能为空")

web-client/src/main/java/com/zcloud/primeport/dto/PersonMessageUpdateCmd.java

@@ -1,4 +1,4 @@
-package com.zcloud.primeport.dto;
+package com.zcloud.primeport.dto;
 
 import com.alibaba.cola.dto.Command;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -25,7 +26,7 @@ public class PersonMessageUpdateCmd extends Command {
     @NotEmpty(message = "id不能为空")
     private Object id;
     @ApiModelProperty(value = "人员申请id", name = "personApplyId", required = true)
-    @NotEmpty(message = "人员申请id不能为空")
+    @NotNull(message = "人员申请id不能为空")
     private Long personApplyId;
     @ApiModelProperty(value = "1股份2分公司3相关方4临时人员", name = "personBelongType", required = true)
     @NotEmpty(message = "1股份2分公司3相关方4临时人员不能为空")
@@ -49,7 +50,7 @@ public class PersonMessageUpdateCmd extends Command {
     @NotEmpty(message = "备注不能为空")
     private String remarks;
     @ApiModelProperty(value = "对接状态，1对接完成，2未对接", name = "syncStatus", required = true)
-    @NotEmpty(message = "对接状态，1对接完成，2未对接不能为空")
+    @NotNull(message = "对接状态，1对接完成，2未对接不能为空")
     private Integer syncStatus;
     @ApiModelProperty(value = "对接说明", name = "syncRemarks", required = true)
     @NotEmpty(message = "对接说明不能为空")

web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java

@@ -1,4 +1,4 @@
-package com.zcloud.primeport.dto;
+package com.zcloud.primeport.dto;
 
 import com.alibaba.cola.dto.Command;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -22,7 +23,7 @@ import java.util.Date;
 @AllArgsConstructor
 public class VehicleApplyAddCmd extends Command {
     @ApiModelProperty(value = "车辆状态(1未启用,2启用)", name = "statusFlag", required = true)
-    @NotEmpty(message = "车辆状态(1未启用,2启用)不能为空")
+    @NotNull(message = "车辆状态(1未启用,2启用)不能为空")
     private Integer statusFlag;
     @ApiModelProperty(value = "车牌类型数据字典", name = "licenceType", required = true)
     @NotEmpty(message = "车牌类型数据字典不能为空")
@@ -46,10 +47,10 @@ public class VehicleApplyAddCmd extends Command {
     @NotEmpty(message = "授权范围港区与区域不能为空")
     private String gateLevelAuthArea;
     @ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)", name = "auditFlag", required = true)
-    @NotEmpty(message = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)不能为空")
+    @NotNull(message = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)不能为空")
     private Integer auditFlag;
     @ApiModelProperty(value = "进出港权限(1:有 2：无)", name = "mkmjPermission", required = true)
-    @NotEmpty(message = "进出港权限(1:有 2：无)不能为空")
+    @NotNull(message = "进出港权限(1:有 2：无)不能为空")
     private Integer mkmjPermission;
     @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true)
     @NotEmpty(message = "访问起始时间不能为空")
@@ -58,19 +59,19 @@ public class VehicleApplyAddCmd extends Command {
     @NotEmpty(message = "访问结束时间不能为空")
     private Date visitEndTime;
     @ApiModelProperty(value = "车辆所属企业ID", name = "vehicleCorpId", required = true)
-    @NotEmpty(message = "车辆所属企业ID不能为空")
+    @NotNull(message = "车辆所属企业ID不能为空")
     private Long vehicleCorpId;
     @ApiModelProperty(value = "车辆所属企业名称", name = "vehicleCorpName", required = true)
     @NotEmpty(message = "车辆所属企业名称不能为空")
     private String vehicleCorpName;
     @ApiModelProperty(value = "车辆所属部门id", name = "vehicleDepartmentId", required = true)
-    @NotEmpty(message = "车辆所属部门id不能为空")
+    @NotNull(message = "车辆所属部门id不能为空")
     private Long vehicleDepartmentId;
     @ApiModelProperty(value = "车辆所属部门名称", name = "vehicleDepartmentName", required = true)
     @NotEmpty(message = "车辆所属部门名称不能为空")
     private String vehicleDepartmentName;
     @ApiModelProperty(value = "车辆所属人id(员工车辆/驾驶人id)", name = "employeeVehicleUserId", required = true)
-    @NotEmpty(message = "车辆所属人id(员工车辆/驾驶人id)不能为空")
+    @NotNull(message = "车辆所属人id(员工车辆/驾驶人id)不能为空")
     private Long employeeVehicleUserId;
     @ApiModelProperty(value = "车辆所属人姓名(员工车辆/驾驶人名称)", name = "employeeVehicleUserName", required = true)
     @NotEmpty(message = "车辆所属人姓名(员工车辆/驾驶人名称)不能为空")
@@ -82,22 +83,22 @@ public class VehicleApplyAddCmd extends Command {
     @NotEmpty(message = "排放标准不能为空")
     private String emissionStandardsName;
     @ApiModelProperty(value = "行驶证照片", name = "drivingLicenseId", required = true)
-    @NotEmpty(message = "行驶证照片不能为空")
+    @NotNull(message = "行驶证照片不能为空")
     private Long drivingLicenseId;
     @ApiModelProperty(value = "车辆照片", name = "attachmentId", required = true)
-    @NotEmpty(message = "车辆照片不能为空")
+    @NotNull(message = "车辆照片不能为空")
     private Long attachmentId;
     @ApiModelProperty(value = "告知签字", name = "informSignId", required = true)
-    @NotEmpty(message = "告知签字不能为空")
+    @NotNull(message = "告知签字不能为空")
     private Long informSignId;
     @ApiModelProperty(value = "项目id", name = "projectId", required = true)
-    @NotEmpty(message = "项目id不能为空")
+    @NotNull(message = "项目id不能为空")
     private Long projectId;
     @ApiModelProperty(value = "项目名称", name = "projectName", required = true)
     @NotEmpty(message = "项目名称不能为空")
     private String projectName;
     @ApiModelProperty(value = "1被拉黑2未拉黑", name = "blockedFlag", required = true)
-    @NotEmpty(message = "1被拉黑2未拉黑不能为空")
+    @NotNull(message = "1被拉黑2未拉黑不能为空")
     private Integer blockedFlag;
 }
 

web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyUpdateCmd.java

@@ -1,4 +1,4 @@
-package com.zcloud.primeport.dto;
+package com.zcloud.primeport.dto;
 
 import com.alibaba.cola.dto.Command;
 import io.swagger.annotations.ApiModelProperty;
@@ -23,7 +23,7 @@ import java.util.Date;
 @AllArgsConstructor
 public class VehicleApplyUpdateCmd extends Command {
     @ApiModelProperty(value = "id", name = "id", required = true)
-    @NotEmpty(message = "id不能为空")
+    @NotNull(message = "id不能为空")
     private Long id;
     @ApiModelProperty(value = "车辆状态(1未启用,2启用)", name = "statusFlag", required = true)
     @NotNull(message = "车辆状态(1未启用,2启用)不能为空")
@@ -50,10 +50,10 @@ public class VehicleApplyUpdateCmd extends Command {
     @NotEmpty(message = "授权范围港区与区域不能为空")
     private Object gateLevelAuthArea;
     @ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)", name = "auditFlag", required = true)
-    @NotEmpty(message = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)不能为空")
+    @NotNull(message = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)不能为空")
     private Integer auditFlag;
     @ApiModelProperty(value = "进出港权限(1:有 2：无)", name = "mkmjPermission", required = true)
-    @NotEmpty(message = "进出港权限(1:有 2：无)不能为空")
+    @NotNull(message = "进出港权限(1:有 2：无)不能为空")
     private Integer mkmjPermission;
     @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true)
     @NotNull(message = "访问起始时间不能为空")

web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditAddCmd.java

@@ -1,4 +1,4 @@
-package com.zcloud.primeport.dto;
+package com.zcloud.primeport.dto;
 
 import com.alibaba.cola.dto.Command;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 
 /**
  * web-client
@@ -24,31 +25,31 @@ public class VehicleAuditAddCmd extends Command {
     @NotEmpty(message = "车辆申请id不能为空")
     private String vehicleApplyId;
     @ApiModelProperty(value = "审批批次(1.普通车辆.2危险化学品车辆)", name = "batchType", required = true)
-    @NotEmpty(message = "审批批次(1.普通车辆.2危险化学品车辆)不能为空")
+    @NotNull(message = "审批批次(1.普通车辆.2危险化学品车辆)不能为空")
     private Integer batchType;
     @ApiModelProperty(value = "审批状态(1,申请;2.更新)", name = "batchState", required = true)
-    @NotEmpty(message = "审批状态(1,申请;2.更新)不能为空")
+    @NotNull(message = "审批状态(1,申请;2.更新)不能为空")
     private Integer batchState;
     @ApiModelProperty(value = "审批人id", name = "auditUserId", required = true)
-    @NotEmpty(message = "审批人id不能为空")
+    @NotNull(message = "审批人id不能为空")
     private Long auditUserId;
     @ApiModelProperty(value = "审批人姓名", name = "auditUserName", required = true)
     @NotEmpty(message = "审批人姓名不能为空")
     private String auditUserName;
     @ApiModelProperty(value = "审批部门id", name = "auditDeptId", required = true)
-    @NotEmpty(message = "审批部门id不能为空")
+    @NotNull(message = "审批部门id不能为空")
     private Long auditDeptId;
     @ApiModelProperty(value = "审批部门名称", name = "auditDeptName", required = true)
     @NotEmpty(message = "审批部门名称不能为空")
     private String auditDeptName;
     @ApiModelProperty(value = "审批人企业id", name = "auditCorpId", required = true)
-    @NotEmpty(message = "审批人企业id不能为空")
+    @NotNull(message = "审批人企业id不能为空")
     private Long auditCorpId;
     @ApiModelProperty(value = "审批人企业名称", name = "auditCorpName", required = true)
     @NotEmpty(message = "审批人企业名称不能为空")
     private String auditCorpName;
     @ApiModelProperty(value = "审批状态(1,未开始,2通过,3不通过)", name = "auditStatus", required = true)
-    @NotEmpty(message = "审批状态(1,未开始,2通过,3不通过)不能为空")
+    @NotNull(message = "审批状态(1,未开始,2通过,3不通过)不能为空")
     private Integer auditStatus;
     @ApiModelProperty(value = "待审核信息", name = "changeAfter", required = true)
     @NotEmpty(message = "待审核信息不能为空")

web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditUpdateCmd.java

@@ -1,4 +1,4 @@
-package com.zcloud.primeport.dto;
+package com.zcloud.primeport.dto;
 
 import com.alibaba.cola.dto.Command;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 
 /**
  * web-client
@@ -21,37 +22,37 @@ import javax.validation.constraints.NotEmpty;
 @AllArgsConstructor
 public class VehicleAuditUpdateCmd extends Command {
     @ApiModelProperty(value = "id", name = "id", required = true)
-    @NotEmpty(message = "id不能为空")
+    @NotNull(message = "id不能为空")
     private Long id;
     @ApiModelProperty(value = "车辆申请id", name = "vehicleApplyId", required = true)
     @NotEmpty(message = "车辆申请id不能为空")
     private String vehicleApplyId;
     @ApiModelProperty(value = "审批批次(1.普通车辆.2危险化学品车辆)", name = "batchType", required = true)
-    @NotEmpty(message = "审批批次(1.普通车辆.2危险化学品车辆)不能为空")
+    @NotNull(message = "审批批次(1.普通车辆.2危险化学品车辆)不能为空")
     private Integer batchType;
     @ApiModelProperty(value = "审批状态(1,申请;2.更新)", name = "batchState", required = true)
-    @NotEmpty(message = "审批状态(1,申请;2.更新)不能为空")
+    @NotNull(message = "审批状态(1,申请;2.更新)不能为空")
     private Integer batchState;
     @ApiModelProperty(value = "审批人id", name = "auditUserId", required = true)
-    @NotEmpty(message = "审批人id不能为空")
+    @NotNull(message = "审批人id不能为空")
     private Long auditUserId;
     @ApiModelProperty(value = "审批人姓名", name = "auditUserName", required = true)
     @NotEmpty(message = "审批人姓名不能为空")
     private String auditUserName;
     @ApiModelProperty(value = "审批部门id", name = "auditDeptId", required = true)
-    @NotEmpty(message = "审批部门id不能为空")
+    @NotNull(message = "审批部门id不能为空")
     private Long auditDeptId;
     @ApiModelProperty(value = "审批部门名称", name = "auditDeptName", required = true)
     @NotEmpty(message = "审批部门名称不能为空")
     private String auditDeptName;
     @ApiModelProperty(value = "审批人企业id", name = "auditCorpId", required = true)
-    @NotEmpty(message = "审批人企业id不能为空")
+    @NotNull(message = "审批人企业id不能为空")
     private Long auditCorpId;
     @ApiModelProperty(value = "审批人企业名称", name = "auditCorpName", required = true)
     @NotEmpty(message = "审批人企业名称不能为空")
     private String auditCorpName;
     @ApiModelProperty(value = "审批状态(1,未开始,2通过,3不通过)", name = "auditStatus", required = true)
-    @NotEmpty(message = "审批状态(1,未开始,2通过,3不通过)不能为空")
+    @NotNull(message = "审批状态(1,未开始,2通过,3不通过)不能为空")
     private Integer auditStatus;
     @ApiModelProperty(value = "待审核信息", name = "changeAfter", required = true)
     @NotEmpty(message = "待审核信息不能为空")

web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackAddCmd.java

@@ -1,4 +1,4 @@
-package com.zcloud.primeport.dto;
+package com.zcloud.primeport.dto;
 
 import com.alibaba.cola.dto.Command;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 
 /**
  * web-client
@@ -21,7 +22,7 @@ import javax.validation.constraints.NotEmpty;
 @AllArgsConstructor
 public class VehicleBlackAddCmd extends Command {
     @ApiModelProperty(value = "车辆信息表（vehicle_apply）的主键id", name = "vehicleId", required = true)
-    @NotEmpty(message = "车辆信息表（vehicle_apply）的主键id不能为空")
+    @NotNull(message = "车辆信息表（vehicle_apply）的主键id不能为空")
     private Long vehicleId;
     @ApiModelProperty(value = "车辆所属人姓名（临时车）", name = "employeeVehicleUserName", required = true)
     @NotEmpty(message = "车辆所属人姓名（临时车）不能为空")

web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackUpdateCmd.java

@@ -1,4 +1,4 @@
-package com.zcloud.primeport.dto;
+package com.zcloud.primeport.dto;
 
 import com.alibaba.cola.dto.Command;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -22,10 +23,10 @@ import java.util.Date;
 @AllArgsConstructor
 public class VehicleBlackUpdateCmd extends Command {
     @ApiModelProperty(value = "id", name = "id", required = true)
-    @NotEmpty(message = "id不能为空")
+    @NotNull(message = "id不能为空")
     private Long id;
     @ApiModelProperty(value = "车辆信息表（vehicle_apply）的主键id", name = "vehicleId", required = true)
-    @NotEmpty(message = "车辆信息表（vehicle_apply）的主键id不能为空")
+    @NotNull(message = "车辆信息表（vehicle_apply）的主键id不能为空")
     private Long vehicleId;
     @ApiModelProperty(value = "车辆所属人姓名（临时车）", name = "employeeVehicleUserName", required = true)
     @NotEmpty(message = "车辆所属人姓名（临时车）不能为空")

web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageAddCmd.java

@@ -1,4 +1,4 @@
-package com.zcloud.primeport.dto;
+package com.zcloud.primeport.dto;
 
 import com.alibaba.cola.dto.Command;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -49,13 +50,13 @@ public class VehicleMessageAddCmd extends Command {
     @NotEmpty(message = "授权访问结束时间不能为空")
     private Date visitEndTime;
     @ApiModelProperty(value = "车辆申请id", name = "vehicleApplyId", required = true)
-    @NotEmpty(message = "车辆申请id不能为空")
+    @NotNull(message = "车辆申请id不能为空")
     private Long vehicleApplyId;
     @ApiModelProperty(value = "备注", name = "remarks", required = true)
     @NotEmpty(message = "备注不能为空")
     private String remarks;
     @ApiModelProperty(value = "对接状态，1对接完成，2未对接", name = "syncStatus", required = true)
-    @NotEmpty(message = "对接状态，1对接完成，2未对接不能为空")
+    @NotNull(message = "对接状态，1对接完成，2未对接不能为空")
     private Integer syncStatus;
     @ApiModelProperty(value = "对接说明", name = "syncRemarks", required = true)
     @NotEmpty(message = "对接说明不能为空")

web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageUpdateCmd.java

@@ -1,4 +1,4 @@
-package com.zcloud.primeport.dto;
+package com.zcloud.primeport.dto;
 
 import com.alibaba.cola.dto.Command;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -22,7 +23,7 @@ import java.util.Date;
 @AllArgsConstructor
 public class VehicleMessageUpdateCmd extends Command {
     @ApiModelProperty(value = "id", name = "id", required = true)
-    @NotEmpty(message = "id不能为空")
+    @NotNull(message = "id不能为空")
     private Long id;
     @ApiModelProperty(value = "车牌类型数据字典", name = "licenceType", required = true)
     @NotEmpty(message = "车牌类型数据字典不能为空")
@@ -52,10 +53,10 @@ public class VehicleMessageUpdateCmd extends Command {
     @NotEmpty(message = "授权访问结束时间不能为空")
     private Date visitEndTime;
     @ApiModelProperty(value = "车辆申请id", name = "vehicleApplyId", required = true)
-    @NotEmpty(message = "车辆申请id不能为空")
+    @NotNull(message = "车辆申请id不能为空")
     private Long vehicleApplyId;
     @ApiModelProperty(value = "对接状态，1对接完成，2未对接", name = "syncStatus", required = true)
-    @NotEmpty(message = "对接状态，1对接完成，2未对接不能为空")
+    @NotNull(message = "对接状态，1对接完成，2未对接不能为空")
     private Integer syncStatus;
     @ApiModelProperty(value = "对接说明", name = "syncRemarks", required = true)
     @NotEmpty(message = "对接说明不能为空")

web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsAddCmd.java

@@ -1,4 +1,4 @@
-package com.zcloud.primeport.dto;
+package com.zcloud.primeport.dto;
 
 import com.alibaba.cola.dto.Command;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -22,7 +23,7 @@ import java.util.Date;
 @AllArgsConstructor
 public class VehicleViolationsAddCmd extends Command {
     @ApiModelProperty(value = "车辆信息表（vehicle_apply）的主键id", name = "vehicleId", required = true)
-    @NotEmpty(message = "车辆信息表（vehicle_apply）的主键id不能为空")
+    @NotNull(message = "车辆信息表（vehicle_apply）的主键id不能为空")
     private Long vehicleId;
     @ApiModelProperty(value = "车辆所属人姓名（临时车）", name = "employeeVehicleUserName", required = true)
     @NotEmpty(message = "车辆所属人姓名（临时车）不能为空")
@@ -49,7 +50,7 @@ public class VehicleViolationsAddCmd extends Command {
     @NotEmpty(message = "违规时间不能为空")
     private Date violationtime;
     @ApiModelProperty(value = "违规处理状态，1已处理2未处理", name = "violationProcessingStatus", required = true)
-    @NotEmpty(message = "违规处理状态，1已处理2未处理不能为空")
+    @NotNull(message = "违规处理状态，1已处理2未处理不能为空")
     private Integer violationProcessingStatus;
 }
 

web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsUpdateCmd.java

@@ -1,4 +1,4 @@
-package com.zcloud.primeport.dto;
+package com.zcloud.primeport.dto;
 
 import com.alibaba.cola.dto.Command;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -22,10 +23,10 @@ import java.util.Date;
 @AllArgsConstructor
 public class VehicleViolationsUpdateCmd extends Command {
     @ApiModelProperty(value = "车辆违规记录id", name = "id", required = true)
-    @NotEmpty(message = "车辆违规记录id不能为空")
+    @NotNull(message = "车辆违规记录id不能为空")
     private Long id;
     @ApiModelProperty(value = "车辆信息表（vehicle_apply）的主键id", name = "vehicleId", required = true)
-    @NotEmpty(message = "车辆信息表（vehicle_apply）的主键id不能为空")
+    @NotNull(message = "车辆信息表（vehicle_apply）的主键id不能为空")
     private Long vehicleId;
     @ApiModelProperty(value = "车辆所属人姓名（临时车）", name = "employeeVehicleUserName", required = true)
     @NotEmpty(message = "车辆所属人姓名（临时车）不能为空")
@@ -52,7 +53,7 @@ public class VehicleViolationsUpdateCmd extends Command {
     @NotEmpty(message = "违规时间不能为空")
     private Date violationtime;
     @ApiModelProperty(value = "违规处理状态，1已处理2未处理", name = "violationProcessingStatus", required = true)
-    @NotEmpty(message = "违规处理状态，1已处理2未处理不能为空")
+    @NotNull(message = "违规处理状态，1已处理2未处理不能为空")
     private Integer violationProcessingStatus;
     @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true)
     @NotEmpty(message = "删除标识不能为空")

web-client/src/main/java/com/zcloud/primeport/dto/VideoAddCmd.java

@@ -1,4 +1,4 @@
-package com.zcloud.primeport.dto;
+package com.zcloud.primeport.dto;
 
 import com.alibaba.cola.dto.Command;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 
 /**
  * web-client
@@ -21,10 +22,10 @@ import javax.validation.constraints.NotEmpty;
 @AllArgsConstructor
 public class VideoAddCmd extends Command {
     @ApiModelProperty(value = "口门/闸机id 外键id ", name = "foreignId", required = true)
-    @NotEmpty(message = "口门/闸机id 外键id 不能为空")
+    @NotNull(message = "口门/闸机id 外键id 不能为空")
     private Long foreignId;
     @ApiModelProperty(value = "设备类型（1-口门 2-闸机）", name = "deviceType", required = true)
-    @NotEmpty(message = "设备类型（1-口门 2-闸机）不能为空")
+    @NotNull(message = "设备类型（1-口门 2-闸机）不能为空")
     private Integer deviceType;
     @ApiModelProperty(value = "摄像头id", name = "videoResourceId", required = true)
     @NotEmpty(message = "摄像头id不能为空")
@@ -33,7 +34,7 @@ public class VideoAddCmd extends Command {
     @NotEmpty(message = "摄像头名称不能为空")
     private String videoResourceName;
     @ApiModelProperty(value = "摄像头类型（1-移动 2-平台）", name = "videoType", required = true)
-    @NotEmpty(message = "摄像头类型（1-移动 2-平台）不能为空")
+    @NotNull(message = "摄像头类型（1-移动 2-平台）不能为空")
     private Integer videoType;
     @ApiModelProperty(value = "经度", name = "longitude", required = true)
     @NotEmpty(message = "经度不能为空")

web-client/src/main/java/com/zcloud/primeport/dto/VideoUpdateCmd.java

@@ -1,4 +1,4 @@
-package com.zcloud.primeport.dto;
+package com.zcloud.primeport.dto;
 
 import com.alibaba.cola.dto.Command;
 import io.swagger.annotations.ApiModelProperty;
@@ -22,13 +22,13 @@ import javax.validation.constraints.NotNull;
 @AllArgsConstructor
 public class VideoUpdateCmd extends Command {
     @ApiModelProperty(value = "主键", name = "id", required = true)
-    @NotEmpty(message = "主键不能为空")
+    @NotNull(message = "主键不能为空")
     private Long id;
     @ApiModelProperty(value = "口门/闸机id 外键id ", name = "foreignId", required = true)
-    @NotEmpty(message = "口门/闸机id 外键id 不能为空")
+    @NotNull(message = "口门/闸机id 外键id 不能为空")
     private Long foreignId;
     @ApiModelProperty(value = "设备类型（1-口门 2-闸机）", name = "deviceType", required = true)
-    @NotEmpty(message = "设备类型（1-口门 2-闸机）不能为空")
+    @NotNull(message = "设备类型（1-口门 2-闸机）不能为空")
     private Integer deviceType;
     @ApiModelProperty(value = "摄像头id", name = "videoResourceId", required = true)
     @NotEmpty(message = "摄像头id不能为空")

web-domain/src/main/java/com/zcloud/primeport/domain/model/PersonApplyE.java

@@ -22,9 +22,9 @@ public class PersonApplyE extends BaseE {
     //id
     private Long id;
     //1股份2分公司3相关方4临时人员
-    private Object personBelongType;
+    private Integer personBelongType;
     //授权范围港区与区域
-    private Object gateLevelAuthArea;
+    private String gateLevelAuthArea;
     //审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）)
     private Integer auditFlag;
     //进出港权限(1:有 2：无)

web-domain/src/main/java/com/zcloud/primeport/domain/model/PersonMessageE.java

@@ -24,7 +24,7 @@ public class PersonMessageE extends BaseE {
     //人员申请id
     private Long personApplyId;
     //1股份2分公司3相关方4临时人员
-    private Object personBelongType;
+    private Integer personBelongType;
     //头像
     private String userFaceUrl;
     //身份证号码

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjApprovalUserDO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jjb.saas.framework.repository.basedo.BaseDO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -17,10 +18,7 @@ import lombok.EqualsAndHashCode;
 @TableName("mkmj_approval_user")
 @EqualsAndHashCode(callSuper = true)
 public class MkmjApprovalUserDO extends BaseDO {
-    //主键ID
+
-    @ApiModelProperty(value = "主键ID")
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
     //审批人企业id
     @ApiModelProperty(value = "审批人企业id")
     private Long corpId;
@@ -48,40 +46,7 @@ public class MkmjApprovalUserDO extends BaseDO {
     //临时审核权限(1-无权限,2-有权限)
     @ApiModelProperty(value = "临时审核权限(1-无权限,2-有权限)")
     private Integer temporaryPermissionFlag;
-    //删除标识true false
+
-    @ApiModelProperty(value = "删除标识true false")
-    private String deleteEnum;
-    //备注
-    @ApiModelProperty(value = "备注")
-    private String remarks;
-    //创建人姓名
-    @ApiModelProperty(value = "创建人姓名")
-    private String createName;
-    //更新人姓名
-    @ApiModelProperty(value = "更新人姓名")
-    private String updateName;
-    //租户id
-    @ApiModelProperty(value = "租户id")
-    private Long tenantId;
-    //单位id
-    @ApiModelProperty(value = "单位id")
-    private Long orgId;
-    //版本
-    @ApiModelProperty(value = "版本")
-    private Integer version;
-    //创建时间
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    //修改时间
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-    //创建人id
-    @ApiModelProperty(value = "创建人id")
-    private Long createId;
-    //修改人id
-    @ApiModelProperty(value = "修改人id")
-    private Long updateId;
-    private String env;
 
 }
 

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjGateDO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jjb.saas.framework.repository.basedo.BaseDO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -17,10 +18,7 @@ import lombok.EqualsAndHashCode;
 @TableName("mkmj_gate")
 @EqualsAndHashCode(callSuper = true)
 public class MkmjGateDO extends BaseDO {
-    //主键
+
-    @ApiModelProperty(value = "主键")
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
     //口门区域id
     @ApiModelProperty(value = "口门区域id")
     private String mkmjId;
@@ -60,40 +58,7 @@ public class MkmjGateDO extends BaseDO {
     //纬度
     @ApiModelProperty(value = "纬度")
     private String latitude;
-    //删除标识true false
+
-    @ApiModelProperty(value = "删除标识true false")
-    private String deleteEnum;
-    //备注
-    @ApiModelProperty(value = "备注")
-    private String remarks;
-    //创建人姓名
-    @ApiModelProperty(value = "创建人姓名")
-    private String createName;
-    //更新人姓名
-    @ApiModelProperty(value = "更新人姓名")
-    private String updateName;
-    //租户id
-    @ApiModelProperty(value = "租户id")
-    private Long tenantId;
-    //单位id
-    @ApiModelProperty(value = "单位id")
-    private Long orgId;
-    //版本
-    @ApiModelProperty(value = "版本")
-    private String version;
-    //创建时间
-    @ApiModelProperty(value = "创建时间")
-    private String createTime;
-    //修改时间
-    @ApiModelProperty(value = "修改时间")
-    private String updateTime;
-    //创建人id
-    @ApiModelProperty(value = "创建人id")
-    private Long createId;
-    //修改人id
-    @ApiModelProperty(value = "修改人id")
-    private Long updateId;
-    private String env;
 
 }
 

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjPassageDO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jjb.saas.framework.repository.basedo.BaseDO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -17,10 +18,7 @@ import lombok.EqualsAndHashCode;
 @TableName("mkmj_passage")
 @EqualsAndHashCode(callSuper = true)
 public class MkmjPassageDO extends BaseDO {
-    //主键
+
-    @ApiModelProperty(value = "主键")
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
     //通道名称
     @ApiModelProperty(value = "通道名称")
     private String passageName;
@@ -39,40 +37,5 @@ public class MkmjPassageDO extends BaseDO {
     //纬度
     @ApiModelProperty(value = "纬度")
     private String latitude;
-    //删除标识true false
-    @ApiModelProperty(value = "删除标识true false")
-    private String deleteEnum;
-    //备注
-    @ApiModelProperty(value = "备注")
-    private String remarks;
-    //创建人姓名
-    @ApiModelProperty(value = "创建人姓名")
-    private String createName;
-    //更新人姓名
-    @ApiModelProperty(value = "更新人姓名")
-    private String updateName;
-    //租户id
-    @ApiModelProperty(value = "租户id")
-    private Long tenantId;
-    //单位id
-    @ApiModelProperty(value = "单位id")
-    private Long orgId;
-    //版本
-    @ApiModelProperty(value = "版本")
-    private String version;
-    //创建时间
-    @ApiModelProperty(value = "创建时间")
-    private String createTime;
-    //修改时间
-    @ApiModelProperty(value = "修改时间")
-    private String updateTime;
-    //创建人id
-    @ApiModelProperty(value = "创建人id")
-    private Long createId;
-    //修改人id
-    @ApiModelProperty(value = "修改人id")
-    private Long updateId;
-    private String env;
-
 }
 

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/PersonApplyDO.java

@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jjb.saas.framework.repository.basedo.BaseDO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * web-infrastructure
  *
@@ -17,16 +20,13 @@ import lombok.EqualsAndHashCode;
 @TableName("person_apply")
 @EqualsAndHashCode(callSuper = true)
 public class PersonApplyDO extends BaseDO {
-    //id
+
-    @ApiModelProperty(value = "id")
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
     //1股份2分公司3相关方4临时人员
     @ApiModelProperty(value = "1股份2分公司3相关方4临时人员")
-    private Object personBelongType;
+    private Integer personBelongType;
     //授权范围港区与区域
     @ApiModelProperty(value = "授权范围港区与区域")
-    private Object gateLevelAuthArea;
+    private String gateLevelAuthArea;
     //审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）)
     @ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）)")
     private Integer auditFlag;
@@ -78,36 +78,6 @@ public class PersonApplyDO extends BaseDO {
     //删除标识
     @ApiModelProperty(value = "删除标识")
     private String deleteEnum;
-    //创建时间
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    //更新时间
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-    //创建人ID
-    @ApiModelProperty(value = "创建人ID")
-    private Long createId;
-    //更新人ID
-    @ApiModelProperty(value = "更新人ID")
-    private Long updateId;
-    //环境标识
-    @ApiModelProperty(value = "环境标识")
-    private String env;
-    //创建人姓名
-    @ApiModelProperty(value = "创建人姓名")
-    private String createName;
-    //更新人姓名
-    @ApiModelProperty(value = "更新人姓名")
-    private String updateName;
-    //租户ID
-    @ApiModelProperty(value = "租户ID")
-    private Long tenantId;
-    //组织ID
-    @ApiModelProperty(value = "组织ID")
-    private Long orgId;
-    //版本号
-    @ApiModelProperty(value = "版本号")
-    private Integer version;
     //来访事由
     @ApiModelProperty(value = "来访事由")
     private String remarks;

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/PersonMessageDO.java

@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jjb.saas.framework.repository.basedo.BaseDO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * web-infrastructure
  *
@@ -17,16 +20,13 @@ import lombok.EqualsAndHashCode;
 @TableName("person_message")
 @EqualsAndHashCode(callSuper = true)
 public class PersonMessageDO extends BaseDO {
-    //id
+
-    @ApiModelProperty(value = "id")
-    @TableId(type = IdType.ASSIGN_ID)
-    private Object id;
     //人员申请id
     @ApiModelProperty(value = "人员申请id")
     private Long personApplyId;
     //1股份2分公司3相关方4临时人员
     @ApiModelProperty(value = "1股份2分公司3相关方4临时人员")
-    private Object personBelongType;
+    private Integer personBelongType;
     //头像
     @ApiModelProperty(value = "头像")
     private String userFaceUrl;
@@ -35,49 +35,13 @@ public class PersonMessageDO extends BaseDO {
     private String userCard;
     //授权范围港区与区域
     @ApiModelProperty(value = "授权范围港区与区域")
-    private Object gateLevelAuthArea;
+    private String gateLevelAuthArea;
     //授权访问起始时间
     @ApiModelProperty(value = "授权访问起始时间")
     private Date visitStartTime;
     //授权访问结束时间
     @ApiModelProperty(value = "授权访问结束时间")
     private Date visitEndTime;
-    //备注
-    @ApiModelProperty(value = "备注")
-    private String remarks;
-    //删除标识
-    @ApiModelProperty(value = "删除标识")
-    private String deleteEnum;
-    //创建时间
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    //更新时间
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-    //创建人ID
-    @ApiModelProperty(value = "创建人ID")
-    private Long createId;
-    //更新人ID
-    @ApiModelProperty(value = "更新人ID")
-    private Long updateId;
-    //环境标识
-    @ApiModelProperty(value = "环境标识")
-    private String env;
-    //创建人姓名
-    @ApiModelProperty(value = "创建人姓名")
-    private String createName;
-    //更新人姓名
-    @ApiModelProperty(value = "更新人姓名")
-    private String updateName;
-    //租户ID
-    @ApiModelProperty(value = "租户ID")
-    private Long tenantId;
-    //组织ID
-    @ApiModelProperty(value = "组织ID")
-    private Long orgId;
-    //版本号
-    @ApiModelProperty(value = "版本号")
-    private Integer version;
     //对接状态，1对接完成，2未对接
     @ApiModelProperty(value = "对接状态，1对接完成，2未对接")
     private Integer syncStatus;

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java

@@ -43,7 +43,7 @@ public class VehicleApplyDO extends BaseDO {
     private String vehicleBelongType;
     //授权范围港区与区域
     @ApiModelProperty(value = "授权范围港区与区域")
-    private Object gateLevelAuthArea;
+    private String gateLevelAuthArea;
     //审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)
     @ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)")
     private Integer auditFlag;
@@ -98,42 +98,5 @@ public class VehicleApplyDO extends BaseDO {
     //1被拉黑2未拉黑
     @ApiModelProperty(value = "1被拉黑2未拉黑")
     private Integer blockedFlag;
-    //删除标识
-    @ApiModelProperty(value = "删除标识")
-    private String deleteEnum;
-    //创建时间
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    //更新时间
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-    //创建人ID
-    @ApiModelProperty(value = "创建人ID")
-    private Long createId;
-    //更新人ID
-    @ApiModelProperty(value = "更新人ID")
-    private Long updateId;
-    //环境标识
-    @ApiModelProperty(value = "环境标识")
-    private String env;
-    //创建人姓名
-    @ApiModelProperty(value = "创建人姓名")
-    private String createName;
-    //更新人姓名
-    @ApiModelProperty(value = "更新人姓名")
-    private String updateName;
-    //租户ID
-    @ApiModelProperty(value = "租户ID")
-    private Long tenantId;
-    //组织ID
-    @ApiModelProperty(value = "组织ID")
-    private Long orgId;
-    //版本号
-    @ApiModelProperty(value = "版本号")
-    private Integer version;
-    //备注
-    @ApiModelProperty(value = "备注")
-    private String remarks;
-
 }
 

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditDO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jjb.saas.framework.repository.basedo.BaseDO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -17,10 +18,7 @@ import lombok.EqualsAndHashCode;
 @TableName("vehicle_audit")
 @EqualsAndHashCode(callSuper = true)
 public class VehicleAuditDO extends BaseDO {
-    //id
+
-    @ApiModelProperty(value = "id")
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
     //车辆申请id
     @ApiModelProperty(value = "车辆申请id")
     private String vehicleApplyId;
@@ -53,46 +51,10 @@ public class VehicleAuditDO extends BaseDO {
     private Integer auditStatus;
     //待审核信息
     @ApiModelProperty(value = "待审核信息")
-    private Object changeAfter;
+    private String changeAfter;
     //变更前信息
     @ApiModelProperty(value = "变更前信息")
-    private Object changeBefore;
+    private String changeBefore;
-    //删除标识
-    @ApiModelProperty(value = "删除标识")
-    private String deleteEnum;
-    //创建时间
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    //更新时间
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-    //创建人ID
-    @ApiModelProperty(value = "创建人ID")
-    private Long createId;
-    //更新人ID
-    @ApiModelProperty(value = "更新人ID")
-    private Long updateId;
-    //环境标识
-    @ApiModelProperty(value = "环境标识")
-    private String env;
-    //创建人姓名
-    @ApiModelProperty(value = "创建人姓名")
-    private String createName;
-    //更新人姓名
-    @ApiModelProperty(value = "更新人姓名")
-    private String updateName;
-    //租户ID
-    @ApiModelProperty(value = "租户ID")
-    private Long tenantId;
-    //组织ID
-    @ApiModelProperty(value = "组织ID")
-    private Long orgId;
-    //版本号
-    @ApiModelProperty(value = "版本号")
-    private Object version;
-    //备注
-    @ApiModelProperty(value = "备注")
-    private String remarks;
 
 }
 

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleBlackDO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jjb.saas.framework.repository.basedo.BaseDO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -17,10 +18,7 @@ import lombok.EqualsAndHashCode;
 @TableName("vehicle_black")
 @EqualsAndHashCode(callSuper = true)
 public class VehicleBlackDO extends BaseDO {
-    //id
+
-    @ApiModelProperty(value = "id")
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
     //车辆信息表（vehicle_apply）的主键id
     @ApiModelProperty(value = "车辆信息表（vehicle_apply）的主键id")
     private Long vehicleId;
@@ -30,42 +28,7 @@ public class VehicleBlackDO extends BaseDO {
     //车牌号
     @ApiModelProperty(value = "车牌号")
     private String licenceNo;
-    //删除标识
+
-    @ApiModelProperty(value = "删除标识")
-    private String deleteEnum;
-    //创建时间
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    //更新时间
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-    //创建人ID
-    @ApiModelProperty(value = "创建人ID")
-    private Long createId;
-    //更新人ID
-    @ApiModelProperty(value = "更新人ID")
-    private Long updateId;
-    //环境标识
-    @ApiModelProperty(value = "环境标识")
-    private String env;
-    //创建人姓名
-    @ApiModelProperty(value = "创建人姓名")
-    private String createName;
-    //更新人姓名
-    @ApiModelProperty(value = "更新人姓名")
-    private String updateName;
-    //租户ID
-    @ApiModelProperty(value = "租户ID")
-    private Long tenantId;
-    //组织ID
-    @ApiModelProperty(value = "组织ID")
-    private Long orgId;
-    //版本号
-    @ApiModelProperty(value = "版本号")
-    private Integer version;
-    //备注
-    @ApiModelProperty(value = "备注")
-    private String remarks;
 
 }
 

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleMessageDO.java

@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jjb.saas.framework.repository.basedo.BaseDO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * web-infrastructure
  *
@@ -17,10 +20,7 @@ import lombok.EqualsAndHashCode;
 @TableName("vehicle_message")
 @EqualsAndHashCode(callSuper = true)
 public class VehicleMessageDO extends BaseDO {
-    //id
+
-    @ApiModelProperty(value = "id")
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
     //车牌类型数据字典
     @ApiModelProperty(value = "车牌类型数据字典")
     private String licenceType;
@@ -41,7 +41,7 @@ public class VehicleMessageDO extends BaseDO {
     private String vehicleBelongType;
     //授权范围港区与区域
     @ApiModelProperty(value = "授权范围港区与区域")
-    private Object gateLevelAuthArea;
+    private String gateLevelAuthArea;
     //授权访问起始时间
     @ApiModelProperty(value = "授权访问起始时间")
     private Date visitStartTime;
@@ -51,42 +51,6 @@ public class VehicleMessageDO extends BaseDO {
     //车辆申请id
     @ApiModelProperty(value = "车辆申请id")
     private Long vehicleApplyId;
-    //备注
-    @ApiModelProperty(value = "备注")
-    private String remarks;
-    //删除标识
-    @ApiModelProperty(value = "删除标识")
-    private String deleteEnum;
-    //创建时间
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    //更新时间
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-    //创建人ID
-    @ApiModelProperty(value = "创建人ID")
-    private Long createId;
-    //更新人ID
-    @ApiModelProperty(value = "更新人ID")
-    private Long updateId;
-    //环境标识
-    @ApiModelProperty(value = "环境标识")
-    private String env;
-    //创建人姓名
-    @ApiModelProperty(value = "创建人姓名")
-    private String createName;
-    //更新人姓名
-    @ApiModelProperty(value = "更新人姓名")
-    private String updateName;
-    //租户ID
-    @ApiModelProperty(value = "租户ID")
-    private Long tenantId;
-    //组织ID
-    @ApiModelProperty(value = "组织ID")
-    private Long orgId;
-    //版本号
-    @ApiModelProperty(value = "版本号")
-    private Integer version;
     //对接状态，1对接完成，2未对接
     @ApiModelProperty(value = "对接状态，1对接完成，2未对接")
     private Integer syncStatus;

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleViolationsDO.java

@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jjb.saas.framework.repository.basedo.BaseDO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * web-infrastructure
  *
@@ -17,10 +20,7 @@ import lombok.EqualsAndHashCode;
 @TableName("vehicle_violations")
 @EqualsAndHashCode(callSuper = true)
 public class VehicleViolationsDO extends BaseDO {
-    //车辆违规记录id
+
-    @ApiModelProperty(value = "车辆违规记录id")
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
     //车辆信息表（vehicle_apply）的主键id
     @ApiModelProperty(value = "车辆信息表（vehicle_apply）的主键id")
     private Long vehicleId;
@@ -51,42 +51,6 @@ public class VehicleViolationsDO extends BaseDO {
     //违规处理状态，1已处理2未处理
     @ApiModelProperty(value = "违规处理状态，1已处理2未处理")
     private Integer violationProcessingStatus;
-    //删除标识
-    @ApiModelProperty(value = "删除标识")
-    private String deleteEnum;
-    //创建时间
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-    //更新时间
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-    //创建人ID
-    @ApiModelProperty(value = "创建人ID")
-    private Long createId;
-    //更新人ID
-    @ApiModelProperty(value = "更新人ID")
-    private Long updateId;
-    //环境标识
-    @ApiModelProperty(value = "环境标识")
-    private String env;
-    //创建人姓名
-    @ApiModelProperty(value = "创建人姓名")
-    private String createName;
-    //更新人姓名
-    @ApiModelProperty(value = "更新人姓名")
-    private String updateName;
-    //租户ID
-    @ApiModelProperty(value = "租户ID")
-    private Long tenantId;
-    //组织ID
-    @ApiModelProperty(value = "组织ID")
-    private Long orgId;
-    //版本号
-    @ApiModelProperty(value = "版本号")
-    private Integer version;
-    //备注
-    @ApiModelProperty(value = "备注")
-    private String remarks;
 
 }
 

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VideoDO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jjb.saas.framework.repository.basedo.BaseDO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -17,10 +18,6 @@ import lombok.EqualsAndHashCode;
 @TableName("video")
 @EqualsAndHashCode(callSuper = true)
 public class VideoDO extends BaseDO {
-    //主键
-    @ApiModelProperty(value = "主键")
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
     //口门/闸机id 外键id
     @ApiModelProperty(value = "口门/闸机id 外键id ")
     private Long foreignId;
@@ -42,40 +39,5 @@ public class VideoDO extends BaseDO {
     //纬度
     @ApiModelProperty(value = "纬度")
     private String latitude;
-    //删除标识true false
-    @ApiModelProperty(value = "删除标识true false")
-    private String deleteEnum;
-    //备注
-    @ApiModelProperty(value = "备注")
-    private String remarks;
-    //创建人姓名
-    @ApiModelProperty(value = "创建人姓名")
-    private String createName;
-    //更新人姓名
-    @ApiModelProperty(value = "更新人姓名")
-    private String updateName;
-    //租户id
-    @ApiModelProperty(value = "租户id")
-    private Long tenantId;
-    //单位id
-    @ApiModelProperty(value = "单位id")
-    private Long orgId;
-    //版本
-    @ApiModelProperty(value = "版本")
-    private String version;
-    //创建时间
-    @ApiModelProperty(value = "创建时间")
-    private String createTime;
-    //修改时间
-    @ApiModelProperty(value = "修改时间")
-    private String updateTime;
-    //创建人id
-    @ApiModelProperty(value = "创建人id")
-    private Long createId;
-    //修改人id
-    @ApiModelProperty(value = "修改人id")
-    private Long updateId;
-    private String env;
-
 }