diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/thirdparty/publicinfo/BaseStationInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/thirdparty/publicinfo/BaseStationInfo.java index 6fb6ca9cc..4397f9ef2 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/thirdparty/publicinfo/BaseStationInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/thirdparty/publicinfo/BaseStationInfo.java @@ -184,7 +184,7 @@ public class BaseStationInfo { * <=100字符 */ @JSONField(name = "MatchCars") - private String matchCars; + private List matchCars; /** * 服务车型描述 diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java index f958d66a4..6d934dd98 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java @@ -841,8 +841,11 @@ public class CommonService { } else if (StringUtils.equals(connectorStatus, PileConnectorStatusEnum.FAULT.getValue())) { // 故障 return "255"; + }else if (StringUtils.equals(connectorStatus, PileConnectorStatusEnum.OCCUPIED_CHARGING.getValue())) { + // 充电中需要把 03 改为 3 返回 + return Constants.THREE; }else { - // 0-离网和 3-充电中不需要转换,直接返回 + // 0-离网不需要转换,直接返回 return connectorStatus; } } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NeiMengGuPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NeiMengGuPlatformServiceImpl.java index 2f29f5e68..67958c3a9 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NeiMengGuPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NeiMengGuPlatformServiceImpl.java @@ -546,7 +546,7 @@ public class NeiMengGuPlatformServiceImpl implements ThirdPartyPlatformService { .connectorID(pileConnectorCode) .equipmentClassification(Constants.ONE) .status(Integer.parseInt(status)) - .statusDesc(PileConnectorDataBaseStatusEnum.getStatusDescription(status)) + // .statusDesc(PileConnectorDataBaseStatusEnum.getStatusDescription(status)) .parkStatus(Constants.zero) .lockStatus(Constants.zero) .batteryStatus(Constants.ZERO)