From 7bc4bc5c10a647f27d602352c4629a2cc58d5596 Mon Sep 17 00:00:00 2001 From: ZZ Date: Wed, 10 Nov 2021 10:32:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E4=B8=9A=E6=89=A7=E7=85=A7=E4=B8=8EOp?= =?UTF-8?q?eratorID=E6=88=AA=E5=8F=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xhpc/evcs/encryption/Aes128Cbc.java | 4 +--- .../java/com/xhpc/evcs/api/QueryStationsInfoController.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/encryption/Aes128Cbc.java b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/encryption/Aes128Cbc.java index bbee3ac8..a03dfde3 100644 --- a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/encryption/Aes128Cbc.java +++ b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/encryption/Aes128Cbc.java @@ -3,8 +3,6 @@ package com.xhpc.evcs.encryption; import javax.crypto.*; import javax.crypto.spec.SecretKeySpec; import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; -import java.math.RoundingMode; import java.nio.charset.StandardCharsets; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; @@ -72,7 +70,7 @@ public class Aes128Cbc { System.out.println(encrypt("{\"StationIDs\":[\"1\"]}", "8LpncubmWiPCzY3V", "av6A8QdnRaVRMXu6")); System.out.println(encrypt("{\"OperatorID\":\"MA5FNJXW9\", \"OperatorSecret\":\"Ut5UFdqDthiJyncU\"}", "8LpncubmWiPCzY3V", "av6A8QdnRaVRMXu6")); - System.out.println(new BigDecimal("244.0111117").setScale(6, RoundingMode.HALF_UP).doubleValue()); + System.out.println("91510105MA6DFCTD5U".substring(8, 17)); } } diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStationsInfoController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStationsInfoController.java index eeab49af..4660b147 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStationsInfoController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStationsInfoController.java @@ -124,7 +124,7 @@ public class QueryStationsInfoController { chargingStationDto.setType(xhpcChargingStation.getType()); //运营商id chargingStationDto.setOperatorId(xhpcChargingStation.getOperatorIdEvcs() == null ? "MA6DFCTD5" - : xhpcChargingStation.getOperatorIdEvcs()); + : xhpcChargingStation.getOperatorIdEvcs().substring(9, 19)); //详细地址 chargingStationDto.setAddress(xhpcChargingStation.getAddress()); //充电站省直辖区编码