互联互通对接调试：支持双向加密配置

common/src/main/java/com/kym/common/utils/PlatformAesUtil.java

@@ -52,12 +52,12 @@ public class PlatformAesUtil {
             Cipher cipher = Cipher.getInstance(CBC_PKCS5_PADDING);
 
             //偏移量
-            IvParameterSpec zeroIv = new IvParameterSpec(config.getDataSecretIv().getBytes(StandardCharsets.UTF_8));
+            IvParameterSpec zeroIv = new IvParameterSpec(config.getUserDataSecretIv().getBytes(StandardCharsets.UTF_8));
 
             byte[] byteContent = content.getBytes(StandardCharsets.UTF_8);
 
             //使用加密秘钥
-            SecretKeySpec skeySpec = new SecretKeySpec(config.getDataSecret().getBytes(StandardCharsets.UTF_8), AES);
+            SecretKeySpec skeySpec = new SecretKeySpec(config.getUserDataSecret().getBytes(StandardCharsets.UTF_8), AES);
             //初始化为加密模式的密码器
             cipher.init(Cipher.ENCRYPT_MODE, skeySpec, zeroIv);
             // 加密

entity/src/main/java/com/kym/entity/platform/PlatformConnectorInfo.java

@@ -15,6 +15,10 @@ public class PlatformConnectorInfo {
      */
     @JSONField(name = "ConnectorID")
     private String connectorId;
+    public void setConnectorId(String connectorId) {
+        this.connectorId = connectorId.replace("_", "");
+    }
+
 
     /**
      * 充电设备接口名称

entity/src/main/java/com/kym/entity/platform/PlatformConnectorStatsInfo.java

@@ -24,5 +24,9 @@ public class PlatformConnectorStatsInfo {
      */
     @JSONField(name = "ConnectorElectricity")
     private BigDecimal connectorElectricity;
+    public void setConnectorId(String connectorId) {
+        this.connectorId = connectorId.replace("_", "");
+    }
+
 
 }

entity/src/main/java/com/kym/entity/platform/PlatformConnectorStatusInfo.java

@@ -15,6 +15,9 @@ public class PlatformConnectorStatusInfo {
      */
     @JSONField(name = "ConnectorID")
     private String connectorId;
+    public void setConnectorId(String connectorId) {
+        this.connectorId = connectorId.replace("_", "");
+    }
     /**
      * 充电设备接口状态
      * 0：离网

entity/src/main/java/com/kym/entity/platform/response/PlatformBusinessPolicy.java

@@ -21,6 +21,11 @@ public class PlatformBusinessPolicy {
      */
     @JSONField(name = "EquipBizSeq")
     private String equipBizSeq;
+
+    public void setConnectorId(String connectorId) {
+        this.connectorId = connectorId.replace("_", "");
+    }
+
     /**
      * 充电设备接口编码
      */

service/src/main/java/com/kym/service/cache/PlatformCache.java

@@ -1,5 +1,6 @@
 package com.kym.service.cache;
 
+import com.kym.common.utils.PlatformConvertUtil;
 import com.kym.entity.admin.Platform;
 
 import java.util.Map;
@@ -56,6 +57,7 @@ public enum PlatformCache {
     }
 
     public String getPlatformNameByConnectorId(String connectorId) {
+        connectorId = PlatformConvertUtil.parse2LocalConnectorId(connectorId);
         return CONNECTOR_ID_PLATFORM_NAME_MAPPING.get(connectorId);
     }
 
@@ -74,6 +76,7 @@ public enum PlatformCache {
      * @return
      */
     public Platform getPlatformByConnectorId(String connectorId) {
+        connectorId = PlatformConvertUtil.parse2LocalConnectorId(connectorId);
         var platformName = getPlatformNameByConnectorId(connectorId);
         return PLATFORM_CONFIG_MAPPING.get(platformName);
     }