diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessagePageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessagePageQry.java index 9cd6c93..05688d0 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessagePageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessagePageQry.java @@ -36,5 +36,9 @@ public class VehicleMessagePageQry extends PageQuery { @ApiModelProperty(value = "企业ID") private String eqCorpId; + + @ApiModelProperty(value = "删除状态") + private String eqDeleteEnum = "FALSE" ; + } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageStatusCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageStatusCmd.java index 7ac4886..02f664e 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageStatusCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageStatusCmd.java @@ -8,7 +8,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; /** * web-client @@ -21,10 +24,12 @@ import javax.validation.constraints.NotEmpty; @AllArgsConstructor public class VehicleMessageStatusCmd extends Command { @ApiModelProperty(value = "id", name = "id", required = true) - @NotEmpty(message = "id不能为空") + @NotNull(message = "id不能为空") private Long id; @ApiModelProperty(value = "进出港权限(1:有 2：无)", name = "mkmjPermission", required = true) - @NotEmpty(message = "进出港权限(1:有 2：无)不能为空") - private String mkmjPermission; + @NotNull(message = "进出港权限(1:有 2：无)不能为空") + @Min(value = 1, message = "进出港权限错误") + @Max(value = 2, message = "进出港权限错误") + private Integer mkmjPermission; } 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 115e820..1396ecf 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.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; /** * web-client @@ -20,13 +21,14 @@ import javax.validation.constraints.NotEmpty; @AllArgsConstructor public class VehicleMessageUpdateCmd extends Command { @ApiModelProperty(value = "id", name = "id", required = true) - @NotEmpty(message = "id不能为空") + @NotNull(message = "id不能为空") private Long id; + @ApiModelProperty(value = "业务id", name = "vehicleMessageId", required = true) @NotEmpty(message = "业务id不能为空") private String vehicleMessageId; @ApiModelProperty(value = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌", name = "licenceType", required = true) - @NotEmpty(message = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌不能为空") + @NotNull(message = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌不能为空") private Integer licenceType; @ApiModelProperty(value = "车牌号", name = "licenceNo", required = true) @NotEmpty(message = "车牌号不能为空") @@ -35,10 +37,10 @@ public class VehicleMessageUpdateCmd extends Command { @NotEmpty(message = "车辆类型 0-货车 1- 轿车 2-大巴客车不能为空") private String vehicleType; @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆", name = "vehicleBelongType", required = true) - @NotEmpty(message = "车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆不能为空") + @NotNull(message = "车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆不能为空") private Integer vehicleBelongType; @ApiModelProperty(value = "车辆来源(0,1,2 平台新建,3.对接车辆)", name = "carFrom", required = true) - @NotEmpty(message = "车辆来源(0,1,2 平台新建,3.对接车辆)不能为空") + @NotNull(message = "车辆来源(0,1,2 平台新建,3.对接车辆)不能为空") private Integer carFrom; @ApiModelProperty(value = "驾驶证x", name = "drivingLicense", required = true) @NotEmpty(message = "驾驶证x不能为空") @@ -56,40 +58,40 @@ public class VehicleMessageUpdateCmd extends Command { @NotEmpty(message = "环保信息截图x不能为空") private String environmentalScreenshots; @ApiModelProperty(value = "所属车队ID", name = "motorcadeId", required = true) - @NotEmpty(message = "所属车队ID不能为空") + @NotNull(message = "所属车队ID不能为空") private Long motorcadeId; @ApiModelProperty(value = "是否危化车辆(0：否，1：是)", name = "isDangerousCar", required = true) - @NotEmpty(message = "是否危化车辆(0：否，1：是)不能为空") + @NotNull(message = "是否危化车辆(0：否，1：是)不能为空") private Integer isDangerousCar; @ApiModelProperty(value = "是否审核(0：未审核 1：交警支队审核通过 2：分公司审核通过 3：审核驳回)", name = "isAudit", required = true) - @NotEmpty(message = "是否审核(0：未审核 1：交警支队审核通过 2：分公司审核通过 3：审核驳回)不能为空") + @NotNull(message = "是否审核(0：未审核 1：交警支队审核通过 2：分公司审核通过 3：审核驳回)不能为空") private Integer isAudit; @ApiModelProperty(value = "通行港区(0-全部 1-东港区 2-西港区)", name = "portId", required = true) - @NotEmpty(message = "通行港区(0-全部 1-东港区 2-西港区)不能为空") + @NotNull(message = "通行港区(0-全部 1-东港区 2-西港区)不能为空") private Integer portId; @ApiModelProperty(value = "进出港权限(1:有 2：无)", name = "mkmjPermission", required = true) - @NotEmpty(message = "进出港权限(1:有 2：无)不能为空") + @NotNull(message = "进出港权限(1:有 2：无)不能为空") private String mkmjPermission; @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 = "车辆所属部门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(员工车辆)", name = "employeeVehicleUserId", required = true) - @NotEmpty(message = "车辆所属人id(员工车辆)不能为空") + @NotNull(message = "车辆所属人id(员工车辆)不能为空") private Long employeeVehicleUserId; @ApiModelProperty(value = "车辆所属人姓名(员工车辆)", name = "employeeVehicleUserName", required = true) @NotEmpty(message = "车辆所属人姓名(员工车辆)不能为空") private String employeeVehicleUserName; - @ApiModelProperty(value = "企业ID(~~~~~~)", name = "corpinfoId", required = true) - @NotEmpty(message = "企业ID(~~~~~~)不能为空") + @ApiModelProperty(value = "企业ID(~~~~~~)", name = "corpId", required = true) + @NotNull(message = "企业ID(~~~~~~)不能为空") private Long corpId; @ApiModelProperty(value = "排放标准:level1 -> 国一level2 -> 国二level3 -> 国三level4 -> 国四level5 -> 国五level6 -> 国六", name = "emissionStandards", required = true) @NotEmpty(message = "排放标准:level1 -> 国一level2 -> 国二level3 -> 国三level4 -> 国四level5 -> 国五level6 -> 国六不能为空") diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleAuditLogGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleAuditLogGatewayImpl.java index 8230a70..eaa74f7 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleAuditLogGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleAuditLogGatewayImpl.java @@ -1,5 +1,6 @@ package com.zcloud.primeport.gatewayimpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.zcloud.primeport.domain.gateway.VehicleAuditLogGateway; import com.zcloud.primeport.domain.model.VehicleAuditLogE; import com.zcloud.primeport.persistence.dataobject.VehicleAuditLogDO; @@ -50,9 +51,12 @@ public class VehicleAuditLogGatewayImpl implements VehicleAuditLogGateway { @Override public VehicleAuditLogE queryVehicleAuditLogByVehicleMessageId(Long vehicleMessageId) { VehicleAuditLogE vehicleAuditLogE = new VehicleAuditLogE(); - VehicleAuditLogDO byVehicleMessageId = vehicleAuditLogRepository.getOne(vehicleAuditLogRepository.lambdaQuery() + VehicleAuditLogDO byVehicleMessageId = vehicleAuditLogRepository.getOne(new LambdaQueryWrapper<>(VehicleAuditLogDO.class) .eq(VehicleAuditLogDO::getVehicleMessageId, vehicleMessageId) - .eq(VehicleAuditLogDO::getStatus, 1)); + .eq(VehicleAuditLogDO::getStatus, 1) + .last("limit 1")); + + BeanUtils.copyProperties(byVehicleMessageId, vehicleAuditLogE); return vehicleAuditLogE; }