From b2538a5032ac36468dea89f6727b9593401c5b06 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Fri, 6 Mar 2026 16:44:41 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E9=97=A8=E7=A6=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../primeport/dto/MkmjApprovalUserAddCmd.java | 34 +-------- .../dto/MkmjApprovalUserUpdateCmd.java | 36 --------- .../zcloud/primeport/dto/MkmjGateAddCmd.java | 38 +--------- .../primeport/dto/MkmjGateUpdateCmd.java | 37 +-------- .../primeport/dto/MkmjPassageUpdateCmd.java | 36 --------- .../primeport/dto/PersonApplyAddCmd.java | 41 +--------- .../primeport/dto/PersonApplyUpdateCmd.java | 38 +--------- .../primeport/dto/PersonMessageAddCmd.java | 41 +--------- .../primeport/dto/PersonMessageUpdateCmd.java | 34 +-------- .../primeport/dto/VehicleApplyAddCmd.java | 58 +------------- .../primeport/dto/VehicleApplyUpdateCmd.java | 76 ++++--------------- .../primeport/dto/VehicleAuditAddCmd.java | 40 +--------- .../primeport/dto/VehicleAuditUpdateCmd.java | 34 +-------- .../primeport/dto/VehicleBlackAddCmd.java | 36 --------- .../primeport/dto/VehicleBlackUpdateCmd.java | 37 +-------- .../primeport/dto/VehicleMessageAddCmd.java | 37 +-------- .../dto/VehicleMessageUpdateCmd.java | 37 +-------- .../dto/VehicleViolationsAddCmd.java | 40 +--------- .../dto/VehicleViolationsUpdateCmd.java | 35 +-------- .../com/zcloud/primeport/dto/VideoAddCmd.java | 39 ---------- .../zcloud/primeport/dto/VideoUpdateCmd.java | 39 +--------- .../dto/clientobject/MkmjApprovalUserCO.java | 35 +-------- .../dto/clientobject/MkmjGateCO.java | 34 --------- .../dto/clientobject/MkmjPassageCO.java | 31 -------- .../dto/clientobject/PersonApplyCO.java | 35 +-------- .../dto/clientobject/PersonMessageCO.java | 37 +-------- .../dto/clientobject/VehicleApplyCO.java | 54 +------------ .../dto/clientobject/VehicleAuditCO.java | 40 +--------- .../dto/clientobject/VehicleBlackCO.java | 33 -------- .../dto/clientobject/VehicleMessageCO.java | 37 +-------- .../dto/clientobject/VehicleViolationsCO.java | 35 +-------- .../primeport/dto/clientobject/VideoCO.java | 34 --------- .../dataobject/VehicleApplyDO.java | 21 +---- 33 files changed, 65 insertions(+), 1204 deletions(-) diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserAddCmd.java index d36c076..163f70e 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserAddCmd.java @@ -50,41 +50,9 @@ public class MkmjApprovalUserAddCmd extends Command { @ApiModelProperty(value = "临时审核权限(1-无权限,2-有权限)", name = "temporaryPermissionFlag", required = true) @NotEmpty(message = "临时审核权限(1-无权限,2-有权限)不能为空") private Integer temporaryPermissionFlag; - @ApiModelProperty(value = "删除标识true false", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识true false不能为空") - private String deleteEnum; @ApiModelProperty(value = "备注", name = "remarks", required = true) @NotEmpty(message = "备注不能为空") private String remarks; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户id", name = "tenantId", required = true) - @NotEmpty(message = "租户id不能为空") - private Long tenantId; - @ApiModelProperty(value = "单位id", name = "orgId", required = true) - @NotEmpty(message = "单位id不能为空") - private Long orgId; - @ApiModelProperty(value = "版本", name = "version", required = true) - @NotEmpty(message = "版本不能为空") - private Integer version; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private Date createTime; - @ApiModelProperty(value = "修改时间", name = "updateTime", required = true) - @NotEmpty(message = "修改时间不能为空") - private Date updateTime; - @ApiModelProperty(value = "创建人id", name = "createId", required = true) - @NotEmpty(message = "创建人id不能为空") - private Long createId; - @ApiModelProperty(value = "修改人id", name = "updateId", required = true) - @NotEmpty(message = "修改人id不能为空") - private Long updateId; - @ApiModelProperty(value = "${column.comment}", name = "env", required = true) - @NotEmpty(message = "${column.comment}不能为空") - private String env; + } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserUpdateCmd.java index ccc736f..42da3c2 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserUpdateCmd.java @@ -50,41 +50,5 @@ public class MkmjApprovalUserUpdateCmd extends Command { @ApiModelProperty(value = "临时审核权限(1-无权限,2-有权限)", name = "temporaryPermissionFlag", required = true) @NotEmpty(message = "临时审核权限(1-无权限,2-有权限)不能为空") private Integer temporaryPermissionFlag; - @ApiModelProperty(value = "删除标识true false", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识true false不能为空") - private String deleteEnum; - @ApiModelProperty(value = "备注", name = "remarks", required = true) - @NotEmpty(message = "备注不能为空") - private String remarks; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户id", name = "tenantId", required = true) - @NotEmpty(message = "租户id不能为空") - private Long tenantId; - @ApiModelProperty(value = "单位id", name = "orgId", required = true) - @NotEmpty(message = "单位id不能为空") - private Long orgId; - @ApiModelProperty(value = "版本", name = "version", required = true) - @NotEmpty(message = "版本不能为空") - private Integer version; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private Date createTime; - @ApiModelProperty(value = "修改时间", name = "updateTime", required = true) - @NotEmpty(message = "修改时间不能为空") - private Date updateTime; - @ApiModelProperty(value = "创建人id", name = "createId", required = true) - @NotEmpty(message = "创建人id不能为空") - private Long createId; - @ApiModelProperty(value = "修改人id", name = "updateId", required = true) - @NotEmpty(message = "修改人id不能为空") - private Long updateId; - @ApiModelProperty(value = "${column.comment}", name = "env", required = true) - @NotEmpty(message = "${column.comment}不能为空") - private String env; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateAddCmd.java index f2c29e2..e801f10 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateAddCmd.java @@ -20,9 +20,6 @@ import javax.validation.constraints.NotEmpty; @NoArgsConstructor @AllArgsConstructor public class MkmjGateAddCmd extends Command { - @ApiModelProperty(value = "主键", name = "id", required = true) - @NotEmpty(message = "主键不能为空") - private Long id; @ApiModelProperty(value = "口门区域id", name = "mkmjId", required = true) @NotEmpty(message = "口门区域id不能为空") private String mkmjId; @@ -62,41 +59,10 @@ public class MkmjGateAddCmd extends Command { @ApiModelProperty(value = "纬度", name = "latitude", required = true) @NotEmpty(message = "纬度不能为空") private String latitude; - @ApiModelProperty(value = "删除标识true false", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识true false不能为空") - private String deleteEnum; + @ApiModelProperty(value = "备注", name = "remarks", required = true) @NotEmpty(message = "备注不能为空") private String remarks; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户id", name = "tenantId", required = true) - @NotEmpty(message = "租户id不能为空") - private Long tenantId; - @ApiModelProperty(value = "单位id", name = "orgId", required = true) - @NotEmpty(message = "单位id不能为空") - private Long orgId; - @ApiModelProperty(value = "版本", name = "version", required = true) - @NotEmpty(message = "版本不能为空") - private String version; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private String createTime; - @ApiModelProperty(value = "修改时间", name = "updateTime", required = true) - @NotEmpty(message = "修改时间不能为空") - private String updateTime; - @ApiModelProperty(value = "创建人id", name = "createId", required = true) - @NotEmpty(message = "创建人id不能为空") - private Long createId; - @ApiModelProperty(value = "修改人id", name = "updateId", required = true) - @NotEmpty(message = "修改人id不能为空") - private Long updateId; - @ApiModelProperty(value = "${column.comment}", name = "env", required = true) - @NotEmpty(message = "${column.comment}不能为空") - private String env; + } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateUpdateCmd.java index 6b340aa..026e247 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjGateUpdateCmd.java @@ -62,41 +62,6 @@ public class MkmjGateUpdateCmd extends Command { @ApiModelProperty(value = "纬度", name = "latitude", required = true) @NotEmpty(message = "纬度不能为空") private String latitude; - @ApiModelProperty(value = "删除标识true false", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识true false不能为空") - private String deleteEnum; - @ApiModelProperty(value = "备注", name = "remarks", required = true) - @NotEmpty(message = "备注不能为空") - private String remarks; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户id", name = "tenantId", required = true) - @NotEmpty(message = "租户id不能为空") - private Long tenantId; - @ApiModelProperty(value = "单位id", name = "orgId", required = true) - @NotEmpty(message = "单位id不能为空") - private Long orgId; - @ApiModelProperty(value = "版本", name = "version", required = true) - @NotEmpty(message = "版本不能为空") - private String version; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private String createTime; - @ApiModelProperty(value = "修改时间", name = "updateTime", required = true) - @NotEmpty(message = "修改时间不能为空") - private String updateTime; - @ApiModelProperty(value = "创建人id", name = "createId", required = true) - @NotEmpty(message = "创建人id不能为空") - private Long createId; - @ApiModelProperty(value = "修改人id", name = "updateId", required = true) - @NotEmpty(message = "修改人id不能为空") - private Long updateId; - @ApiModelProperty(value = "${column.comment}", name = "env", required = true) - @NotEmpty(message = "${column.comment}不能为空") - private String env; + } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassageUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassageUpdateCmd.java index 55ad778..cb2a004 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassageUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassageUpdateCmd.java @@ -41,41 +41,5 @@ public class MkmjPassageUpdateCmd extends Command { @ApiModelProperty(value = "纬度", name = "latitude", required = true) @NotEmpty(message = "纬度不能为空") private String latitude; - @ApiModelProperty(value = "删除标识true false", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识true false不能为空") - private String deleteEnum; - @ApiModelProperty(value = "备注", name = "remarks", required = true) - @NotEmpty(message = "备注不能为空") - private String remarks; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户id", name = "tenantId", required = true) - @NotEmpty(message = "租户id不能为空") - private Long tenantId; - @ApiModelProperty(value = "单位id", name = "orgId", required = true) - @NotEmpty(message = "单位id不能为空") - private Long orgId; - @ApiModelProperty(value = "版本", name = "version", required = true) - @NotEmpty(message = "版本不能为空") - private String version; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private String createTime; - @ApiModelProperty(value = "修改时间", name = "updateTime", required = true) - @NotEmpty(message = "修改时间不能为空") - private String updateTime; - @ApiModelProperty(value = "创建人id", name = "createId", required = true) - @NotEmpty(message = "创建人id不能为空") - private Long createId; - @ApiModelProperty(value = "修改人id", name = "updateId", required = true) - @NotEmpty(message = "修改人id不能为空") - private Long updateId; - @ApiModelProperty(value = "${column.comment}", name = "env", required = true) - @NotEmpty(message = "${column.comment}不能为空") - private String env; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyAddCmd.java index 80ceb54..4c91d61 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyAddCmd.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; +import java.util.Date; /** * web-client @@ -20,9 +21,6 @@ import javax.validation.constraints.NotEmpty; @NoArgsConstructor @AllArgsConstructor public class PersonApplyAddCmd extends Command { - @ApiModelProperty(value = "id", name = "id", required = true) - @NotEmpty(message = "id不能为空") - private Long id; @ApiModelProperty(value = "1股份2分公司3相关方4临时人员", name = "personBelongType", required = true) @NotEmpty(message = "1股份2分公司3相关方4临时人员不能为空") private Object personBelongType; @@ -77,41 +75,6 @@ public class PersonApplyAddCmd extends Command { @ApiModelProperty(value = "项目名称", name = "projectName", required = true) @NotEmpty(message = "项目名称不能为空") private String projectName; - @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识不能为空") - private String deleteEnum; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private Date createTime; - @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) - @NotEmpty(message = "更新时间不能为空") - private Date updateTime; - @ApiModelProperty(value = "创建人ID", name = "createId", required = true) - @NotEmpty(message = "创建人ID不能为空") - private Long createId; - @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) - @NotEmpty(message = "更新人ID不能为空") - private Long updateId; - @ApiModelProperty(value = "环境标识", name = "env", required = true) - @NotEmpty(message = "环境标识不能为空") - private String env; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) - @NotEmpty(message = "租户ID不能为空") - private Long tenantId; - @ApiModelProperty(value = "组织ID", name = "orgId", required = true) - @NotEmpty(message = "组织ID不能为空") - private Long orgId; - @ApiModelProperty(value = "版本号", name = "version", required = true) - @NotEmpty(message = "版本号不能为空") - private Integer version; - @ApiModelProperty(value = "来访事由", name = "remarks", required = true) - @NotEmpty(message = "来访事由不能为空") - private String remarks; + } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyUpdateCmd.java index 7ab33bb..8f039e0 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/PersonApplyUpdateCmd.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; +import java.util.Date; /** * web-client @@ -25,10 +26,10 @@ public class PersonApplyUpdateCmd extends Command { private Long id; @ApiModelProperty(value = "1股份2分公司3相关方4临时人员", name = "personBelongType", required = true) @NotEmpty(message = "1股份2分公司3相关方4临时人员不能为空") - private Object personBelongType; + private Integer personBelongType; @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea", required = true) @NotEmpty(message = "授权范围港区与区域不能为空") - private Object gateLevelAuthArea; + private String gateLevelAuthArea; @ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）)", name = "auditFlag", required = true) @NotEmpty(message = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（长期人员）)不能为空") private Integer auditFlag; @@ -77,39 +78,6 @@ public class PersonApplyUpdateCmd extends Command { @ApiModelProperty(value = "项目名称", name = "projectName", required = true) @NotEmpty(message = "项目名称不能为空") private String projectName; - @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识不能为空") - private String deleteEnum; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private Date createTime; - @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) - @NotEmpty(message = "更新时间不能为空") - private Date updateTime; - @ApiModelProperty(value = "创建人ID", name = "createId", required = true) - @NotEmpty(message = "创建人ID不能为空") - private Long createId; - @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) - @NotEmpty(message = "更新人ID不能为空") - private Long updateId; - @ApiModelProperty(value = "环境标识", name = "env", required = true) - @NotEmpty(message = "环境标识不能为空") - private String env; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) - @NotEmpty(message = "租户ID不能为空") - private Long tenantId; - @ApiModelProperty(value = "组织ID", name = "orgId", required = true) - @NotEmpty(message = "组织ID不能为空") - private Long orgId; - @ApiModelProperty(value = "版本号", name = "version", required = true) - @NotEmpty(message = "版本号不能为空") - private Integer version; @ApiModelProperty(value = "来访事由", name = "remarks", required = true) @NotEmpty(message = "来访事由不能为空") private String remarks; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/PersonMessageAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/PersonMessageAddCmd.java index 3de141a..ce32043 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/PersonMessageAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/PersonMessageAddCmd.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; +import java.util.Date; /** * web-client @@ -20,15 +21,12 @@ import javax.validation.constraints.NotEmpty; @NoArgsConstructor @AllArgsConstructor public class PersonMessageAddCmd extends Command { - @ApiModelProperty(value = "id", name = "id", required = true) - @NotEmpty(message = "id不能为空") - private Object id; @ApiModelProperty(value = "人员申请id", name = "personApplyId", required = true) @NotEmpty(message = "人员申请id不能为空") private Long personApplyId; @ApiModelProperty(value = "1股份2分公司3相关方4临时人员", name = "personBelongType", required = true) @NotEmpty(message = "1股份2分公司3相关方4临时人员不能为空") - private Object personBelongType; + private Integer personBelongType; @ApiModelProperty(value = "头像", name = "userFaceUrl", required = true) @NotEmpty(message = "头像不能为空") private String userFaceUrl; @@ -37,7 +35,7 @@ public class PersonMessageAddCmd extends Command { private String userCard; @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea", required = true) @NotEmpty(message = "授权范围港区与区域不能为空") - private Object gateLevelAuthArea; + private String gateLevelAuthArea; @ApiModelProperty(value = "授权访问起始时间", name = "visitStartTime", required = true) @NotEmpty(message = "授权访问起始时间不能为空") private Date visitStartTime; @@ -47,39 +45,6 @@ public class PersonMessageAddCmd extends Command { @ApiModelProperty(value = "备注", name = "remarks", required = true) @NotEmpty(message = "备注不能为空") private String remarks; - @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识不能为空") - private String deleteEnum; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private Date createTime; - @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) - @NotEmpty(message = "更新时间不能为空") - private Date updateTime; - @ApiModelProperty(value = "创建人ID", name = "createId", required = true) - @NotEmpty(message = "创建人ID不能为空") - private Long createId; - @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) - @NotEmpty(message = "更新人ID不能为空") - private Long updateId; - @ApiModelProperty(value = "环境标识", name = "env", required = true) - @NotEmpty(message = "环境标识不能为空") - private String env; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) - @NotEmpty(message = "租户ID不能为空") - private Long tenantId; - @ApiModelProperty(value = "组织ID", name = "orgId", required = true) - @NotEmpty(message = "组织ID不能为空") - private Long orgId; - @ApiModelProperty(value = "版本号", name = "version", required = true) - @NotEmpty(message = "版本号不能为空") - private Integer version; @ApiModelProperty(value = "对接状态，1对接完成，2未对接", name = "syncStatus", required = true) @NotEmpty(message = "对接状态，1对接完成，2未对接不能为空") private Integer syncStatus; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/PersonMessageUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/PersonMessageUpdateCmd.java index 28f75fe..cced235 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/PersonMessageUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/PersonMessageUpdateCmd.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; +import java.util.Date; /** * web-client @@ -47,39 +48,6 @@ public class PersonMessageUpdateCmd extends Command { @ApiModelProperty(value = "备注", name = "remarks", required = true) @NotEmpty(message = "备注不能为空") private String remarks; - @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识不能为空") - private String deleteEnum; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private Date createTime; - @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) - @NotEmpty(message = "更新时间不能为空") - private Date updateTime; - @ApiModelProperty(value = "创建人ID", name = "createId", required = true) - @NotEmpty(message = "创建人ID不能为空") - private Long createId; - @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) - @NotEmpty(message = "更新人ID不能为空") - private Long updateId; - @ApiModelProperty(value = "环境标识", name = "env", required = true) - @NotEmpty(message = "环境标识不能为空") - private String env; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) - @NotEmpty(message = "租户ID不能为空") - private Long tenantId; - @ApiModelProperty(value = "组织ID", name = "orgId", required = true) - @NotEmpty(message = "组织ID不能为空") - private Long orgId; - @ApiModelProperty(value = "版本号", name = "version", required = true) - @NotEmpty(message = "版本号不能为空") - private Integer version; @ApiModelProperty(value = "对接状态，1对接完成，2未对接", name = "syncStatus", required = true) @NotEmpty(message = "对接状态，1对接完成，2未对接不能为空") private Integer syncStatus; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java index 86aa725..7bce54c 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; +import java.util.Date; /** * web-client @@ -20,9 +21,6 @@ import javax.validation.constraints.NotEmpty; @NoArgsConstructor @AllArgsConstructor public class VehicleApplyAddCmd extends Command { - @ApiModelProperty(value = "id", name = "id", required = true) - @NotEmpty(message = "id不能为空") - private Long id; @ApiModelProperty(value = "车辆状态(1未启用,2启用)", name = "statusFlag", required = true) @NotEmpty(message = "车辆状态(1未启用,2启用)不能为空") private Integer statusFlag; @@ -46,7 +44,7 @@ public class VehicleApplyAddCmd extends Command { private String vehicleBelongType; @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea", required = true) @NotEmpty(message = "授权范围港区与区域不能为空") - private Object gateLevelAuthArea; + private String gateLevelAuthArea; @ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)", name = "auditFlag", required = true) @NotEmpty(message = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)不能为空") private Integer auditFlag; @@ -80,20 +78,8 @@ public class VehicleApplyAddCmd extends Command { @ApiModelProperty(value = "排放标准名称", name = "emissionStandards", required = true) @NotEmpty(message = "排放标准名称不能为空") private String emissionStandards; - @ApiModelProperty(value = "排放标准: - level1 ->国一 - level2 ->国二 - level3 ->国三 - level4 ->国四 - level5 ->国五 - level6 ->国六", name = "emissionStandardsName", required = true) - @NotEmpty(message = "排放标准: - level1 ->国一 - level2 ->国二 - level3 ->国三 - level4 ->国四 - level5 ->国五 - level6 ->国六不能为空") + @ApiModelProperty(value = "排放标准", name = "emissionStandardsName", required = true) + @NotEmpty(message = "排放标准不能为空") private String emissionStandardsName; @ApiModelProperty(value = "行驶证照片", name = "drivingLicenseId", required = true) @NotEmpty(message = "行驶证照片不能为空") @@ -113,41 +99,5 @@ public class VehicleApplyAddCmd extends Command { @ApiModelProperty(value = "1被拉黑2未拉黑", name = "blockedFlag", required = true) @NotEmpty(message = "1被拉黑2未拉黑不能为空") private Integer blockedFlag; - @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识不能为空") - private String deleteEnum; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private Date createTime; - @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) - @NotEmpty(message = "更新时间不能为空") - private Date updateTime; - @ApiModelProperty(value = "创建人ID", name = "createId", required = true) - @NotEmpty(message = "创建人ID不能为空") - private Long createId; - @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) - @NotEmpty(message = "更新人ID不能为空") - private Long updateId; - @ApiModelProperty(value = "环境标识", name = "env", required = true) - @NotEmpty(message = "环境标识不能为空") - private String env; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) - @NotEmpty(message = "租户ID不能为空") - private Long tenantId; - @ApiModelProperty(value = "组织ID", name = "orgId", required = true) - @NotEmpty(message = "组织ID不能为空") - private Long orgId; - @ApiModelProperty(value = "版本号", name = "version", required = true) - @NotEmpty(message = "版本号不能为空") - private Integer version; - @ApiModelProperty(value = "备注", name = "remarks", required = true) - @NotEmpty(message = "备注不能为空") - private String remarks; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyUpdateCmd.java index 1ee845f..380c110 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyUpdateCmd.java @@ -8,6 +8,8 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Date; /** * web-client @@ -24,7 +26,7 @@ public class VehicleApplyUpdateCmd extends Command { @NotEmpty(message = "id不能为空") private Long id; @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 = "车牌类型数据字典不能为空") @@ -54,25 +56,25 @@ public class VehicleApplyUpdateCmd extends Command { @NotEmpty(message = "进出港权限(1:有 2：无)不能为空") private Integer mkmjPermission; @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true) - @NotEmpty(message = "访问起始时间不能为空") + @NotNull(message = "访问起始时间不能为空") private Date visitStartTime; @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true) - @NotEmpty(message = "访问结束时间不能为空") + @NotNull(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 = "车辆所属人姓名(员工车辆/驾驶人名称)不能为空") @@ -80,74 +82,26 @@ public class VehicleApplyUpdateCmd extends Command { @ApiModelProperty(value = "排放标准名称", name = "emissionStandards", required = true) @NotEmpty(message = "排放标准名称不能为空") private String emissionStandards; - @ApiModelProperty(value = "排放标准: - level1 ->国一 - level2 ->国二 - level3 ->国三 - level4 ->国四 - level5 ->国五 - level6 ->国六", name = "emissionStandardsName", required = true) - @NotEmpty(message = "排放标准: - level1 ->国一 - level2 ->国二 - level3 ->国三 - level4 ->国四 - level5 ->国五 - level6 ->国六不能为空") + @ApiModelProperty(value = "排放标准", name = "emissionStandardsName", required = true) + @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; - @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识不能为空") - private String deleteEnum; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private Date createTime; - @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) - @NotEmpty(message = "更新时间不能为空") - private Date updateTime; - @ApiModelProperty(value = "创建人ID", name = "createId", required = true) - @NotEmpty(message = "创建人ID不能为空") - private Long createId; - @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) - @NotEmpty(message = "更新人ID不能为空") - private Long updateId; - @ApiModelProperty(value = "环境标识", name = "env", required = true) - @NotEmpty(message = "环境标识不能为空") - private String env; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) - @NotEmpty(message = "租户ID不能为空") - private Long tenantId; - @ApiModelProperty(value = "组织ID", name = "orgId", required = true) - @NotEmpty(message = "组织ID不能为空") - private Long orgId; - @ApiModelProperty(value = "版本号", name = "version", required = true) - @NotEmpty(message = "版本号不能为空") - private Integer version; - @ApiModelProperty(value = "备注", name = "remarks", required = true) - @NotEmpty(message = "备注不能为空") - private String remarks; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditAddCmd.java index 9a58f98..fbfef3a 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditAddCmd.java @@ -20,9 +20,6 @@ import javax.validation.constraints.NotEmpty; @NoArgsConstructor @AllArgsConstructor public class VehicleAuditAddCmd extends Command { - @ApiModelProperty(value = "id", name = "id", required = true) - @NotEmpty(message = "id不能为空") - private Long id; @ApiModelProperty(value = "车辆申请id", name = "vehicleApplyId", required = true) @NotEmpty(message = "车辆申请id不能为空") private String vehicleApplyId; @@ -55,43 +52,10 @@ public class VehicleAuditAddCmd extends Command { private Integer auditStatus; @ApiModelProperty(value = "待审核信息", name = "changeAfter", required = true) @NotEmpty(message = "待审核信息不能为空") - private Object changeAfter; + private String changeAfter; @ApiModelProperty(value = "变更前信息", name = "changeBefore", required = true) @NotEmpty(message = "变更前信息不能为空") - private Object changeBefore; - @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识不能为空") - private String deleteEnum; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private Date createTime; - @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) - @NotEmpty(message = "更新时间不能为空") - private Date updateTime; - @ApiModelProperty(value = "创建人ID", name = "createId", required = true) - @NotEmpty(message = "创建人ID不能为空") - private Long createId; - @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) - @NotEmpty(message = "更新人ID不能为空") - private Long updateId; - @ApiModelProperty(value = "环境标识", name = "env", required = true) - @NotEmpty(message = "环境标识不能为空") - private String env; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) - @NotEmpty(message = "租户ID不能为空") - private Long tenantId; - @ApiModelProperty(value = "组织ID", name = "orgId", required = true) - @NotEmpty(message = "组织ID不能为空") - private Long orgId; - @ApiModelProperty(value = "版本号", name = "version", required = true) - @NotEmpty(message = "版本号不能为空") - private Object version; + private String changeBefore; @ApiModelProperty(value = "备注", name = "remarks", required = true) @NotEmpty(message = "备注不能为空") private String remarks; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditUpdateCmd.java index 8acad75..4c31f18 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditUpdateCmd.java @@ -55,43 +55,13 @@ public class VehicleAuditUpdateCmd extends Command { private Integer auditStatus; @ApiModelProperty(value = "待审核信息", name = "changeAfter", required = true) @NotEmpty(message = "待审核信息不能为空") - private Object changeAfter; + private String changeAfter; @ApiModelProperty(value = "变更前信息", name = "changeBefore", required = true) @NotEmpty(message = "变更前信息不能为空") - private Object changeBefore; + private String changeBefore; @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) @NotEmpty(message = "删除标识不能为空") private String deleteEnum; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private Date createTime; - @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) - @NotEmpty(message = "更新时间不能为空") - private Date updateTime; - @ApiModelProperty(value = "创建人ID", name = "createId", required = true) - @NotEmpty(message = "创建人ID不能为空") - private Long createId; - @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) - @NotEmpty(message = "更新人ID不能为空") - private Long updateId; - @ApiModelProperty(value = "环境标识", name = "env", required = true) - @NotEmpty(message = "环境标识不能为空") - private String env; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) - @NotEmpty(message = "租户ID不能为空") - private Long tenantId; - @ApiModelProperty(value = "组织ID", name = "orgId", required = true) - @NotEmpty(message = "组织ID不能为空") - private Long orgId; - @ApiModelProperty(value = "版本号", name = "version", required = true) - @NotEmpty(message = "版本号不能为空") - private Object version; @ApiModelProperty(value = "备注", name = "remarks", required = true) @NotEmpty(message = "备注不能为空") private String remarks; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackAddCmd.java index f1fbf5b..a24ed1e 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackAddCmd.java @@ -20,9 +20,6 @@ import javax.validation.constraints.NotEmpty; @NoArgsConstructor @AllArgsConstructor public class VehicleBlackAddCmd extends Command { - @ApiModelProperty(value = "id", name = "id", required = true) - @NotEmpty(message = "id不能为空") - private Long id; @ApiModelProperty(value = "车辆信息表（vehicle_apply）的主键id", name = "vehicleId", required = true) @NotEmpty(message = "车辆信息表（vehicle_apply）的主键id不能为空") private Long vehicleId; @@ -32,39 +29,6 @@ public class VehicleBlackAddCmd extends Command { @ApiModelProperty(value = "车牌号", name = "licenceNo", required = true) @NotEmpty(message = "车牌号不能为空") private String licenceNo; - @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识不能为空") - private String deleteEnum; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private Date createTime; - @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) - @NotEmpty(message = "更新时间不能为空") - private Date updateTime; - @ApiModelProperty(value = "创建人ID", name = "createId", required = true) - @NotEmpty(message = "创建人ID不能为空") - private Long createId; - @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) - @NotEmpty(message = "更新人ID不能为空") - private Long updateId; - @ApiModelProperty(value = "环境标识", name = "env", required = true) - @NotEmpty(message = "环境标识不能为空") - private String env; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) - @NotEmpty(message = "租户ID不能为空") - private Long tenantId; - @ApiModelProperty(value = "组织ID", name = "orgId", required = true) - @NotEmpty(message = "组织ID不能为空") - private Long orgId; - @ApiModelProperty(value = "版本号", name = "version", required = true) - @NotEmpty(message = "版本号不能为空") - private Integer version; @ApiModelProperty(value = "备注", name = "remarks", required = true) @NotEmpty(message = "备注不能为空") private String remarks; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackUpdateCmd.java index 9ec9c24..25734e9 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackUpdateCmd.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; +import java.util.Date; /** * web-client @@ -32,41 +33,5 @@ public class VehicleBlackUpdateCmd extends Command { @ApiModelProperty(value = "车牌号", name = "licenceNo", required = true) @NotEmpty(message = "车牌号不能为空") private String licenceNo; - @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识不能为空") - private String deleteEnum; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private Date createTime; - @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) - @NotEmpty(message = "更新时间不能为空") - private Date updateTime; - @ApiModelProperty(value = "创建人ID", name = "createId", required = true) - @NotEmpty(message = "创建人ID不能为空") - private Long createId; - @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) - @NotEmpty(message = "更新人ID不能为空") - private Long updateId; - @ApiModelProperty(value = "环境标识", name = "env", required = true) - @NotEmpty(message = "环境标识不能为空") - private String env; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) - @NotEmpty(message = "租户ID不能为空") - private Long tenantId; - @ApiModelProperty(value = "组织ID", name = "orgId", required = true) - @NotEmpty(message = "组织ID不能为空") - private Long orgId; - @ApiModelProperty(value = "版本号", name = "version", required = true) - @NotEmpty(message = "版本号不能为空") - private Integer version; - @ApiModelProperty(value = "备注", name = "remarks", required = true) - @NotEmpty(message = "备注不能为空") - private String remarks; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageAddCmd.java index adf5898..d0102c9 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageAddCmd.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; +import java.util.Date; /** * web-client @@ -20,9 +21,6 @@ import javax.validation.constraints.NotEmpty; @NoArgsConstructor @AllArgsConstructor public class VehicleMessageAddCmd extends Command { - @ApiModelProperty(value = "id", name = "id", required = true) - @NotEmpty(message = "id不能为空") - private Long id; @ApiModelProperty(value = "车牌类型数据字典", name = "licenceType", required = true) @NotEmpty(message = "车牌类型数据字典不能为空") private String licenceType; @@ -56,39 +54,6 @@ public class VehicleMessageAddCmd extends Command { @ApiModelProperty(value = "备注", name = "remarks", required = true) @NotEmpty(message = "备注不能为空") private String remarks; - @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识不能为空") - private String deleteEnum; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private Date createTime; - @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) - @NotEmpty(message = "更新时间不能为空") - private Date updateTime; - @ApiModelProperty(value = "创建人ID", name = "createId", required = true) - @NotEmpty(message = "创建人ID不能为空") - private Long createId; - @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) - @NotEmpty(message = "更新人ID不能为空") - private Long updateId; - @ApiModelProperty(value = "环境标识", name = "env", required = true) - @NotEmpty(message = "环境标识不能为空") - private String env; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) - @NotEmpty(message = "租户ID不能为空") - private Long tenantId; - @ApiModelProperty(value = "组织ID", name = "orgId", required = true) - @NotEmpty(message = "组织ID不能为空") - private Long orgId; - @ApiModelProperty(value = "版本号", name = "version", required = true) - @NotEmpty(message = "版本号不能为空") - private Integer version; @ApiModelProperty(value = "对接状态，1对接完成，2未对接", name = "syncStatus", required = true) @NotEmpty(message = "对接状态，1对接完成，2未对接不能为空") private Integer syncStatus; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageUpdateCmd.java index 16d6383..3355b4e 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageUpdateCmd.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; +import java.util.Date; /** * web-client @@ -53,42 +54,6 @@ public class VehicleMessageUpdateCmd extends Command { @ApiModelProperty(value = "车辆申请id", name = "vehicleApplyId", required = true) @NotEmpty(message = "车辆申请id不能为空") private Long vehicleApplyId; - @ApiModelProperty(value = "备注", name = "remarks", required = true) - @NotEmpty(message = "备注不能为空") - private String remarks; - @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识不能为空") - private String deleteEnum; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private Date createTime; - @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) - @NotEmpty(message = "更新时间不能为空") - private Date updateTime; - @ApiModelProperty(value = "创建人ID", name = "createId", required = true) - @NotEmpty(message = "创建人ID不能为空") - private Long createId; - @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) - @NotEmpty(message = "更新人ID不能为空") - private Long updateId; - @ApiModelProperty(value = "环境标识", name = "env", required = true) - @NotEmpty(message = "环境标识不能为空") - private String env; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) - @NotEmpty(message = "租户ID不能为空") - private Long tenantId; - @ApiModelProperty(value = "组织ID", name = "orgId", required = true) - @NotEmpty(message = "组织ID不能为空") - private Long orgId; - @ApiModelProperty(value = "版本号", name = "version", required = true) - @NotEmpty(message = "版本号不能为空") - private Integer version; @ApiModelProperty(value = "对接状态，1对接完成，2未对接", name = "syncStatus", required = true) @NotEmpty(message = "对接状态，1对接完成，2未对接不能为空") private Integer syncStatus; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsAddCmd.java index d6c0ce0..22c5319 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsAddCmd.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; +import java.util.Date; /** * web-client @@ -20,9 +21,6 @@ import javax.validation.constraints.NotEmpty; @NoArgsConstructor @AllArgsConstructor public class VehicleViolationsAddCmd extends Command { - @ApiModelProperty(value = "车辆违规记录id", name = "id", required = true) - @NotEmpty(message = "车辆违规记录id不能为空") - private Long id; @ApiModelProperty(value = "车辆信息表（vehicle_apply）的主键id", name = "vehicleId", required = true) @NotEmpty(message = "车辆信息表（vehicle_apply）的主键id不能为空") private Long vehicleId; @@ -53,41 +51,5 @@ public class VehicleViolationsAddCmd extends Command { @ApiModelProperty(value = "违规处理状态，1已处理2未处理", name = "violationProcessingStatus", required = true) @NotEmpty(message = "违规处理状态，1已处理2未处理不能为空") private Integer violationProcessingStatus; - @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识不能为空") - private String deleteEnum; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private Date createTime; - @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) - @NotEmpty(message = "更新时间不能为空") - private Date updateTime; - @ApiModelProperty(value = "创建人ID", name = "createId", required = true) - @NotEmpty(message = "创建人ID不能为空") - private Long createId; - @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) - @NotEmpty(message = "更新人ID不能为空") - private Long updateId; - @ApiModelProperty(value = "环境标识", name = "env", required = true) - @NotEmpty(message = "环境标识不能为空") - private String env; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) - @NotEmpty(message = "租户ID不能为空") - private Long tenantId; - @ApiModelProperty(value = "组织ID", name = "orgId", required = true) - @NotEmpty(message = "组织ID不能为空") - private Long orgId; - @ApiModelProperty(value = "版本号", name = "version", required = true) - @NotEmpty(message = "版本号不能为空") - private Integer version; - @ApiModelProperty(value = "备注", name = "remarks", required = true) - @NotEmpty(message = "备注不能为空") - private String remarks; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsUpdateCmd.java index 98d667b..dc01151 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleViolationsUpdateCmd.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; +import java.util.Date; /** * web-client @@ -56,38 +57,6 @@ public class VehicleViolationsUpdateCmd extends Command { @ApiModelProperty(value = "删除标识", name = "deleteEnum", required = true) @NotEmpty(message = "删除标识不能为空") private String deleteEnum; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private Date createTime; - @ApiModelProperty(value = "更新时间", name = "updateTime", required = true) - @NotEmpty(message = "更新时间不能为空") - private Date updateTime; - @ApiModelProperty(value = "创建人ID", name = "createId", required = true) - @NotEmpty(message = "创建人ID不能为空") - private Long createId; - @ApiModelProperty(value = "更新人ID", name = "updateId", required = true) - @NotEmpty(message = "更新人ID不能为空") - private Long updateId; - @ApiModelProperty(value = "环境标识", name = "env", required = true) - @NotEmpty(message = "环境标识不能为空") - private String env; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户ID", name = "tenantId", required = true) - @NotEmpty(message = "租户ID不能为空") - private Long tenantId; - @ApiModelProperty(value = "组织ID", name = "orgId", required = true) - @NotEmpty(message = "组织ID不能为空") - private Long orgId; - @ApiModelProperty(value = "版本号", name = "version", required = true) - @NotEmpty(message = "版本号不能为空") - private Integer version; - @ApiModelProperty(value = "备注", name = "remarks", required = true) - @NotEmpty(message = "备注不能为空") - private String remarks; + } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VideoAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VideoAddCmd.java index c9c8f87..ef67cd4 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VideoAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VideoAddCmd.java @@ -20,9 +20,6 @@ import javax.validation.constraints.NotEmpty; @NoArgsConstructor @AllArgsConstructor public class VideoAddCmd extends Command { - @ApiModelProperty(value = "主键", name = "id", required = true) - @NotEmpty(message = "主键不能为空") - private Long id; @ApiModelProperty(value = "口门/闸机id 外键id ", name = "foreignId", required = true) @NotEmpty(message = "口门/闸机id 外键id 不能为空") private Long foreignId; @@ -44,41 +41,5 @@ public class VideoAddCmd extends Command { @ApiModelProperty(value = "纬度", name = "latitude", required = true) @NotEmpty(message = "纬度不能为空") private String latitude; - @ApiModelProperty(value = "删除标识true false", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识true false不能为空") - private String deleteEnum; - @ApiModelProperty(value = "备注", name = "remarks", required = true) - @NotEmpty(message = "备注不能为空") - private String remarks; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户id", name = "tenantId", required = true) - @NotEmpty(message = "租户id不能为空") - private Long tenantId; - @ApiModelProperty(value = "单位id", name = "orgId", required = true) - @NotEmpty(message = "单位id不能为空") - private Long orgId; - @ApiModelProperty(value = "版本", name = "version", required = true) - @NotEmpty(message = "版本不能为空") - private String version; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private String createTime; - @ApiModelProperty(value = "修改时间", name = "updateTime", required = true) - @NotEmpty(message = "修改时间不能为空") - private String updateTime; - @ApiModelProperty(value = "创建人id", name = "createId", required = true) - @NotEmpty(message = "创建人id不能为空") - private Long createId; - @ApiModelProperty(value = "修改人id", name = "updateId", required = true) - @NotEmpty(message = "修改人id不能为空") - private Long updateId; - @ApiModelProperty(value = "${column.comment}", name = "env", required = true) - @NotEmpty(message = "${column.comment}不能为空") - private String env; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VideoUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VideoUpdateCmd.java index 602416d..12cdc90 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VideoUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VideoUpdateCmd.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; /** * web-client @@ -36,7 +37,7 @@ public class VideoUpdateCmd 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 = "经度不能为空") @@ -44,41 +45,5 @@ public class VideoUpdateCmd extends Command { @ApiModelProperty(value = "纬度", name = "latitude", required = true) @NotEmpty(message = "纬度不能为空") private String latitude; - @ApiModelProperty(value = "删除标识true false", name = "deleteEnum", required = true) - @NotEmpty(message = "删除标识true false不能为空") - private String deleteEnum; - @ApiModelProperty(value = "备注", name = "remarks", required = true) - @NotEmpty(message = "备注不能为空") - private String remarks; - @ApiModelProperty(value = "创建人姓名", name = "createName", required = true) - @NotEmpty(message = "创建人姓名不能为空") - private String createName; - @ApiModelProperty(value = "更新人姓名", name = "updateName", required = true) - @NotEmpty(message = "更新人姓名不能为空") - private String updateName; - @ApiModelProperty(value = "租户id", name = "tenantId", required = true) - @NotEmpty(message = "租户id不能为空") - private Long tenantId; - @ApiModelProperty(value = "单位id", name = "orgId", required = true) - @NotEmpty(message = "单位id不能为空") - private Long orgId; - @ApiModelProperty(value = "版本", name = "version", required = true) - @NotEmpty(message = "版本不能为空") - private String version; - @ApiModelProperty(value = "创建时间", name = "createTime", required = true) - @NotEmpty(message = "创建时间不能为空") - private String createTime; - @ApiModelProperty(value = "修改时间", name = "updateTime", required = true) - @NotEmpty(message = "修改时间不能为空") - private String updateTime; - @ApiModelProperty(value = "创建人id", name = "createId", required = true) - @NotEmpty(message = "创建人id不能为空") - private Long createId; - @ApiModelProperty(value = "修改人id", name = "updateId", required = true) - @NotEmpty(message = "修改人id不能为空") - private Long updateId; - @ApiModelProperty(value = "${column.comment}", name = "env", required = true) - @NotEmpty(message = "${column.comment}不能为空") - private String env; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjApprovalUserCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjApprovalUserCO.java index b4739ff..b79e5a9 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjApprovalUserCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjApprovalUserCO.java @@ -43,39 +43,6 @@ public class MkmjApprovalUserCO extends ClientObject { //临时审核权限(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; + } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjGateCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjGateCO.java index 659858b..71facc6 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjGateCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjGateCO.java @@ -55,39 +55,5 @@ public class MkmjGateCO extends ClientObject { //纬度 @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; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjPassageCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjPassageCO.java index d84566b..ce43daa 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjPassageCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjPassageCO.java @@ -34,39 +34,8 @@ public class MkmjPassageCO extends ClientObject { //纬度 @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; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/PersonApplyCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/PersonApplyCO.java index 1b99173..033eb4e 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/PersonApplyCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/PersonApplyCO.java @@ -4,6 +4,8 @@ import com.alibaba.cola.dto.ClientObject; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * web-client @@ -70,39 +72,6 @@ public class PersonApplyCO extends ClientObject { //项目名称 @ApiModelProperty(value = "项目名称") private String projectName; - //删除标识 - @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; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/PersonMessageCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/PersonMessageCO.java index a9b8415..abb17c4 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/PersonMessageCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/PersonMessageCO.java @@ -4,6 +4,8 @@ import com.alibaba.cola.dto.ClientObject; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * web-client @@ -21,7 +23,7 @@ public class PersonMessageCO extends ClientObject { private Long personApplyId; //1股份2分公司3相关方4临时人员 @ApiModelProperty(value = "1股份2分公司3相关方4临时人员") - private Object personBelongType; + private Integer personBelongType; //头像 @ApiModelProperty(value = "头像") private String userFaceUrl; @@ -40,39 +42,6 @@ public class PersonMessageCO extends ClientObject { //备注 @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; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java index f33c73f..dc96b82 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java @@ -4,6 +4,8 @@ import com.alibaba.cola.dto.ClientObject; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * web-client @@ -39,7 +41,7 @@ public class VehicleApplyCO extends ClientObject { private String vehicleBelongType; //授权范围港区与区域 @ApiModelProperty(value = "授权范围港区与区域") - private Object gateLevelAuthArea; + private String gateLevelAuthArea; //审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）) @ApiModelProperty(value = "审核状态(1:审核中;2审核通过; 3：审核驳回，4无需审批（检查部门车辆）)") private Integer auditFlag; @@ -74,19 +76,7 @@ public class VehicleApplyCO extends ClientObject { @ApiModelProperty(value = "排放标准名称") private String emissionStandards; //排放标准: - level1 ->国一 - level2 ->国二 - level3 ->国三 - level4 ->国四 - level5 ->国五 - level6 ->国六 - @ApiModelProperty(value = "排放标准: - level1 ->国一 - level2 ->国二 - level3 ->国三 - level4 ->国四 - level5 ->国五 - level6 ->国六") + @ApiModelProperty(value = "排放标准") private String emissionStandardsName; //行驶证照片 @ApiModelProperty(value = "行驶证照片") @@ -106,41 +96,5 @@ public class VehicleApplyCO extends ClientObject { //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; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditCO.java index 5d9acd6..00c4f78 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditCO.java @@ -48,45 +48,9 @@ public class VehicleAuditCO extends ClientObject { private Integer auditStatus; //待审核信息 @ApiModelProperty(value = "待审核信息") - private Object changeAfter; + private String changeAfter; //变更前信息 @ApiModelProperty(value = "变更前信息") - private Object 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; + private String changeBefore; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleBlackCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleBlackCO.java index f84bd80..f2e43b0 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleBlackCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleBlackCO.java @@ -25,39 +25,6 @@ public class VehicleBlackCO extends ClientObject { //车牌号 @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; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleMessageCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleMessageCO.java index df77980..942de7b 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleMessageCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleMessageCO.java @@ -4,6 +4,8 @@ import com.alibaba.cola.dto.ClientObject; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * web-client @@ -36,7 +38,7 @@ public class VehicleMessageCO extends ClientObject { private String vehicleBelongType; //授权范围港区与区域 @ApiModelProperty(value = "授权范围港区与区域") - private Object gateLevelAuthArea; + private String gateLevelAuthArea; //授权访问起始时间 @ApiModelProperty(value = "授权访问起始时间") private Date visitStartTime; @@ -49,39 +51,6 @@ public class VehicleMessageCO extends ClientObject { //备注 @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; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleViolationsCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleViolationsCO.java index 2b596ae..9aa012e 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleViolationsCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleViolationsCO.java @@ -4,6 +4,8 @@ import com.alibaba.cola.dto.ClientObject; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * web-client @@ -46,39 +48,6 @@ public class VehicleViolationsCO extends ClientObject { //违规处理状态，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; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VideoCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VideoCO.java index 034ca2f..516bc93 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VideoCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VideoCO.java @@ -37,39 +37,5 @@ public class VideoCO extends ClientObject { //纬度 @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; } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java index 12a0702..e57c745 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.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,6 @@ import lombok.EqualsAndHashCode; @TableName("vehicle_apply") @EqualsAndHashCode(callSuper = true) public class VehicleApplyDO extends BaseDO { - //id - @ApiModelProperty(value = "id") - @TableId(type = IdType.ASSIGN_ID) - private Long id; //车辆状态(1未启用,2启用) @ApiModelProperty(value = "车辆状态(1未启用,2启用)") private Integer statusFlag; @@ -79,19 +78,7 @@ public class VehicleApplyDO extends BaseDO { @ApiModelProperty(value = "排放标准名称") private String emissionStandards; //排放标准: - level1 ->国一 - level2 ->国二 - level3 ->国三 - level4 ->国四 - level5 ->国五 - level6 ->国六 - @ApiModelProperty(value = "排放标准: - level1 ->国一 - level2 ->国二 - level3 ->国三 - level4 ->国四 - level5 ->国五 - level6 ->国六") + @ApiModelProperty(value = "排放标准:") private String emissionStandardsName; //行驶证照片 @ApiModelProperty(value = "行驶证照片")