From 18de552bbccced1b88b09ca2d923c1188b244f08 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Tue, 3 Sep 2024 10:15:10 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=94=B5=E5=8D=95=E8=BD=A6=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/common/util/YKCUtils.java | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/YKCUtils.java b/jsowell-common/src/main/java/com/jsowell/common/util/YKCUtils.java index bab049481..28e63161b 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/YKCUtils.java +++ b/jsowell-common/src/main/java/com/jsowell/common/util/YKCUtils.java @@ -176,24 +176,27 @@ public class YKCUtils { public static Map parsePileConnectorCode(String pileConnectorCode) { int length = pileConnectorCode.length(); - if (length > 10) { + // 如果length不等于14, 16, 8, 10, 2, 判断为错误的长度 + if (length != Constants.PILE_CONNECTOR_CODE_LENGTH_FOR_EV + && length != Constants.PILE_SN_LENGTH_FOR_EV + && length != Constants.PILE_CONNECTOR_CODE_LENGTH_FOR_EBIKE + && length != Constants.PILE_SN_LENGTH_FOR_EBIKE + && length != 2) { + throw new BusinessException(ReturnCodeEnum.CODE_DATA_LENGTH_ERROR.getValue(), "Invalid pile connector code length: " + length); + } + + if (length == Constants.PILE_CONNECTOR_CODE_LENGTH_FOR_EV) { // 汽车桩 - if (length == Constants.PILE_CONNECTOR_CODE_LENGTH_FOR_EV) { - return parsePileConnector(pileConnectorCode, Constants.PILE_CONNECTOR_CODE_LENGTH_FOR_EV, pileConnectorCode.length() - 2); - } else if (length == 14) { - return ImmutableMap.of("pileSn", pileConnectorCode, "connectorCode", ""); - } else { - throw new BusinessException(ReturnCodeEnum.CODE_DATA_LENGTH_ERROR.getValue(), "Invalid EV pile connector code length: " + length); - } + return parsePileConnector(pileConnectorCode, Constants.PILE_CONNECTOR_CODE_LENGTH_FOR_EV, pileConnectorCode.length() - 2); + } else if (length == Constants.PILE_CONNECTOR_CODE_LENGTH_FOR_EBIKE) { + // 电单车 + return parsePileConnector(pileConnectorCode, Constants.PILE_CONNECTOR_CODE_LENGTH_FOR_EBIKE, pileConnectorCode.length() - 2); + } else if (length == Constants.PILE_SN_LENGTH_FOR_EV || length == Constants.PILE_SN_LENGTH_FOR_EBIKE) { + // 充电桩编号 + return ImmutableMap.of("pileSn", pileConnectorCode, "connectorCode", ""); } else { - // 电单车桩 - if (length == Constants.PILE_CONNECTOR_CODE_LENGTH_FOR_EBIKE) { - return parsePileConnector(pileConnectorCode, Constants.PILE_CONNECTOR_CODE_LENGTH_FOR_EBIKE, pileConnectorCode.length() - 2); - } else if (length == 8) { - return ImmutableMap.of("pileSn", pileConnectorCode, "connectorCode", ""); - } else { - throw new BusinessException(ReturnCodeEnum.CODE_DATA_LENGTH_ERROR.getValue(), "Invalid e-bike pile connector code length: " + length); - } + // 枪口号 + return ImmutableMap.of("pileSn", "", "connectorCode", pileConnectorCode); } } @@ -219,7 +222,7 @@ public class YKCUtils { public static void main(String[] args) { String pileConnectorCode = "8800000000000201"; - pileConnectorCode = "1327388103"; + // pileConnectorCode = "1327388103"; String pileSn = YKCUtils.getPileSn(pileConnectorCode); System.out.println(pileSn); String connectorCode = YKCUtils.getConnectorCode(pileConnectorCode);