diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsAddExe.java index 307b75c..61eab67 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleViolationsAddExe.java @@ -38,7 +38,10 @@ public class VehicleViolationsAddExe { List vehicleViolationsList = vehicleViolationsGateway.listVehicleViolationByLicenceNo(cmd.getLicenceNo()); if (ciolationProperties.getLimit() != null && (vehicleViolationsList.size() + 1) >= ciolationProperties.getLimit()) { // 进入黑名单 - vehicleBlackGateway.saveIfAbsent(cmd.getLicenceNo()); + vehicleBlackGateway.saveIfAbsent(cmd.getLicenceNo() + ,cmd.getVehicleType(),cmd.getVehicleTypeName() + ,cmd.getLicenceType(),cmd.getLicenceTypeName() + ); // 申请的车辆拉黑 vehicleApplyGateway.updateEvehicleBlockedByLicenceNo(cmd.getLicenceNo(),1); // 对接表里进行车辆拉黑的处理。 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 b4d1d8a..74a3042 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 @@ -63,7 +63,7 @@ public class PersonApplyAddCmd extends Command { @NotEmpty(message = "身份证号码不能为空") private String userCard; @ApiModelProperty(value = "告知签字", name = "informSignId", required = true) - private Long informSignId; + private String informSignId; } 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 19cb9b2..3a42a8c 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 @@ -72,7 +72,7 @@ public class PersonApplyUpdateCmd extends Command { private String userCard; @ApiModelProperty(value = "告知签字", name = "informSignId", required = true) @NotNull(message = "告知签字不能为空") - private Long informSignId; + private String informSignId; @ApiModelProperty(value = "项目id", name = "projectId", required = true) @NotNull(message = "项目id不能为空") private Long projectId; 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 0eba44e..0c5165e 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 @@ -55,12 +55,12 @@ public class VehicleApplyAddCmd extends Command { private String emissionStandardsName; @ApiModelProperty(value = "行驶证照片", name = "drivingLicenseId") @NotNull(message = "行驶证照片不能为空") - private Long drivingLicenseId; + private String drivingLicenseId; @ApiModelProperty(value = "车辆照片", name = "attachmentId") @NotNull(message = "车辆照片不能为空") - private Long attachmentId; + private String attachmentId; @ApiModelProperty(value = "告知签字", name = "informSignId") - private Long informSignId; + private String informSignId; @ApiModelProperty(value = "项目id", name = "projectId") private Long projectId; @ApiModelProperty(value = "项目名称", name = "projectName") 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 a04b035..72a6298 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 @@ -70,13 +70,13 @@ public class VehicleApplyUpdateCmd extends Command { private String emissionStandardsName; @ApiModelProperty(value = "行驶证照片", name = "drivingLicenseId", required = true) @NotNull(message = "行驶证照片不能为空") - private Long drivingLicenseId; + private String drivingLicenseId; @ApiModelProperty(value = "车辆照片", name = "attachmentId", required = true) @NotNull(message = "车辆照片不能为空") - private Long attachmentId; + private String attachmentId; @ApiModelProperty(value = "告知签字", name = "informSignId", required = true) @NotNull(message = "告知签字不能为空") - private Long informSignId; + private String informSignId; @ApiModelProperty(value = "项目id", name = "projectId", required = true) private Long projectId; @ApiModelProperty(value = "项目名称", name = "projectName", required = true) diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/XgfPersonApplyAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/XgfPersonApplyAddCmd.java index 6bd8d17..20167c3 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/XgfPersonApplyAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/XgfPersonApplyAddCmd.java @@ -36,7 +36,7 @@ public class XgfPersonApplyAddCmd extends Command { private String visitEndTime; @ApiModelProperty(value = "告知签字", name = "informSignId") - private Long informSignId; + private String informSignId; @ApiModelProperty(value = "口门id,临时申请用。", name = "mkmjId") private Long mkmjId; @ApiModelProperty(value = "项目id", name = "projectId") diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/XgfPersonApplyUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/XgfPersonApplyUpdateCmd.java index 5838ddb..eda7904 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/XgfPersonApplyUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/XgfPersonApplyUpdateCmd.java @@ -37,7 +37,7 @@ public class XgfPersonApplyUpdateCmd extends Command { @ApiModelProperty(value = "告知签字", name = "informSignId", required = true) // @NotNull(message = "告知签字不能为空") - private Long informSignId; + private String informSignId; @ApiModelProperty(value = "项目id", name = "projectId", required = true) // @NotNull(message = "项目id不能为空") private Long projectId; 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 ca58bb8..374f61c 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 @@ -58,7 +58,7 @@ public class PersonApplyCO extends ClientObject { private String userCard; //告知签字 @ApiModelProperty(value = "告知签字") - private Long informSignId; + private String informSignId; //项目id @ApiModelProperty(value = "项目id") private Long projectId; 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 5a070ba..9272440 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 @@ -83,13 +83,13 @@ public class VehicleApplyCO extends ClientObject { private String emissionStandardsName; //行驶证照片 @ApiModelProperty(value = "行驶证照片") - private Long drivingLicenseId; + private String drivingLicenseId; //车辆照片 @ApiModelProperty(value = "车辆照片") - private Long attachmentId; + private String attachmentId; //告知签字 @ApiModelProperty(value = "告知签字") - private Long informSignId; + private String informSignId; //项目id @ApiModelProperty(value = "项目id") private Long projectId; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/XgfPersonApplyCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/XgfPersonApplyCO.java index de7508c..6105978 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/XgfPersonApplyCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/XgfPersonApplyCO.java @@ -33,7 +33,7 @@ public class XgfPersonApplyCO extends ClientObject { private String visitEndTime; //告知签字 @ApiModelProperty(value = "告知签字",name = "informSignId") - private Long informSignId; + private String informSignId; //项目id @ApiModelProperty(value = "项目id",name = "projectId") private Long projectId; diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleBlackGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleBlackGateway.java index 06ac99f..d9a8932 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleBlackGateway.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleBlackGateway.java @@ -29,7 +29,7 @@ public interface VehicleBlackGateway { Boolean deletedVehicleBlackByIds(Long[] id); - void saveIfAbsent(String licenceNo); + void saveIfAbsent(String licenceNo,String vehicleType,String vehicleTypeName,String licenceType,String licenceTypeName); VehicleBlackE getInfoById(Long id); } diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleApplyE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleApplyE.java index 2c81144..a5b91fc 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleApplyE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleApplyE.java @@ -60,11 +60,11 @@ public class VehicleApplyE extends BaseE { private String emissionStandards; private String emissionStandardsName; //行驶证照片 - private Long drivingLicenseId; + private String drivingLicenseId; //车辆照片 - private Long attachmentId; + private String attachmentId; //告知签字 - private Long informSignId; + private String informSignId; //项目id private Long projectId; //项目名称 diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/XgfApplyPersonE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/XgfApplyPersonE.java index e125cfc..59b33c0 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/XgfApplyPersonE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/XgfApplyPersonE.java @@ -31,7 +31,7 @@ public class XgfApplyPersonE extends BaseE { //访问结束时间 private String visitEndTime; //告知签字 - private Long informSignId; + private String informSignId; //项目id private Long projectId; //项目名称 diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleBlackGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleBlackGatewayImpl.java index 3ab016d..1c7b585 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleBlackGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleBlackGatewayImpl.java @@ -50,11 +50,15 @@ public class VehicleBlackGatewayImpl implements VehicleBlackGateway { } @Override - public void saveIfAbsent(String licenceNo) { + public void saveIfAbsent(String licenceNo,String vehicleType,String vehicleTypeName,String licenceType,String licenceTypeName) { List licenceNoList = vehicleBlackRepository.list(new QueryWrapper().eq("licence_no", licenceNo)); - VehicleBlackDO d = new VehicleBlackDO(); - d.setLicenceNo(licenceNo); if (licenceNoList.isEmpty()) { + VehicleBlackDO d = new VehicleBlackDO(); + d.setLicenceNo(licenceNo); + d.setLicenceType(licenceType); + d.setLicenceTypeName(licenceTypeName); + d.setVehicleType(vehicleType); + d.setVehicleTypeName(vehicleTypeName); vehicleBlackRepository.save(d); } } 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 5482e2a..afd850f 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 @@ -83,13 +83,13 @@ public class VehicleApplyDO extends BaseDO { private String emissionStandardsName; //行驶证照片 @ApiModelProperty(value = "行驶证照片") - private Long drivingLicenseId; + private String drivingLicenseId; //车辆照片 @ApiModelProperty(value = "车辆照片") - private Long attachmentId; + private String attachmentId; //告知签字 @ApiModelProperty(value = "告知签字") - private Long informSignId; + private String informSignId; //项目id @ApiModelProperty(value = "项目id") private Long projectId; diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleBlackDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleBlackDO.java index 298dfc8..c82bee8 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleBlackDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleBlackDO.java @@ -60,15 +60,15 @@ public class VehicleBlackDO extends BaseDO { //行驶证照片 @ApiModelProperty(value = "行驶证照片") @TableField(exist = false) - private Long drivingLicenseId; + private String drivingLicenseId; //车辆照片 @ApiModelProperty(value = "车辆照片") @TableField(exist = false) - private Long attachmentId; + private String attachmentId; //告知签字 @ApiModelProperty(value = "告知签字") @TableField(exist = false) - private Long informSignId; + private String informSignId; //项目id @ApiModelProperty(value = "项目id") @TableField(exist = false) diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/XgfApplyPersonDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/XgfApplyPersonDO.java index b1debf5..34a1bfd 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/XgfApplyPersonDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/XgfApplyPersonDO.java @@ -35,7 +35,7 @@ public class XgfApplyPersonDO extends BaseDO { private String visitEndTime; //告知签字 @ApiModelProperty(value = "告知签字") - private Long informSignId; + private String informSignId; private Long mkmjId; @TableField(exist = false) private Long mkmjName;