From c1c9b193021502cbfee1c7c4126daa9d8262bb53 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Mon, 16 Mar 2026 11:16:04 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=B8=AA=E4=BA=BA=E8=BD=A6?= =?UTF-8?q?=E8=BE=86=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/primeport/command/VehicleApplyRemoveExe.java | 3 +++ .../com/zcloud/primeport/dto/VehicleApplyUpdateCmd.java | 2 +- .../primeport/domain/gateway/VehicleAuditGateway.java | 2 ++ .../primeport/gatewayimpl/VehicleApplyGatewayImpl.java | 1 + .../primeport/gatewayimpl/VehicleAuditGatewayImpl.java | 8 ++++++++ .../src/main/resources/mapper/VehicleApplyDO.xml | 4 ++-- 6 files changed, 17 insertions(+), 3 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyRemoveExe.java index b133d7e..d219c1c 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyRemoveExe.java @@ -2,6 +2,7 @@ package com.zcloud.primeport.command; import com.alibaba.cola.exception.BizException; import com.zcloud.primeport.domain.gateway.VehicleApplyGateway; +import com.zcloud.primeport.domain.gateway.VehicleAuditGateway; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -17,10 +18,12 @@ import org.springframework.transaction.annotation.Transactional; @AllArgsConstructor public class VehicleApplyRemoveExe { private final VehicleApplyGateway vehicleApplyGateway; + private final VehicleAuditGateway vehicleAuditGateway; @Transactional(rollbackFor = Exception.class) public boolean execute(Long id) { boolean res = vehicleApplyGateway.deletedVehicleApplyById(id); + vehicleAuditGateway.deletedVehicleAuditByApplyId(id); if (!res) { throw new BizException("删除失败"); } 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 ecfba05..a04b035 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 @@ -39,7 +39,7 @@ public class VehicleApplyUpdateCmd extends Command { private String vehicleTypeName; @ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea", required = true) @NotEmpty(message = "授权范围港区与区域不能为空") - private Object gateLevelAuthArea; + private String gateLevelAuthArea; @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true) @NotNull(message = "访问起始时间不能为空") private String visitStartTime; diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleAuditGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleAuditGateway.java index b535051..a31daa0 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleAuditGateway.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleAuditGateway.java @@ -26,5 +26,7 @@ public interface VehicleAuditGateway { Boolean deletedVehicleAuditById(Long id); Boolean deletedVehicleAuditByIds(Long[] id); + + void deletedVehicleAuditByApplyId(Long id); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleApplyGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleApplyGatewayImpl.java index dd55c5e..6baf43c 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleApplyGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleApplyGatewayImpl.java @@ -27,6 +27,7 @@ public class VehicleApplyGatewayImpl implements VehicleApplyGateway { VehicleApplyDO d = new VehicleApplyDO(); BeanUtils.copyProperties(vehicleApplyE, d); vehicleApplyRepository.save(d); + vehicleApplyE.setId(d.getId()); return true; } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleAuditGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleAuditGatewayImpl.java index 1a69ba6..015f334 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleAuditGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleAuditGatewayImpl.java @@ -1,5 +1,6 @@ package com.zcloud.primeport.gatewayimpl; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.zcloud.primeport.domain.gateway.VehicleAuditGateway; import com.zcloud.primeport.domain.model.VehicleAuditE; import com.zcloud.primeport.persistence.dataobject.VehicleAuditDO; @@ -46,5 +47,12 @@ public class VehicleAuditGatewayImpl implements VehicleAuditGateway { public Boolean deletedVehicleAuditByIds(Long[] ids) { return vehicleAuditRepository.removeByIds(Collections.singletonList(ids)); } + + @Override + public void deletedVehicleAuditByApplyId(Long id) { + UpdateWrapper objectUpdateWrapper = new UpdateWrapper<>(); + objectUpdateWrapper.eq("vehicle_apply_id",id); + vehicleAuditRepository.remove(objectUpdateWrapper); + } } diff --git a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml index 5a84231..b2e8acc 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml @@ -52,10 +52,10 @@ AND f.audit_flag = #{parmas.auditFlag} - + AND f.visit_start_time LIKE CONCAT('%', #{parmas.gateName}, '%') - + AND f.visit_end_time LIKE CONCAT('%', #{parmas.gateName}, '%')