From a12523db722cbaf8bb0a26afe914f0dfa5e610ca Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Thu, 16 Apr 2026 11:36:11 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=B8=80=E7=BA=A7=E5=8F=A3?= =?UTF-8?q?=E9=97=A8=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/templates/primeport.html | 4 +- .../command/VehicleAuditUpdateExe.java | 11 +-- .../primeport/command/VehicleBlackAddExe.java | 3 + .../command/VehicleBlackRemoveExe.java | 3 + .../primeport/dto/VehicleBlackAddCmd.java | 1 + .../dto/clientobject/VehicleBlackCO.java | 1 + .../dto/clientobject/VehicleDockLogCO.java | 4 + .../primeport/domain/model/VehicleBlackE.java | 1 + .../domain/model/VehicleDockLogE.java | 4 + .../dataobject/VehicleBlackDO.java | 2 +- .../dataobject/VehicleDockLogDO.java | 5 ++ .../primeport/plan/mjDevice/CarDockUtil.java | 24 +++++- .../plan/mjDevice/OneLevelCarUtil.java | 86 ++++++++++++++++--- .../mjDevice/dto/OneLevelCarBlackDto.java | 18 ++++ .../main/resources/mapper/VehicleApplyDO.xml | 2 +- 15 files changed, 145 insertions(+), 24 deletions(-) create mode 100644 web-infrastructure/src/main/java/com/zcloud/primeport/plan/mjDevice/dto/OneLevelCarBlackDto.java diff --git a/start/src/main/resources/templates/primeport.html b/start/src/main/resources/templates/primeport.html index e77e413..3d9b501 100644 --- a/start/src/main/resources/templates/primeport.html +++ b/start/src/main/resources/templates/primeport.html @@ -1,4 +1,4 @@ ---
\ No newline at end of file + })();
\ No newline at end of file diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java index 433e63e..06f5f8a 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java @@ -43,6 +43,7 @@ public class VehicleAuditUpdateExe { } } + @Transactional(rollbackFor = Exception.class) public void audit(VehicleAuditUpdateCmd cmd) { if (!(cmd.getAuditStatus().equals(2) || cmd.getAuditStatus().equals(3))) { throw new BizException("审批状态必须是通过或不通过"); @@ -60,19 +61,19 @@ public class VehicleAuditUpdateExe { vehicleApplyE.setStatusFlag(2); vehicleApplyGateway.update(vehicleApplyE); vehicleAuditGateway.update(vehicleAuditE); - TodoListCompleteEvent todoListCompleteEvent = new TodoListCompleteEvent(); - todoListCompleteEvent.setForeignSubsidiaryKey(vehicleAuditE.getId()); - todoListEventPusherUtil.sendMessageCompleteEvent(todoListCompleteEvent); // 审批通过 进行数据对接。 if (cmd.getAuditStatus().equals(2)) { VehicleApplyE vehicleApplyE1 = vehicleApplyGateway.getById(cmd.getVehicleApplyId()); - if (vehicleApplyE1.getVehicleBelongType().equals(VehicleBelongTypeEnum.TEMP_VEHICLES.getCode()) || vehicleApplyE1.getVehicleBelongType().equals(VehicleBelongTypeEnum.XGF_VEHICLES.getCode())) { + if (vehicleApplyE1.getVehicleBelongType().equals(VehicleBelongTypeEnum.TEMP_VEHICLES.getCode()) || + vehicleApplyE1.getVehicleBelongType().equals(VehicleBelongTypeEnum.XGF_VEHICLES.getCode())) { carDockUtil.execute(vehicleApplyE1.getLicenceNo()); } else { carDockUtil.executeInternalVehicle(vehicleApplyE1); } } - + TodoListCompleteEvent todoListCompleteEvent = new TodoListCompleteEvent(); + todoListCompleteEvent.setForeignSubsidiaryKey(vehicleAuditE.getId()); + todoListEventPusherUtil.sendMessageCompleteEvent(todoListCompleteEvent); } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleBlackAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleBlackAddExe.java index 8b2147a..51a7382 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleBlackAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleBlackAddExe.java @@ -6,6 +6,7 @@ import com.zcloud.primeport.domain.gateway.VehicleBlackGateway; import com.zcloud.primeport.domain.model.VehicleApplyE; import com.zcloud.primeport.domain.model.VehicleBlackE; import com.zcloud.primeport.dto.VehicleBlackAddCmd; +import com.zcloud.primeport.plan.mjDevice.CarDockUtil; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -23,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional; public class VehicleBlackAddExe { private final VehicleBlackGateway vehicleBlackGateway; private final VehicleApplyGateway vehicleApplyGateway; + private final CarDockUtil carDockUtil; @Transactional(rollbackFor = Exception.class) public boolean execute(VehicleBlackAddCmd cmd) { @@ -35,6 +37,7 @@ public class VehicleBlackAddExe { vehicleApplyE.setBlockedFlag(1); vehicleApplyE.setLicenceNo(cmd.getLicenceNo()); vehicleApplyGateway.updateBlackFlag(vehicleApplyE); + carDockUtil.executeBlackSave(examTypeE); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleBlackRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleBlackRemoveExe.java index b1f8be6..18a8d37 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleBlackRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleBlackRemoveExe.java @@ -5,6 +5,7 @@ import com.zcloud.primeport.domain.gateway.VehicleApplyGateway; import com.zcloud.primeport.domain.gateway.VehicleBlackGateway; import com.zcloud.primeport.domain.gateway.VehicleViolationsGateway; import com.zcloud.primeport.domain.model.VehicleBlackE; +import com.zcloud.primeport.plan.mjDevice.CarDockUtil; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -22,6 +23,7 @@ public class VehicleBlackRemoveExe { private final VehicleBlackGateway vehicleBlackGateway; private final VehicleApplyGateway vehicleApplyGateway; private final VehicleViolationsGateway vehicleViolationsGateway; + private final CarDockUtil carDockUtil; @Transactional(rollbackFor = Exception.class) public boolean execute(Long id) { @@ -30,6 +32,7 @@ public class VehicleBlackRemoveExe { // 把这个车牌的违规记录变成已处理. vehicleViolationsGateway.updateVehicleViolationsStatusByLicenceNo(infoById.getLicenceNo(), 1); vehicleApplyGateway.updateEvehicleBlockedByLicenceNo(infoById.getLicenceNo(),2); + carDockUtil.executeBlackRemove(infoById); if (!res) { throw new BizException("删除失败"); } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackAddCmd.java index 14119ac..9424226 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackAddCmd.java @@ -36,5 +36,6 @@ public class VehicleBlackAddCmd extends Command { private String vehicleTypeName; @ApiModelProperty(value = "备注", name = "remarks", required = true) private String remarks; + private String blockReason; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleBlackCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleBlackCO.java index 15db9f2..fcd04a5 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleBlackCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleBlackCO.java @@ -35,5 +35,6 @@ public class VehicleBlackCO extends ClientObject { //备注 @ApiModelProperty(value = "备注", name = "remarks") private String remarks; + private String blockReason; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleDockLogCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleDockLogCO.java index 76452a8..88b2653 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleDockLogCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleDockLogCO.java @@ -26,6 +26,10 @@ public class VehicleDockLogCO extends ClientObject { //车牌号 @ApiModelProperty(value = "车牌号") private String licenceNo; + private String licenceType; + private String licenceTypeName; + private String vehicleType; + private String vehicleTypeName; //申请人名称 @ApiModelProperty(value = "申请人名称") private String applyName; diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleBlackE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleBlackE.java index 0ba8922..047df48 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleBlackE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleBlackE.java @@ -24,5 +24,6 @@ public class VehicleBlackE extends BaseE { private String vehicleTypeName; private String licenceType; private String licenceTypeName; + private String blockReason; } diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleDockLogE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleDockLogE.java index 5bb8a3a..78e95e2 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleDockLogE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleDockLogE.java @@ -19,6 +19,10 @@ public class VehicleDockLogE extends BaseE { private String vehicleBelongType; //车牌号 private String licenceNo; + private String licenceType; + private String licenceTypeName; + private String vehicleType; + private String vehicleTypeName; //申请人名称 private String applyName; //申请时间 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 946beb2..e2ad952 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 @@ -34,7 +34,7 @@ public class VehicleBlackDO extends BaseDO { @ApiModelProperty(value = "车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆") @TableField(exist = false) private String vehicleBelongType; - + private String blockReason; @ApiModelProperty(value = "车辆所属企业ID") @TableField(exist = false) private Long vehicleCorpId; diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleDockLogDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleDockLogDO.java index 1f5463f..9068498 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleDockLogDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleDockLogDO.java @@ -21,12 +21,17 @@ public class VehicleDockLogDO extends BaseDO { //1一级口门，2二级口门 @ApiModelProperty(value = "1一级口门，2二级口门") private String level; + private String admissionBlackout; //车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆8，驻港单位员工车辆，9驻港单位公车 @ApiModelProperty(value = "车辆所属类型 1-股份员工车辆，2-股份单位车辆，3-分公司员工车辆，4-分公司单位车辆 ，5-相关方车辆， 6:临时车辆，7检查部门车辆8，驻港单位员工车辆，9驻港单位公车") private String vehicleBelongType; //车牌号 @ApiModelProperty(value = "车牌号") private String licenceNo; + private String licenceType; + private String licenceTypeName; + private String vehicleType; + private String vehicleTypeName; //申请人名称 @ApiModelProperty(value = "申请人名称") private String applyName; diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/plan/mjDevice/CarDockUtil.java b/web-infrastructure/src/main/java/com/zcloud/primeport/plan/mjDevice/CarDockUtil.java index c8f8da6..c94a071 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/plan/mjDevice/CarDockUtil.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/plan/mjDevice/CarDockUtil.java @@ -2,10 +2,13 @@ package com.zcloud.primeport.plan.mjDevice; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; +import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.gbscommon.utils.DateUtil; import com.zcloud.primeport.domain.model.VehicleApplyE; +import com.zcloud.primeport.domain.model.VehicleBlackE; import com.zcloud.primeport.persistence.repository.VehicleApplyRepository; import com.zcloud.primeport.plan.mjDevice.dto.CarEnum; +import com.zcloud.primeport.plan.mjDevice.dto.OneLevelCarBlackDto; import com.zcloud.primeport.plan.mjDevice.dto.OneLevelCarRemoveDto; import com.zcloud.primeport.plan.mjDevice.dto.OneLevelCarSaveDto; import org.springframework.stereotype.Component; @@ -27,6 +30,7 @@ public class CarDockUtil { dataList.forEach(item -> { item.setTruckCardColor(CarEnum.getMenuKeyByPath(item.getTruckCardColor())); item.setTruckTypCod(CarEnum.getMenuKeyByPath(item.getTruckTypCod())); + item.setTruckTeamNam(" "); // 1-东港区 2-西港区 item.setPortId("0"); if ("QHD_GQ_DGQ".equals(item.getAuthAreasCode())) { @@ -39,7 +43,7 @@ public class CarDockUtil { }); } - // 一级口门内部车 + // 一级口门内部车 拉黑原因 block_reason public void executeInternalVehicle(VehicleApplyE applyE) { OneLevelCarSaveDto o = new OneLevelCarSaveDto(); o.setTruckNo(applyE.getLicenceNo()); @@ -73,6 +77,24 @@ public class CarDockUtil { oneLevelCarUtil.internalVehicleSave(o); } + public void executeBlackSave(VehicleBlackE examTypeE) { + OneLevelCarBlackDto oneLevelCarBlackDto = new OneLevelCarBlackDto(); + oneLevelCarBlackDto.setTruckNo(examTypeE.getLicenceNo()); + oneLevelCarBlackDto.setTruckTypCod(CarEnum.getMenuKeyByPath(examTypeE.getVehicleType())); + oneLevelCarBlackDto.setTruckCardColor(CarEnum.getMenuKeyByPath(examTypeE.getLicenceNo())); + oneLevelCarBlackDto.setRecTim(DateUtil.date2Str(new Date())); + oneLevelCarBlackDto.setRecNam(AuthContext.getCurrentUser().getName()); + oneLevelCarUtil.blackVehicleSave(oneLevelCarBlackDto); + } + public void executeBlackRemove(VehicleBlackE examTypeE) { + OneLevelCarBlackDto oneLevelCarBlackDto = new OneLevelCarBlackDto(); + oneLevelCarBlackDto.setTruckNo(examTypeE.getLicenceNo()); + oneLevelCarBlackDto.setTruckTypCod(CarEnum.getMenuKeyByPath(examTypeE.getVehicleType())); + oneLevelCarBlackDto.setTruckCardColor(CarEnum.getMenuKeyByPath(examTypeE.getLicenceNo())); + oneLevelCarBlackDto.setRecTim(DateUtil.date2Str(new Date())); + oneLevelCarBlackDto.setRecNam(AuthContext.getCurrentUser().getName()); + oneLevelCarUtil.blackVehicleRemove(oneLevelCarBlackDto); + } public static void main(String[] args) { String x = "{\"area\": [{\"value\": \"秦皇岛港区-全部\", \"bianma\": \"QHD_GQ_DXGQ\"}]}"; diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/plan/mjDevice/OneLevelCarUtil.java b/web-infrastructure/src/main/java/com/zcloud/primeport/plan/mjDevice/OneLevelCarUtil.java index 0502196..e641bb2 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/plan/mjDevice/OneLevelCarUtil.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/plan/mjDevice/OneLevelCarUtil.java @@ -2,15 +2,13 @@ package com.zcloud.primeport.plan.mjDevice; import cn.hutool.http.HttpRequest; import cn.hutool.json.JSONObject; +import com.zcloud.primeport.persistence.dataobject.VehicleDockLogDO; +import com.zcloud.primeport.persistence.repository.VehicleDockLogRepository; +import com.zcloud.primeport.plan.mjDevice.dto.OneLevelCarBlackDto; import com.zcloud.primeport.plan.mjDevice.dto.OneLevelCarRemoveDto; import com.zcloud.primeport.plan.mjDevice.dto.OneLevelCarSaveDto; import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; -import org.springframework.web.client.RestTemplate; import javax.annotation.Resource; @@ -25,6 +23,9 @@ public class OneLevelCarUtil { @Value("${oneLevelCar.prefix}") private String prefix; + @Resource + private VehicleDockLogRepository vehicleDockLogRepository; + /** * 内部车辆保存 * @@ -34,6 +35,19 @@ public class OneLevelCarUtil { if (dockFlag.equals(1)) { String body = HttpRequest.post(prefix + "HD_QHD_IGATE_1.0/webresources/login/CTruck/qaSaveInternal").body(new JSONObject(oneLevelCarSaveDto).toString()).execute().body(); JSONObject resJson = new JSONObject(body); + VehicleDockLogDO vehicleDockLogDO = new VehicleDockLogDO(); + vehicleDockLogDO.setLevel("1"); + vehicleDockLogDO.setAdmissionBlackout("admission"); + vehicleDockLogDO.setLicenceNo(oneLevelCarSaveDto.getTruckNo()); + vehicleDockLogDO.setPortArea(oneLevelCarSaveDto.getPortId()); + vehicleDockLogDO.setValidDte(oneLevelCarSaveDto.getValidDte()); + vehicleDockLogDO.setTruckAppTypCod(oneLevelCarSaveDto.getTruckAppTypCod()); + vehicleDockLogDO.setTruckCardColor(oneLevelCarSaveDto.getTruckCardColor()); + vehicleDockLogDO.setTruckTypCod(oneLevelCarSaveDto.getTruckTypCod()); + vehicleDockLogDO.setDockFlag("2"); + vehicleDockLogDO.setDockStatus(resJson.getStr("code")); + vehicleDockLogDO.setReasonsRefusal(resJson.getStr("msg")); + vehicleDockLogRepository.save(vehicleDockLogDO); } } @@ -43,9 +57,17 @@ public class OneLevelCarUtil { */ public void internalVehicleRemove(OneLevelCarRemoveDto carRemoveDto) { if (dockFlag.equals(1)) { - String body = HttpRequest.post(prefix + "HD_QHD_IGATE_1.0/HD_QHD_IGATE_1.0/webresources/login/CTruck/qaDeleteInternal").body(new JSONObject(carRemoveDto).toString()).execute().body(); + String body = HttpRequest.post(prefix + "HD_QHD_IGATE_1.0/webresources/login/CTruck/qaDeleteInternal").body(new JSONObject(carRemoveDto).toString()).execute().body(); JSONObject resJson = new JSONObject(body); - + VehicleDockLogDO vehicleDockLogDO = new VehicleDockLogDO(); + vehicleDockLogDO.setLevel("1"); + vehicleDockLogDO.setAdmissionBlackout("admission"); + vehicleDockLogDO.setLicenceNo(carRemoveDto.getTruckNo()); + vehicleDockLogDO.setTruckCardColor(carRemoveDto.getTruckCardColor()); + vehicleDockLogDO.setDockFlag("2"); + vehicleDockLogDO.setDockStatus(resJson.getStr("code")); + vehicleDockLogDO.setReasonsRefusal(resJson.getStr("msg")); + vehicleDockLogRepository.save(vehicleDockLogDO); } } @@ -72,9 +94,19 @@ public class OneLevelCarUtil { oneLevelCarSaveDto.setIsNeedCheck("0"); String body = HttpRequest.post(prefix + "HD_QHD_IGATE_1.0/webresources/login/CTruck/qaSaveTemp").body(new JSONObject(oneLevelCarSaveDto).toString()).execute().body(); JSONObject resJson = new JSONObject(body); - if ("1".equals(resJson.get("code",String.class))) { - - } + VehicleDockLogDO vehicleDockLogDO = new VehicleDockLogDO(); + vehicleDockLogDO.setLevel("1"); + vehicleDockLogDO.setAdmissionBlackout("admission"); + vehicleDockLogDO.setLicenceNo(oneLevelCarSaveDto.getTruckNo()); + vehicleDockLogDO.setPortArea(oneLevelCarSaveDto.getPortId()); + vehicleDockLogDO.setValidDte(oneLevelCarSaveDto.getValidDte()); + vehicleDockLogDO.setTruckAppTypCod(oneLevelCarSaveDto.getTruckAppTypCod()); + vehicleDockLogDO.setTruckCardColor(oneLevelCarSaveDto.getTruckCardColor()); + vehicleDockLogDO.setTruckTypCod(oneLevelCarSaveDto.getTruckTypCod()); + vehicleDockLogDO.setDockFlag("2"); + vehicleDockLogDO.setDockStatus(resJson.getStr("code")); + vehicleDockLogDO.setReasonsRefusal(resJson.getStr("msg")); + vehicleDockLogRepository.save(vehicleDockLogDO); } } @@ -83,8 +115,21 @@ public class OneLevelCarUtil { * * */ - public void blackVehicleSave() { -// restTemplateOneLevelCarDock.exchange(); + public void blackVehicleSave(OneLevelCarBlackDto oneLevelCarBlackDto) { + if (dockFlag.equals(1)) { + String body = HttpRequest.post(prefix + "HD_QHD_IGATE_1.0/webresources/login/CTruck/qaSaveBlack").body(new JSONObject(oneLevelCarBlackDto).toString()).execute().body(); + JSONObject resJson = new JSONObject(body); + VehicleDockLogDO vehicleDockLogDO = new VehicleDockLogDO(); + vehicleDockLogDO.setLevel("1"); + vehicleDockLogDO.setAdmissionBlackout("admission"); + vehicleDockLogDO.setLicenceNo(oneLevelCarBlackDto.getTruckNo()); + vehicleDockLogDO.setTruckCardColor(oneLevelCarBlackDto.getTruckCardColor()); + vehicleDockLogDO.setTruckTypCod(oneLevelCarBlackDto.getTruckTypCod()); + vehicleDockLogDO.setDockFlag("2"); + vehicleDockLogDO.setDockStatus(resJson.getStr("code")); + vehicleDockLogDO.setReasonsRefusal(resJson.getStr("msg")); + vehicleDockLogRepository.save(vehicleDockLogDO); + } } /** @@ -92,7 +137,20 @@ public class OneLevelCarUtil { * * */ - public void blackVehicleRemove() { -// restTemplateOneLevelCarDock.exchange(); + public void blackVehicleRemove(OneLevelCarBlackDto oneLevelCarBlackDto) { + if (dockFlag.equals(1)) { + String body = HttpRequest.post(prefix + "HD_QHD_IGATE_1.0/webresources/login/CTruck/qaDeleteBlack").body(new JSONObject(oneLevelCarBlackDto).toString()).execute().body(); + JSONObject resJson = new JSONObject(body); + VehicleDockLogDO vehicleDockLogDO = new VehicleDockLogDO(); + vehicleDockLogDO.setLevel("1"); + vehicleDockLogDO.setAdmissionBlackout("admission"); + vehicleDockLogDO.setLicenceNo(oneLevelCarBlackDto.getTruckNo()); + vehicleDockLogDO.setTruckCardColor(oneLevelCarBlackDto.getTruckCardColor()); + vehicleDockLogDO.setTruckTypCod(oneLevelCarBlackDto.getTruckTypCod()); + vehicleDockLogDO.setDockFlag("2"); + vehicleDockLogDO.setDockStatus(resJson.getStr("code")); + vehicleDockLogDO.setReasonsRefusal(resJson.getStr("msg")); + vehicleDockLogRepository.save(vehicleDockLogDO); + } } } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/plan/mjDevice/dto/OneLevelCarBlackDto.java b/web-infrastructure/src/main/java/com/zcloud/primeport/plan/mjDevice/dto/OneLevelCarBlackDto.java new file mode 100644 index 0000000..068dc60 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/plan/mjDevice/dto/OneLevelCarBlackDto.java @@ -0,0 +1,18 @@ +package com.zcloud.primeport.plan.mjDevice.dto; + +import lombok.Data; + +@Data +public class OneLevelCarBlackDto { + // 车牌号 + private String truckNo; + // 车牌颜色 代码0蓝牌1黄牌2白牌3黑牌4新能源5其他 + private String truckCardColor; + // 车辆类型WXP危险品（黄牌），QH 轻型货车，XK 小型客车，ZK 中型客车，DK 大型客车 + // BG 重型半挂牵引，TZ 特种作业车，ZX 重型自卸货车，JSXH 集疏港小型货车，MV 7座以下轿车 + // IW 7座以上轿车，CR 面包车， CC 皮卡，Z7 水泥罐车，WXP_BLUE 危险品（蓝牌） + private String truckTypCod; + // + private String recNam; + private String recTim; +} diff --git a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml index 582457b..8cecdab 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml @@ -178,7 +178,7 @@ vehicle_apply WHERE delete_enum = 'FALSE' - AND audit_flag = 2 AND visit_start_time <= now() AND visit_end_time >= now() + AND audit_flag = 2 AND visit_start_time <= DATE_FORMAT(now(),'%Y-%m-%d') AND visit_end_time >= DATE_FORMAT(now(),'%Y-%m-%d') AND vehicle_belong_type IN ( 5, 6 ) AND licence_no = #{licenceNo}