From bc3016fe0a20d4a96d3107e841eb1e8a2a086ed7 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Wed, 11 Mar 2026 16:14:25 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E8=BD=A6=E8=BE=86=E6=8B=89?= =?UTF-8?q?=E9=BB=91=E4=B8=8E=E8=BF=9D=E8=A7=84=E7=99=BB=E8=AE=B0=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../primeport/web/VehicleApplyController.java | 12 ++++++++++++ .../service/VehicleApplyServiceImpl.java | 15 +++++++++++++++ .../primeport/api/VehicleApplyServiceI.java | 2 ++ .../primeport/dto/VehicleApplyAddCmd.java | 6 +++--- .../primeport/dto/VehicleAuditPageQry.java | 18 +++++++++--------- .../primeport/dto/VehicleBlackPageQry.java | 8 ++++---- 6 files changed, 45 insertions(+), 16 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java index d78e6ef..55c8ecd 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java @@ -22,6 +22,8 @@ import org.springframework.web.bind.annotation.*; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; /** * web-adapter @@ -73,5 +75,15 @@ public class VehicleApplyController { vehicleApplyService.edit(vehicleApplyUpdateCmd); return SingleResponse.buildSuccess(); } + + @ApiOperation("车牌号唯一性校验") + @GetMapping("/check-licence-no") + public SingleResponse> checkLicenceNo(@RequestParam String licenceNo, + @RequestParam(required = false) Long id) { + Boolean available = vehicleApplyService.checkLicenceNo(licenceNo, id); + Map result = new HashMap<>(); + result.put("available", available); + return SingleResponse.of(result); + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java index e014e1a..668b5c9 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java @@ -2,6 +2,7 @@ package com.zcloud.primeport.service; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zcloud.primeport.api.VehicleApplyServiceI; import com.zcloud.primeport.command.VehicleApplyAddExe; import com.zcloud.primeport.command.VehicleApplyRemoveExe; @@ -11,6 +12,8 @@ import com.zcloud.primeport.dto.VehicleApplyAddCmd; import com.zcloud.primeport.dto.VehicleApplyPageQry; import com.zcloud.primeport.dto.VehicleApplyUpdateCmd; import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; +import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; +import com.zcloud.primeport.persistence.repository.VehicleApplyRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -27,6 +30,7 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI { private final VehicleApplyUpdateExe vehicleApplyUpdateExe; private final VehicleApplyRemoveExe vehicleApplyRemoveExe; private final VehicleApplyQueryExe vehicleApplyQueryExe; + private final VehicleApplyRepository vehicleApplyRepository; @Override public PageResponse listPage(VehicleApplyPageQry qry) { @@ -60,5 +64,16 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI { public VehicleApplyCO getInfoById(Long id) { return vehicleApplyQueryExe.getInfoById(id); } + + @Override + public Boolean checkLicenceNo(String licenceNo, Long id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("licence_no", licenceNo); + queryWrapper.eq("delete_enum", "false"); + if (id != null) { + queryWrapper.ne("id", id); + } + return vehicleApplyRepository.count(queryWrapper) == 0; + } } diff --git a/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java index 93e7ace..f135011 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java @@ -25,5 +25,7 @@ public interface VehicleApplyServiceI { void removeBatch(Long[] ids); VehicleApplyCO getInfoById(Long id); + + Boolean checkLicenceNo(String licenceNo, Long id); } 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 500b03c..6a5a6b2 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 @@ -75,11 +75,11 @@ public class VehicleApplyAddCmd extends Command { private String projectName; @ApiModelProperty(value = "1被拉黑2未拉黑", name = "blockedFlag", required = true) private Integer blockedFlag; - @ApiModelProperty(value = "mkmjId", name = "口门id") + @ApiModelProperty(value = "口门id", name = "mkmjId") private Long mkmjId; - @ApiModelProperty(value = "lsUserPhone", name = "临时申请驾驶人手机号") + @ApiModelProperty(value = "临时申请驾驶人手机号", name = "lsUserPhone") private String lsUserPhone; - @ApiModelProperty(value = "lsUserIdcard", name = "临时申请驾驶人身份证") + @ApiModelProperty(value = "临时申请驾驶人身份证", name = "lsUserIdcard") private String lsUserIdcard; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditPageQry.java index 7bf1568..aa35387 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditPageQry.java @@ -26,23 +26,23 @@ public class VehicleAuditPageQry extends PageQuery { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - private Long vehicleApplyId; - @ApiModelProperty(value = "employeeVehicleUserName ", name = "车辆归属人") + + @ApiModelProperty(name = "employeeVehicleUserName ", value = "车辆归属人") private String employeeVehicleUserName; - @ApiModelProperty(value = "licenceNo ", name = "车牌号") + @ApiModelProperty(name = "licenceNo ", value = "车牌号") private String licenceNo; - @ApiModelProperty(value = "visitStartTime ", name = "访问起始时间") + @ApiModelProperty(name = "visitStartTime ", value = "访问起始时间") private String visitStartTime; - @ApiModelProperty(value = "visitEndTime", name = "访问结束时间") + @ApiModelProperty(name = "visitEndTime", value = "访问结束时间") private String visitEndTime; - @ApiModelProperty(value = "vehicleDepartmentId ", name = "车辆归属部门") + @ApiModelProperty(name = "vehicleDepartmentId ", value = "车辆归属部门") private Long vehicleDepartmentId; - @ApiModelProperty(value = "gateLevelAuthAreaId", name = "授权范围港区与区域") + @ApiModelProperty(name = "gateLevelAuthAreaId", value = "授权范围港区与区域") private String gateLevelAuthAreaId; - @ApiModelProperty(value = "vehicleBelongTypeArr", name = "车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆") + @ApiModelProperty(value = "车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆", name = "vehicleBelongTypeArr") private String vehicleBelongTypeArr; - @ApiModelProperty(value = "vehicleBelongType", name = "车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆") + @ApiModelProperty(name = "vehicleBelongType", value = "车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆") private String vehicleBelongType; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackPageQry.java index 1334bdf..50e6d4e 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackPageQry.java @@ -24,13 +24,13 @@ public class VehicleBlackPageQry extends PageQuery { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - @ApiModelProperty(value = "车牌号", name = "licenceNo") + @ApiModelProperty(name = "licenceNo", value = "车牌号") private String licenceNo; - @ApiModelProperty(value = "employeeVehicleUserName", name = "车辆归属人") + @ApiModelProperty(name = "employeeVehicleUserName", value = "车辆归属人") private String employeeVehicleUserName; - @ApiModelProperty(value = "vehicleDepartmentId", name = "车辆归属部门") + @ApiModelProperty(name = "vehicleDepartmentId", value = "车辆归属部门") private Long vehicleDepartmentId; - @ApiModelProperty(value = "vehicleType", name = "车辆类型") + @ApiModelProperty(name = "vehicleType", value = "车辆类型") private String vehicleType; }