diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPartyOperatorIdEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPartyOperatorIdEnum.java index 1e3ebb194..011ab3ee3 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPartyOperatorIdEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPartyOperatorIdEnum.java @@ -13,6 +13,7 @@ public enum ThirdPartyOperatorIdEnum { ZHONG_DIAN_LIAN_PLATFORM("2", "14405899X"), JIANG_SU_PLATFORM("3", "726079387"), YONG_CHENG_BO_CHE("4", "330205020"), + NING_XIA_JIAO_TOU("5", "MA771QENX"), XIN_DIAN_TU("6", "MA25CNM38"), ; private String type; diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java index 45eeb6844..5338fe206 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java @@ -13,6 +13,7 @@ public enum ThirdPlatformTypeEnum { ZHONG_DIAN_LIAN_PLATFORM("2", "中电联平台"), JIANG_SU_PLATFORM("3", "江苏省平台"), YONG_CHENG_BO_CHE("4", "甬城泊车平台"), + NING_XIA_JIAO_TOU("5", "宁夏交投"), XIN_DIAN_TU("6", "新电途平台"), ; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java index 50c412737..0e3a59cf4 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java @@ -255,8 +255,8 @@ public class LianLianServiceImpl implements LianLianService { String dataSecret = "KnGhAb88GtUEPb0j"; // SPBNJ1Z5EQNmpK08 VTAEKDPVN9CUS7WO String dataSecretIV = "XZ4wURhuo2y8s4ZS"; // peRoTcb2C7zqKeII 83UZFFRRZDYNF5CR String signSecret = "sRjCDeokckFGpYpA"; // sRjCDeokckFGpYpA - String dataString = "pZLkdIJdqGhgVcTEhSQXv7VBj9jRQ+Cjy49RPHeuFkE4vtwhn2Klzpy/2UjUNWnAZWZwTTllk6ZuUKWfkmMR0N4XtgtN566HyNHvPM37xRBfdqpBg/SVePoVuD3gdI/HaYcXs4TjTcEHqYYr\n" + - "NeE8FLFw32mz8diZEfR25VldCsQEBHYkpZmcKuRm1CP1lV2f"; + String dataString = "pZLkdIJdqGhgVcTEhSQXv7VBj9jRQ+Cjy49RPHeuFkHPOx+D8XLNGFhB/6ZdNDx3D3NEjNx3ua0sTLGv3bC5PnW8XjG0YslIPmPIjasXcBUTWCF83VKZ6/QrY0QgRJD4MpY3tedlj\n" + + "icvZVFX2l7A0pH4Iy635arhR5y2k3WnPOdzLCuLDaSKItL836PGHorwOyrh4ETt+fXM/7aaDzSA8NvrzvhB6wdy7Ffob7ri8o9IXx5MQg2ddgJoIqsKxrwE2TrQzXNw5skCmXcxgPrfXyHDGEmw/wQUrxvkAX3tHXobxr8d+R2/YBWL955H+3yyK5rTMxd2xNhX80zKtt3ejBMQ45cCvda//lO2q+Rsob5qqCyAfx+1xREl37/QEPDg3CXpxe/Me4y57RvSXhKHM65lyMSBmaNNZB+KQvZ7opY="; // 解密data byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(dataString), dataSecret.getBytes(), dataSecretIV.getBytes()); @@ -677,8 +677,8 @@ public class LianLianServiceImpl implements LianLianService { .build(); String type = ThirdPartyOperatorIdEnum.getTypeByOperatorId(dto.getOperatorId()); if (StringUtils.equals(ThirdPlatformTypeEnum.XIN_DIAN_TU.getCode(), type)) { - // 如果是新电途平台,则将 startChargeSeqStat 改为 3-停止中 - vo.setStartChargeSeqStat(3); + // 如果是新电途平台,则将 startChargeSeqStat 改为 1-启动中 + vo.setStartChargeSeqStat(1); } // 异步推送启动充电结果 CompletableFuture.runAsync(() -> { @@ -829,8 +829,8 @@ public class LianLianServiceImpl implements LianLianService { String type = ThirdPartyOperatorIdEnum.getTypeByOperatorId(dto.getOperatorId()); if (StringUtils.equals(ThirdPlatformTypeEnum.XIN_DIAN_TU.getCode(), type)) { - // 如果是新电途平台,则将 startChargeSeqStat 改为 1-启动中 - vo.setStartChargeSeqStat(1); + // 如果是新电途平台,则将 startChargeSeqStat 改为 3-停止中 + vo.setStartChargeSeqStat(3); } // 加密 Map resultMap = Maps.newLinkedHashMap();