From 2b927c7fd043de85655b34211ad0a20646355b30 Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Tue, 18 Nov 2025 11:36:54 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8F=A3=E9=97=A8=E9=97=A8=E7=A6=81=E7=9B=91?= =?UTF-8?q?=E7=AE=A1=E7=AB=AF=E7=9A=84=E6=96=B0=E5=A2=9E=E5=92=8C=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/VehicleMessageController.java | 7 ++ .../command/VehicleMessageAddExe.java | 19 +++++ .../service/VehicleMessageServiceImpl.java | 7 ++ .../primeport/api/VehicleMessageServiceI.java | 4 + .../primeport/dto/VehicleMessageAddCmd.java | 81 +++++++------------ .../dto/VehicleMessageForCorpAddCmd.java | 77 ++++++++++++++++++ .../dto/VehicleMessageUpdateCmd.java | 3 + .../dto/clientobject/VehicleMessageCO.java | 79 +++++++----------- .../domain/model/VehicleMessageE.java | 72 +++++++++-------- .../VehicleMessageGatewayImpl.java | 6 +- .../dataobject/VehicleMessageDO.java | 81 +++++++------------ 11 files changed, 251 insertions(+), 185 deletions(-) create mode 100644 web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageForCorpAddCmd.java diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleMessageController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleMessageController.java index 0731aa4..775a3d9 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleMessageController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleMessageController.java @@ -8,6 +8,7 @@ import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.primeport.api.VehicleMessageServiceI; import com.zcloud.primeport.dto.VehicleMessageAddCmd; +import com.zcloud.primeport.dto.VehicleMessageForCorpAddCmd; import com.zcloud.primeport.dto.VehicleMessagePageQry; import com.zcloud.primeport.dto.VehicleMessageUpdateCmd; import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; @@ -79,5 +80,11 @@ public class VehicleMessageController { vehicleMessageService.edit(vehicleMessageUpdateCmd); return SingleResponse.buildSuccess(); } + + @ApiOperation("新增-监管端,分子公司人员车辆") + @PostMapping("/saveFroCorp") + public SingleResponse addForCorp(@Validated @RequestBody VehicleMessageForCorpAddCmd cmd) { + return vehicleMessageService.addForCorp(cmd); + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageAddExe.java index e453c3f..c7ecfb0 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageAddExe.java @@ -4,6 +4,7 @@ import com.alibaba.cola.exception.BizException; import com.zcloud.primeport.domain.gateway.VehicleMessageGateway; import com.zcloud.primeport.domain.model.VehicleMessageE; import com.zcloud.primeport.dto.VehicleMessageAddCmd; +import com.zcloud.primeport.dto.VehicleMessageForCorpAddCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -37,5 +38,23 @@ public class VehicleMessageAddExe { } return true; } + + @Transactional(rollbackFor = Exception.class) + public boolean executeForCorp(VehicleMessageForCorpAddCmd cmd) { + VehicleMessageE examTypeE = new VehicleMessageE(); + BeanUtils.copyProperties(cmd, examTypeE); + examTypeE = examTypeE.VehicleMessageForCorpE(examTypeE); + boolean res = false; + try { + res = vehicleMessageGateway.add(examTypeE); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("保存失败"); + } + return true; + } + } diff --git a/web-app/src/main/java/com/zcloud/primeport/service/VehicleMessageServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/VehicleMessageServiceImpl.java index 5d22310..e6ceaa7 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/VehicleMessageServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/VehicleMessageServiceImpl.java @@ -7,6 +7,7 @@ import com.zcloud.primeport.command.VehicleMessageRemoveExe; import com.zcloud.primeport.command.VehicleMessageUpdateExe; import com.zcloud.primeport.command.query.VehicleMessageQueryExe; import com.zcloud.primeport.dto.VehicleMessageAddCmd; +import com.zcloud.primeport.dto.VehicleMessageForCorpAddCmd; import com.zcloud.primeport.dto.VehicleMessagePageQry; import com.zcloud.primeport.dto.VehicleMessageUpdateCmd; import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; @@ -53,5 +54,11 @@ public class VehicleMessageServiceImpl implements VehicleMessageServiceI { public void removeBatch(Long[] ids) { vehicleMessageRemoveExe.execute(ids); } + + @Override + public SingleResponse addForCorp(VehicleMessageForCorpAddCmd cmdCorp) { + vehicleMessageAddExe.executeForCorp(cmdCorp); + return SingleResponse.buildSuccess(); + } } diff --git a/web-client/src/main/java/com/zcloud/primeport/api/VehicleMessageServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/VehicleMessageServiceI.java index 2268ced..1fee6cb 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/VehicleMessageServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/VehicleMessageServiceI.java @@ -4,6 +4,7 @@ package com.zcloud.primeport.api; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.primeport.dto.VehicleMessageAddCmd; +import com.zcloud.primeport.dto.VehicleMessageForCorpAddCmd; import com.zcloud.primeport.dto.VehicleMessagePageQry; import com.zcloud.primeport.dto.VehicleMessageUpdateCmd; import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; @@ -23,5 +24,8 @@ public interface VehicleMessageServiceI { void remove(Long id); void removeBatch(Long[] ids); + + SingleResponse addForCorp (VehicleMessageForCorpAddCmd cmdCorp); + } 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 ca26001..709d2d1 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 @@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; +import java.util.Date; /** * web-client @@ -24,57 +25,42 @@ public class VehicleMessageAddCmd extends Command { @ApiModelProperty(value = "id", name = "id", required = true) @NotEmpty(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-黑牌不能为空") private Integer licenceType; @ApiModelProperty(value = "车牌号", name = "licenceNo", required = true) @NotEmpty(message = "车牌号不能为空") private String licenceNo; - @ApiModelProperty(value = "车辆类型 0-货车 1- 轿车 2-大巴客车", name = "vehicleType", required = true) - @NotEmpty(message = "车辆类型 0-货车 1- 轿车 2-大巴客车不能为空") + @ApiModelProperty(value = "车辆类型", name = "vehicleType", required = true) + @NotEmpty(message = "车辆类型不能为空") private String vehicleType; - @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆", name = "vehicleBelongType", required = true) - @NotEmpty(message = "车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆不能为空") + @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆", name = "vehicleBelongType", required = true) + @NotEmpty(message = "车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆不能为空") private Integer vehicleBelongType; - @ApiModelProperty(value = "车辆来源(0,1,2 平台新建,3.对接车辆)", name = "carFrom", required = true) - @NotEmpty(message = "车辆来源(0,1,2 平台新建,3.对接车辆)不能为空") - private Integer carFrom; - @ApiModelProperty(value = "驾驶证x", name = "drivingLicense", required = true) - @NotEmpty(message = "驾驶证x不能为空") - private String drivingLicense; - @ApiModelProperty(value = "绿本x", name = "greenBook", required = true) - @NotEmpty(message = "绿本x不能为空") - private String greenBook; - @ApiModelProperty(value = "环保随车清单x", name = "ecoFriendlyChecklist", required = true) - @NotEmpty(message = "环保随车清单x不能为空") - private String ecoFriendlyChecklist; - @ApiModelProperty(value = "出厂合格证x", name = "factoryCertificate", required = true) - @NotEmpty(message = "出厂合格证x不能为空") - private String factoryCertificate; - @ApiModelProperty(value = "环保信息截图x", name = "environmentalScreenshots", required = true) - @NotEmpty(message = "环保信息截图x不能为空") - private String environmentalScreenshots; @ApiModelProperty(value = "所属车队ID", name = "motorcadeId", required = true) @NotEmpty(message = "所属车队ID不能为空") private Long motorcadeId; - @ApiModelProperty(value = "是否危化车辆(0：否，1：是)", name = "isDangerousCar", required = true) + @ApiModelProperty(value = "是否危化车辆(0：否，1：是)", name = "isDangerous", required = true) @NotEmpty(message = "是否危化车辆(0：否，1：是)不能为空") - private Integer isDangerousCar; - @ApiModelProperty(value = "是否审核(0：未审核 1：交警支队审核通过 2：分公司审核通过 3：审核驳回)", name = "isAudit", required = true) - @NotEmpty(message = "是否审核(0：未审核 1：交警支队审核通过 2：分公司审核通过 3：审核驳回)不能为空") - private Integer isAudit; + private Integer isDangerous; @ApiModelProperty(value = "通行港区(0-全部 1-东港区 2-西港区)", name = "portId", required = true) @NotEmpty(message = "通行港区(0-全部 1-东港区 2-西港区)不能为空") private Integer portId; + @ApiModelProperty(value = "是否审核(0：未审核 1:审核中;2审核通过; 3：审核驳回)", name = "isAudit", required = true) + @NotEmpty(message = "是否审核(0：未审核 1:审核中;2审核通过; 3：审核驳回)不能为空") + private Integer isAudit; @ApiModelProperty(value = "进出港权限(1:有 2：无)", name = "mkmjPermission", required = true) @NotEmpty(message = "进出港权限(1:有 2：无)不能为空") - private String mkmjPermission; - @ApiModelProperty(value = "车辆责任人id", name = "userId", required = true) - @NotEmpty(message = "车辆责任人id不能为空") - private Long userId; - @ApiModelProperty(value = "车辆责任人姓名", name = "userName", required = true) - @NotEmpty(message = "车辆责任人姓名不能为空") - private String userName; + private Integer mkmjPermission; + @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true) + @NotEmpty(message = "访问起始时间不能为空") + private Date visitStartTime; + @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true) + @NotEmpty(message = "访问结束时间不能为空") + private Date visitEndTime; @ApiModelProperty(value = "车辆所属部门id", name = "vehicleDepartmentId", required = true) @NotEmpty(message = "车辆所属部门id不能为空") private Long vehicleDepartmentId; @@ -87,23 +73,16 @@ public class VehicleMessageAddCmd extends Command { @ApiModelProperty(value = "车辆所属人姓名(员工车辆)", name = "employeeVehicleUserName", required = true) @NotEmpty(message = "车辆所属人姓名(员工车辆)不能为空") private String employeeVehicleUserName; - @ApiModelProperty(value = "企业ID(~~~~~~)", name = "corpinfoId", required = true) - @NotEmpty(message = "企业ID(~~~~~~)不能为空") - private Long corpinfoId; - @ApiModelProperty(value = "排放标准:level1 -> 国一level2 -> 国二level3 -> 国三level4 -> 国四level5 -> 国五level6 -> 国六", name = "emissionStandards", required = true) - @NotEmpty(message = "排放标准:level1 -> 国一level2 -> 国二level3 -> 国三level4 -> 国四level5 -> 国五level6 -> 国六不能为空") + @ApiModelProperty(value = "企业ID", name = "corpId", required = true) + @NotEmpty(message = "企业ID不能为空") + private Long corpId; + @ApiModelProperty(value = "排放标准:", name = " emissionStandards", required = true) + @NotEmpty(message = "排放标准:") private String emissionStandards; - @ApiModelProperty(value = "联系人姓名", name = "contact", required = true) - @NotEmpty(message = "联系人姓名不能为空") - private String contact; - @ApiModelProperty(value = "联系人电话", name = "phone", required = true) - @NotEmpty(message = "联系人电话不能为空") - private String phone; - @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true) - @NotEmpty(message = "访问起始时间不能为空") - private String visitStartTime; - @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true) - @NotEmpty(message = "访问结束时间不能为空") - private String visitEndTime; + @ApiModelProperty(value = "附件地址", name = "attachmentUrl", required = true) + @NotEmpty(message = "附件地址不能为空") + private String attachmentUrl; + } + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageForCorpAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageForCorpAddCmd.java new file mode 100644 index 0000000..06addd8 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageForCorpAddCmd.java @@ -0,0 +1,77 @@ +package com.zcloud.primeport.dto; + + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; + +/** + * web-client + * + * @Author guoyuepeng + * @Date 2025-11-15 11:41:21 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class VehicleMessageForCorpAddCmd extends Command { + + @ApiModelProperty(value = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌", name = "licenceType", required = true) + @NotEmpty(message = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌不能为空") + private Integer licenceType; + + @ApiModelProperty(value = "车牌号", name = "licenceNo", required = true) + @NotEmpty(message = "车牌号不能为空") + private String licenceNo; + + @ApiModelProperty(value = "车辆类型", name = "vehicleType", required = true) + @NotEmpty(message = "车辆类型") + private String vehicleType; + + @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆", name = "vehicleBelongType", required = true) + @NotEmpty(message = "车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆不能为空") + private Integer vehicleBelongType; + + @ApiModelProperty(value = "通行港区(0-全部 1-东港区 2-西港区)", name = "portId", required = true) + @NotEmpty(message = "通行港区(0-全部 1-东港区 2-西港区)不能为空") + private Integer portId; + + @ApiModelProperty(value = "车辆所属部门id", name = "vehicleDepartmentId", required = true) + @NotEmpty(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(员工车辆)不能为空") + private Long employeeVehicleUserId; + @ApiModelProperty(value = "车辆所属人姓名(员工车辆)", name = "employeeVehicleUserName", required = true) +// @NotEmpty(message = "车辆所属人姓名(员工车辆)不能为空") + private String employeeVehicleUserName; + @ApiModelProperty(value = "企业ID", name = "corpinfoId", required = true) +// @NotEmpty(message = "企业ID不能为空") + private Long corpId; + @ApiModelProperty(value = "附件地址", name = "attachmentUrl", required = true) + private String attachmentUrl; + + @ApiModelProperty(value = "审核人ID", name = "approvalUserId") + public Long approvalUserId; + + @ApiModelProperty(value = "审核人名字", name = "approvalUserName") + public Long approvalUserName; + + @ApiModelProperty(value = "审核人部门ID", name = "approvalDeptId") + public Long approvalDeptId; + + @ApiModelProperty(value = "审核人部门名字", name = "approvalDeptName") + public Long approvalDeptName; + + +} + 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 6f4714b..0afd99d 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 @@ -22,6 +22,9 @@ public class VehicleMessageUpdateCmd extends Command { @ApiModelProperty(value = "id", name = "id", required = true) @NotEmpty(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-黑牌不能为空") private Integer licenceType; 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 3389b55..ddade0d 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 @@ -16,57 +18,42 @@ public class VehicleMessageCO extends ClientObject { //id @ApiModelProperty(value = "id") private Long id; + //业务id + @ApiModelProperty(value = "业务id") + private String vehicleMessageId; //车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌 @ApiModelProperty(value = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌") private Integer licenceType; //车牌号 @ApiModelProperty(value = "车牌号") private String licenceNo; - //车辆类型 0-货车 1- 轿车 2-大巴客车 - @ApiModelProperty(value = "车辆类型 0-货车 1- 轿车 2-大巴客车") + //车辆类型 + @ApiModelProperty(value = "车辆类型") private String vehicleType; - //车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆 - @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆") + //车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆 + @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆") private Integer vehicleBelongType; - //车辆来源(0,1,2 平台新建,3.对接车辆) - @ApiModelProperty(value = "车辆来源(0,1,2 平台新建,3.对接车辆)") - private Integer carFrom; - //驾驶证x - @ApiModelProperty(value = "驾驶证x") - private String drivingLicense; - //绿本x - @ApiModelProperty(value = "绿本x") - private String greenBook; - //环保随车清单x - @ApiModelProperty(value = "环保随车清单x") - private String ecoFriendlyChecklist; - //出厂合格证x - @ApiModelProperty(value = "出厂合格证x") - private String factoryCertificate; - //环保信息截图x - @ApiModelProperty(value = "环保信息截图x") - private String environmentalScreenshots; //所属车队ID @ApiModelProperty(value = "所属车队ID") private Long motorcadeId; //是否危化车辆(0：否，1：是) @ApiModelProperty(value = "是否危化车辆(0：否，1：是)") - private Integer isDangerousCar; - //是否审核(0：未审核 1：交警支队审核通过 2：分公司审核通过 3：审核驳回) - @ApiModelProperty(value = "是否审核(0：未审核 1：交警支队审核通过 2：分公司审核通过 3：审核驳回)") - private Integer isAudit; + private Integer isDangerous; //通行港区(0-全部 1-东港区 2-西港区) @ApiModelProperty(value = "通行港区(0-全部 1-东港区 2-西港区)") private Integer portId; + //是否审核(0：未审核 1:审核中;2审核通过; 3：审核驳回) + @ApiModelProperty(value = "是否审核(0：未审核 1:审核中;2审核通过; 3：审核驳回)") + private Integer isAudit; //进出港权限(1:有 2：无) @ApiModelProperty(value = "进出港权限(1:有 2：无)") - private String mkmjPermission; - //车辆责任人id - @ApiModelProperty(value = "车辆责任人id") - private Long userId; - //车辆责任人姓名 - @ApiModelProperty(value = "车辆责任人姓名") - private String userName; + private Integer mkmjPermission; + //访问起始时间 + @ApiModelProperty(value = "访问起始时间") + private Date visitStartTime; + //访问结束时间 + @ApiModelProperty(value = "访问结束时间") + private Date visitEndTime; //车辆所属部门id @ApiModelProperty(value = "车辆所属部门id") private Long vehicleDepartmentId; @@ -79,23 +66,15 @@ public class VehicleMessageCO extends ClientObject { //车辆所属人姓名(员工车辆) @ApiModelProperty(value = "车辆所属人姓名(员工车辆)") private String employeeVehicleUserName; - //企业ID(~~~~~~) - @ApiModelProperty(value = "企业ID(~~~~~~)") - private Long corpinfoId; - //排放标准:level1 -> 国一level2 -> 国二level3 -> 国三level4 -> 国四level5 -> 国五level6 -> 国六 - @ApiModelProperty(value = "排放标准:level1 -> 国一level2 -> 国二level3 -> 国三level4 -> 国四level5 -> 国五level6 -> 国六") + //企业ID + @ApiModelProperty(value = "企业ID") + private Long corpId; + //排放标准: + @ApiModelProperty(value = "排放标准:") private String emissionStandards; - //联系人姓名 - @ApiModelProperty(value = "联系人姓名") - private String contact; - //联系人电话 - @ApiModelProperty(value = "联系人电话") - private String phone; - //访问起始时间 - @ApiModelProperty(value = "访问起始时间") - private String visitStartTime; - //访问结束时间 - @ApiModelProperty(value = "访问结束时间") - private String visitEndTime; + //附件地址 + @ApiModelProperty(value = "附件地址") + private String attachmentUrl; + } diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleMessageE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleMessageE.java index a167760..027cd11 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleMessageE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleMessageE.java @@ -2,8 +2,13 @@ package com.zcloud.primeport.domain.model; import com.jjb.saas.framework.domain.model.BaseE; +import com.zcloud.gbscommon.utils.DateUtil; +import com.zcloud.gbscommon.utils.Tools; import lombok.Data; +import javax.tools.Tool; +import java.util.Date; + @Data /** @@ -15,40 +20,30 @@ import lombok.Data; public class VehicleMessageE extends BaseE { //id private Long id; + //业务id + private String vehicleMessageId; //车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌 private Integer licenceType; //车牌号 private String licenceNo; - //车辆类型 0-货车 1- 轿车 2-大巴客车 + //车辆类型 private String vehicleType; - //车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆 + //车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆 private Integer vehicleBelongType; - //车辆来源(0,1,2 平台新建,3.对接车辆) - private Integer carFrom; - //驾驶证x - private String drivingLicense; - //绿本x - private String greenBook; - //环保随车清单x - private String ecoFriendlyChecklist; - //出厂合格证x - private String factoryCertificate; - //环保信息截图x - private String environmentalScreenshots; //所属车队ID private Long motorcadeId; //是否危化车辆(0：否，1：是) - private Integer isDangerousCar; - //是否审核(0：未审核 1：交警支队审核通过 2：分公司审核通过 3：审核驳回) - private Integer isAudit; + private Integer isDangerous; //通行港区(0-全部 1-东港区 2-西港区) private Integer portId; + //是否审核(0：未审核 1:审核中;2审核通过; 3：审核驳回) + private Integer isAudit; //进出港权限(1:有 2：无) - private String mkmjPermission; - //车辆责任人id - private Long userId; - //车辆责任人姓名 - private String userName; + private Integer mkmjPermission; + //访问起始时间 + private Date visitStartTime; + //访问结束时间 + private Date visitEndTime; //车辆所属部门id private Long vehicleDepartmentId; //车辆所属部门名称 @@ -57,17 +52,28 @@ public class VehicleMessageE extends BaseE { private Long employeeVehicleUserId; //车辆所属人姓名(员工车辆) private String employeeVehicleUserName; - //企业ID(~~~~~~) - private Long corpinfoId; - //排放标准:level1 -> 国一level2 -> 国二level3 -> 国三level4 -> 国四level5 -> 国五level6 -> 国六 + //企业ID + private Long corpId; + //排放标准: private String emissionStandards; - //联系人姓名 - private String contact; - //联系人电话 - private String phone; - //访问起始时间 - private String visitStartTime; - //访问结束时间 - private String visitEndTime; + //附件地址 + private String attachmentUrl; + + /** + * 添加车辆信息 给监管端和企业端 + * @param e + * @return + */ + public VehicleMessageE VehicleMessageForCorpE( VehicleMessageE e) { + this.isAudit = 0;//未审核 + this.isDangerous = 0; //是否危化车辆(0：否，1：是) + this.mkmjPermission = 2;//进出港权限(1:有 2：无) + this.visitStartTime = DateUtil.fomatDate(String.valueOf(new Date())); + this.visitEndTime = DateUtil.fomatDate(DateUtil.getCurrYearLast()); + return e; + } + + + } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleMessageGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleMessageGatewayImpl.java index 2cf3b4a..754cb91 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleMessageGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleMessageGatewayImpl.java @@ -39,7 +39,11 @@ public class VehicleMessageGatewayImpl implements VehicleMessageGateway { @Override public Boolean deletedVehicleMessageById(Long id) { - return vehicleMessageRepository.removeById(id); + VehicleMessageDO d = new VehicleMessageDO(); + d.setId( id); + d.setDeleteEnum("TRUE"); + vehicleMessageRepository.updateById(d); + return true; } @Override diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleMessageDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleMessageDO.java index 7ba187a..f2f2334 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleMessageDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleMessageDO.java @@ -8,6 +8,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Date; + /** * web-infrastructure * @@ -22,57 +24,42 @@ public class VehicleMessageDO extends BaseDO { @ApiModelProperty(value = "id") @TableId(type = IdType.ASSIGN_ID) private Long id; + //业务id + @ApiModelProperty(value = "业务id") + private String vehicleMessageId; //车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌 @ApiModelProperty(value = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌") private Integer licenceType; //车牌号 @ApiModelProperty(value = "车牌号") private String licenceNo; - //车辆类型 0-货车 1- 轿车 2-大巴客车 - @ApiModelProperty(value = "车辆类型 0-货车 1- 轿车 2-大巴客车") + //车辆类型 + @ApiModelProperty(value = "车辆类型") private String vehicleType; - //车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆 - @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆") + //车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆 + @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆") private Integer vehicleBelongType; - //车辆来源(0,1,2 平台新建,3.对接车辆) - @ApiModelProperty(value = "车辆来源(0,1,2 平台新建,3.对接车辆)") - private Integer carFrom; - //驾驶证x - @ApiModelProperty(value = "驾驶证x") - private String drivingLicense; - //绿本x - @ApiModelProperty(value = "绿本x") - private String greenBook; - //环保随车清单x - @ApiModelProperty(value = "环保随车清单x") - private String ecoFriendlyChecklist; - //出厂合格证x - @ApiModelProperty(value = "出厂合格证x") - private String factoryCertificate; - //环保信息截图x - @ApiModelProperty(value = "环保信息截图x") - private String environmentalScreenshots; //所属车队ID @ApiModelProperty(value = "所属车队ID") private Long motorcadeId; //是否危化车辆(0：否，1：是) @ApiModelProperty(value = "是否危化车辆(0：否，1：是)") - private Integer isDangerousCar; - //是否审核(0：未审核 1：交警支队审核通过 2：分公司审核通过 3：审核驳回) - @ApiModelProperty(value = "是否审核(0：未审核 1：交警支队审核通过 2：分公司审核通过 3：审核驳回)") - private Integer isAudit; + private Integer isDangerous; //通行港区(0-全部 1-东港区 2-西港区) @ApiModelProperty(value = "通行港区(0-全部 1-东港区 2-西港区)") private Integer portId; + //是否审核(0：未审核 1:审核中;2审核通过; 3：审核驳回) + @ApiModelProperty(value = "是否审核(0：未审核 1:审核中;2审核通过; 3：审核驳回)") + private Integer isAudit; //进出港权限(1:有 2：无) @ApiModelProperty(value = "进出港权限(1:有 2：无)") - private String mkmjPermission; - //车辆责任人id - @ApiModelProperty(value = "车辆责任人id") - private Long userId; - //车辆责任人姓名 - @ApiModelProperty(value = "车辆责任人姓名") - private String userName; + private Integer mkmjPermission; + //访问起始时间 + @ApiModelProperty(value = "访问起始时间") + private Date visitStartTime; + //访问结束时间 + @ApiModelProperty(value = "访问结束时间") + private Date visitEndTime; //车辆所属部门id @ApiModelProperty(value = "车辆所属部门id") private Long vehicleDepartmentId; @@ -85,24 +72,18 @@ public class VehicleMessageDO extends BaseDO { //车辆所属人姓名(员工车辆) @ApiModelProperty(value = "车辆所属人姓名(员工车辆)") private String employeeVehicleUserName; - //企业ID(~~~~~~) - @ApiModelProperty(value = "企业ID(~~~~~~)") - private Long corpinfoId; - //排放标准:level1 -> 国一level2 -> 国二level3 -> 国三level4 -> 国四level5 -> 国五level6 -> 国六 - @ApiModelProperty(value = "排放标准:level1 -> 国一level2 -> 国二level3 -> 国三level4 -> 国四level5 -> 国五level6 -> 国六") + //企业ID + @ApiModelProperty(value = "企业ID") + private Long corpId; + //排放标准: + @ApiModelProperty(value = "排放标准:") private String emissionStandards; - //联系人姓名 - @ApiModelProperty(value = "联系人姓名") - private String contact; - //联系人电话 - @ApiModelProperty(value = "联系人电话") - private String phone; - //访问起始时间 - @ApiModelProperty(value = "访问起始时间") - private String visitStartTime; - //访问结束时间 - @ApiModelProperty(value = "访问结束时间") - private String visitEndTime; + //附件地址 + @ApiModelProperty(value = "附件地址") + private String attachmentUrl; + //删除标识 + @ApiModelProperty(value = "删除标识") + private String deleteEnum; }