From 30403abd28ffe65835af5387b1bcd3afae7fff6a Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Thu, 20 Nov 2025 16:30:59 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8F=A3=E9=97=A8=E9=97=A8=E7=A6=81-?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=83=A8=E9=97=A8=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?-=E6=96=B0=E5=A2=9E=E9=83=A8=E9=97=A8=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/InspectionDeptController.java | 12 ------ .../command/InspectionDeptAddExe.java | 23 +++++++++- .../primeport/dto/InspectionDeptAddCmd.java | 5 +++ .../dto/VehicleInspectionAddCmd.java | 42 +++++++++++++++++++ .../domain/gateway/InspectionDeptGateway.java | 2 +- .../domain/model/InspectionVehicleE.java | 7 ++++ .../domain/model/VehicleMessageE.java | 11 ++++- .../InspectionDeptGatewayImpl.java | 5 ++- 8 files changed, 89 insertions(+), 18 deletions(-) create mode 100644 web-client/src/main/java/com/zcloud/primeport/dto/VehicleInspectionAddCmd.java diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/InspectionDeptController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/InspectionDeptController.java index 33266db..8ae83b9 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/InspectionDeptController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/InspectionDeptController.java @@ -45,11 +45,6 @@ public class InspectionDeptController { return inspectionDeptService.listPage(qry); } - @ApiOperation("所有数据") - @GetMapping("/listAll") - public MultiResponse listAll() { - return MultiResponse.of(new ArrayList()); - } @ApiOperation("详情") @GetMapping("/{id}") @@ -64,13 +59,6 @@ public class InspectionDeptController { return SingleResponse.buildSuccess(); } - @ApiOperation("删除多个") - @DeleteMapping("/ids") - public Response removeBatch(@RequestParam Long[] ids) { - inspectionDeptService.removeBatch(ids); - return SingleResponse.buildSuccess(); - } - @ApiOperation("修改") @PutMapping("/edit") public SingleResponse edit(@Validated @RequestBody InspectionDeptUpdateCmd inspectionDeptUpdateCmd) { diff --git a/web-app/src/main/java/com/zcloud/primeport/command/InspectionDeptAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/InspectionDeptAddExe.java index 112ada1..8fc9722 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/InspectionDeptAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/InspectionDeptAddExe.java @@ -2,8 +2,13 @@ package com.zcloud.primeport.command; import com.alibaba.cola.exception.BizException; import com.zcloud.primeport.domain.gateway.InspectionDeptGateway; +import com.zcloud.primeport.domain.gateway.InspectionVehicleGateway; +import com.zcloud.primeport.domain.gateway.VehicleMessageGateway; import com.zcloud.primeport.domain.model.InspectionDeptE; +import com.zcloud.primeport.domain.model.InspectionVehicleE; +import com.zcloud.primeport.domain.model.VehicleMessageE; import com.zcloud.primeport.dto.InspectionDeptAddCmd; +import com.zcloud.primeport.dto.VehicleInspectionAddCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -20,14 +25,28 @@ import org.springframework.transaction.annotation.Transactional; @AllArgsConstructor public class InspectionDeptAddExe { private final InspectionDeptGateway inspectionDeptGateway; - + private final InspectionVehicleGateway inspectionVehicleGateway; + private final VehicleMessageGateway vehicleMessageGateway; @Transactional(rollbackFor = Exception.class) public boolean execute(InspectionDeptAddCmd cmd) { InspectionDeptE examTypeE = new InspectionDeptE(); BeanUtils.copyProperties(cmd, examTypeE); boolean res = false; try { - res = inspectionDeptGateway.add(examTypeE); + InspectionDeptE insDeptAdd = inspectionDeptGateway.add(examTypeE); + /** + * 1.增加车辆 + * 2.增加车辆和部门的关系 + */ + for (VehicleInspectionAddCmd vehicleInspectionAddCmd : cmd.getVehicleMessageAddCmd()) { + VehicleMessageE vehicleMessageE = new VehicleMessageE(); + BeanUtils.copyProperties(vehicleInspectionAddCmd, vehicleMessageE); + vehicleMessageE.VehicleMessageForInspection(vehicleMessageE); + VehicleMessageE vehicleAdd = vehicleMessageGateway.add(vehicleMessageE);// 添加车辆信息 + InspectionVehicleE inspectionVehicleE = new InspectionVehicleE(); + inspectionVehicleE.addDeptInspection(insDeptAdd.getId(),vehicleAdd.getId()); //车辆和部门之间的关系 + res = inspectionVehicleGateway.add(inspectionVehicleE); + } } catch (Exception e) { throw new RuntimeException(e); } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionDeptAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/InspectionDeptAddCmd.java index 2025f76..553df5e 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/InspectionDeptAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/InspectionDeptAddCmd.java @@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.validation.constraints.NotEmpty; +import java.util.List; /** * web-client @@ -21,11 +22,15 @@ import javax.validation.constraints.NotEmpty; @NoArgsConstructor @AllArgsConstructor public class InspectionDeptAddCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) @NotEmpty(message = "主键不能为空") private Long id; @ApiModelProperty(value = "名称", name = "name", required = true) @NotEmpty(message = "名称不能为空") private String name; + @ApiModelProperty(value = "单位车辆信息部门为空", name = "VehicleMessageAddCmd", required = true) + @NotEmpty(message = "单位车辆信息部门为空") + List VehicleMessageAddCmd; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleInspectionAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleInspectionAddCmd.java new file mode 100644 index 0000000..1bf423d --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleInspectionAddCmd.java @@ -0,0 +1,42 @@ +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; +import java.util.Date; + +/** + * web-client + * + * @Author guoyuepeng + * @Date 2025-11-15 11:41:21 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class VehicleInspectionAddCmd 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 = "访问起始时间", name = "visitStartTime", required = true) + @NotEmpty(message = "访问起始时间不能为空") + private Date visitStartTime; + @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true) + @NotEmpty(message = "访问结束时间不能为空") + private Date visitEndTime; +} + + diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/InspectionDeptGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/InspectionDeptGateway.java index 7cd0bcd..bcba9ae 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/InspectionDeptGateway.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/InspectionDeptGateway.java @@ -13,7 +13,7 @@ public interface InspectionDeptGateway { /** * 新增 */ - Boolean add(InspectionDeptE inspectionDeptE); + InspectionDeptE add(InspectionDeptE inspectionDeptE); /** * 修改 diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/InspectionVehicleE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/InspectionVehicleE.java index a059429..5c63f18 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/InspectionVehicleE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/InspectionVehicleE.java @@ -21,5 +21,12 @@ public class InspectionVehicleE extends BaseE { //车辆id private Long vehicleMessageId; + + public void addDeptInspection(Long inspectionDeptId, Long vehicleMessageId) { + this.inspectionDeptId = inspectionDeptId; + this.vehicleMessageId = vehicleMessageId; + + } + } 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 c722021..c83e962 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 @@ -29,7 +29,7 @@ public class VehicleMessageE extends BaseE { private String licenceNo; //车辆类型 private String vehicleType; - //车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆 + //车辆所属类型 0-员工车辆 1- 单位车辆 2-相关方车辆3：货运车辆,4:临时车辆 5 检查车 private Integer vehicleBelongType; //所属车队ID private Long motorcadeId; @@ -77,5 +77,14 @@ public class VehicleMessageE extends BaseE { this.isAudit = 0;//未审核 return e; } + + + public void VehicleMessageForInspection( VehicleMessageE e) { + this.vehicleBelongType = 5;//未审核 + this.isDangerous = 0; + this.portId = 0; + this.isAudit = 2 ; + this.mkmjPermission = 2; + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/InspectionDeptGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/InspectionDeptGatewayImpl.java index b5291e1..2435131 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/InspectionDeptGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/InspectionDeptGatewayImpl.java @@ -22,11 +22,12 @@ public class InspectionDeptGatewayImpl implements InspectionDeptGateway { private final InspectionDeptRepository inspectionDeptRepository; @Override - public Boolean add(InspectionDeptE inspectionDeptE) { + public InspectionDeptE add(InspectionDeptE inspectionDeptE) { InspectionDeptDO d = new InspectionDeptDO(); BeanUtils.copyProperties(inspectionDeptE, d); inspectionDeptRepository.save(d); - return true; + BeanUtils.copyProperties(d, inspectionDeptE); + return inspectionDeptE; } @Override