From 2848ed437666aad1907009b26a9a64d220a6a392 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Mon, 24 Jul 2023 17:15:28 +0800 Subject: [PATCH] fix car bug --- .../car/WxParkCallBackBaseController.java | 17 ++++++++++++++++- .../impl/dahua/DaHuaParkCallbackService.java | 7 +++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxParkCallBackBaseController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxParkCallBackBaseController.java index e586b1df0..3747d80ea 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxParkCallBackBaseController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxParkCallBackBaseController.java @@ -181,6 +181,9 @@ public class WxParkCallBackBaseController extends BaseController { } private Result handleSingleParkInCallBack(EnumCarVendor vendor,EnumCarCmd cmdType,ParkNotifyParam param ,Object sourceParam) { + if (null == param) { + return new Result(); + } String carNumber = param.getCarNumber(); @@ -250,6 +253,10 @@ public class WxParkCallBackBaseController extends BaseController { } private Result handleParkOutCallBackSingle(EnumCarVendor vendor,EnumCarCmd cmdType,ParkNotifyParam param,Object sourceParam) { + if (null == param) { + return new Result(); + } + ParkCacheUtils.removeCache(redisTemplate, vendor.getMessage(), param.getCarNumber()); WxCarCmdLog wxCarCmdLog = null; @@ -286,7 +293,11 @@ public class WxParkCallBackBaseController extends BaseController { } private Result handleUnbindCarCallBackSingle(EnumCarVendor vendor,EnumCarCmd cmdType,ParkNotifyParam param,Object sourceParam) { - WxCarCmdLog wxCarCmdLog = null; + if (null == param) { + return new Result(EnumETCPCode.SUCCESS.getCode(), EnumETCPCode.SUCCESS.getMessage()); + } + + WxCarCmdLog wxCarCmdLog = null; try { wxCarCmdLog = saveWxCarCmdLog(vendor, cmdType, sourceParam, param); }catch(MallinkException e) { @@ -325,6 +336,10 @@ public class WxParkCallBackBaseController extends BaseController { private Result handlePaidCallbackSingle(EnumCarVendor vendor,EnumCarCmd cmdType,ParkNotifyParam param,Object sourceParam) { + if (null == param) { + return new Result(EnumETCPCode.SUCCESS.getCode(), EnumETCPCode.SUCCESS.getMessage()); + } + WxCarCmdLog carCmdLogQ = new WxCarCmdLog(); String parkId = param.getParkId(); WxPark parkQ = new WxPark(); diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkCallbackService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkCallbackService.java index 673f9e97c..c8b8108cd 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkCallbackService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkCallbackService.java @@ -44,8 +44,8 @@ public class DaHuaParkCallbackService extends BaseParkService implements ParkCal WxCarJSOrderMapper wxCarJSOrderMapper; private String handleCarNumber(String carNumber) { - if (StringUtils.isBlank(carNumber)) { - return "空车牌"; + if (StringUtils.isBlank(carNumber) || "无牌车".equals(carNumber)) { + return null; } if (carNumber.contains("-")) { carNumber = carNumber.replaceAll("-", ""); @@ -68,6 +68,9 @@ public class DaHuaParkCallbackService extends BaseParkService implements ParkCal ParkNotifyParam p = new ParkNotifyParam(); String realCarNumber = handleCarNumber(carNumber); + if (StringUtils.isBlank(realCarNumber)) { + return null; + } p.setCarNumber(realCarNumber); p.setParkId(parkCode); p.setParkName(parkName);