From 187a45cf5e2efa754d6852e0173adb28edc39b12 Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 25 Sep 2024 10:37:11 +0800 Subject: [PATCH] =?UTF-8?q?bugfix=20=20=E9=AB=98=E5=BE=B7=E3=80=81?= =?UTF-8?q?=E8=8B=8F=E5=B7=9E=E5=B8=82=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thirdparty/amap/service/impl/AMapServiceImpl.java | 3 +++ .../platform/service/impl/SuZhouPlatformServiceImpl.java | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java index efebf8d5e..fc0d1ef30 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java @@ -556,6 +556,9 @@ public class AMapServiceImpl implements AMapService { PileInfoVO pileInfoVO = value.get(0); info.setEquipmentID(pileSn); info.setManufacturerName(Constants.JSOWELL); + if (pileInfoVO.getSpeedType() == null) { + continue; + } info.setEquipmentType(Integer.valueOf(pileInfoVO.getSpeedType())); info.setPower(new BigDecimal(pileInfoVO.getRatedPower()).setScale(1, BigDecimal.ROUND_HALF_UP)); connectorInfos = Lists.newArrayList(); diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/SuZhouPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/SuZhouPlatformServiceImpl.java index ab07d68ce..b97175a63 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/SuZhouPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/SuZhouPlatformServiceImpl.java @@ -330,7 +330,7 @@ public class SuZhouPlatformServiceImpl implements ThirdPartyPlatformService { @Override public String notificationEquipChargeStatus(String orderCode) { -// 根据订单号查询订单信息 + // 根据订单号查询订单信息 OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode); ThirdPartySecretInfoVO suZhouSecretInfo = getSuZhouSecretInfo(); @@ -388,7 +388,7 @@ public class SuZhouPlatformServiceImpl implements ThirdPartyPlatformService { } - String url = urlAddress + BusinessInformationExchangeEnum.NOTIFICATION_EQUIP_CHARGE_STATUS; + String url = urlAddress + BusinessInformationExchangeEnum.NOTIFICATION_EQUIP_CHARGE_STATUS.getValue(); // 调用联联平台接口 String jsonString = JSON.toJSONString(supEquipChargeStatusInfo); @@ -421,7 +421,7 @@ public class SuZhouPlatformServiceImpl implements ThirdPartyPlatformService { String urlAddress = secretInfoVO.getTheirUrlPrefix(); // 推送地址 - String url = urlAddress + BusinessInformationExchangeEnum.NOTIFICATION_CHARGE_ORDER_INFO; + String url = urlAddress + BusinessInformationExchangeEnum.NOTIFICATION_CHARGE_ORDER_INFO.getValue(); // 根据订单号查询订单详情 OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode); @@ -554,7 +554,7 @@ public class SuZhouPlatformServiceImpl implements ThirdPartyPlatformService { } // 调用联联平台接口 - String url = urlAddress + BusinessInformationExchangeEnum.NOTIFICATION_STATION_INFO; + String url = urlAddress + BusinessInformationExchangeEnum.NOTIFICATION_STATION_INFO.getValue(); String jsonStr = JSON.toJSONString(info); JSONObject data = new JSONObject(); @@ -580,6 +580,7 @@ public class SuZhouPlatformServiceImpl implements ThirdPartyPlatformService { if (thirdPartySecretInfoVO == null) { throw new BusinessException(ReturnCodeEnum.CODE_SELECT_INFO_IS_NULL); } + thirdPartySecretInfoVO.setOurOperatorId(Constants.OPERATORID_JIANG_SU); return thirdPartySecretInfoVO; } }