diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java index ee9137752..5f8bc4446 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java @@ -25,7 +25,7 @@ import java.util.Objects; /** * 充电结束Handler - * + * 0x19 * GBT-27930 充电桩与 BMS 充电结束阶段报文 * @author JS-ZZA * @date 2022/9/19 13:27 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 129db900f..e937719dc 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 @@ -155,8 +155,15 @@ public class AMapServiceImpl implements AMapService { List picturesList; AMapStationInfo aMapInfo; for (PileStationInfo stationInfo : stationList) { - aMapInfo = new AMapStationInfo(); String stationId = String.valueOf(stationInfo.getId()); + // 判断当前站点计费模板是否为空 + List aMapPriceChargingInfos = priceInfoMap.get(stationId); + if (CollectionUtils.isEmpty(aMapPriceChargingInfos)) { + continue; + } + + aMapInfo = new AMapStationInfo(); + aMapInfo.setStationID(stationId); aMapInfo.setOperatorID(Constants.OPERATORID_LIANLIAN); aMapInfo.setEquipmentOwnerID(Constants.OPERATORID_LIANLIAN); @@ -182,7 +189,6 @@ public class AMapServiceImpl implements AMapService { aMapInfo.setBusineHours(stationInfo.getBusinessHours()); // 计费模板 - List aMapPriceChargingInfos = priceInfoMap.get(stationId); aMapInfo.setPriceChargingInfo(aMapPriceChargingInfos); // 站点设备信息 List equipmentInfos = equipmentInfoMap.get(stationId); diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/util/AMapUtils.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/util/AMapUtils.java index 20e10b890..2a9823e05 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/util/AMapUtils.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/util/AMapUtils.java @@ -1,6 +1,9 @@ package com.jsowell.thirdparty.amap.util; import com.alibaba.fastjson2.JSONObject; +import com.jsowell.common.util.id.SnUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; @@ -29,6 +32,8 @@ public class AMapUtils { // private static String PRD_URL; private static String API_URL; + private static Logger logger = LoggerFactory.getLogger(AMapUtils.class); + @Value("${aMap.merchantPrivateKey}") public void setMerchantPrivateKey(String merchantPrivateKey) { AMapUtils.MERCHANT_PRIVATE_KEY = merchantPrivateKey; @@ -114,7 +119,8 @@ public class AMapUtils { ResponseEntity resp = restTemplate.postForEntity(API_URL, entity, String.class); if (resp.getBody() != null && !"".equals(resp.getBody())) { JSONObject respObj = JSONObject.parseObject(resp.getBody()); - System.out.println("高德返回结果:" + respObj); + logger.info("高德返回结果:{}", respObj); + // System.out.println("高德返回结果:" + respObj); return JSONObject.toJSONString(respObj); } return null;