diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java index 6b70a67b..bd7fbaec 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java @@ -39,13 +39,21 @@ public class RateModelConfigReplyDataLogic implements ServiceLogic { String result = FAIL; if (HEX_01.equals(configResult)) { -// 确定设置成功的rateModelId 可能涉及协议修改 final String pkey = "pile:".concat(pileRateModelConfigReplyData.getPileNo()); Map cachePile = REDIS.getCacheMap(pkey); ChargingStationDto cacheStation = REDIS.getCacheObject("station:".concat(cachePile.get("stationId").toString())); - cachePile.put("rateModelId", cacheStation.getRateModelId()); + String version = (String) cachePile.get("version"); + if (!"0A".equals(version) && !"0B".equals(version)) { + Long stationRateModelId = cacheStation.getRateModelId(); + if (stationRateModelId.equals(pileRateModelConfigReplyData.getRateModelId())) { + cachePile.put("rateModelId", cacheStation.getRateModelId()); + result = OK; + } + } else { + cachePile.put("rateModelId", cacheStation.getRateModelId()); + result = OK; + } REDIS.setCacheMap(pkey, cachePile); - result = OK; } String remark = "充电桩收到计费模型应答";