From 373d9839a5d7190a5669be0ce3f15f2f02a9a608 Mon Sep 17 00:00:00 2001 From: "YAS\\29473" <2947326429@qq.com> Date: Wed, 13 Aug 2025 11:00:28 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=8A=A0=E5=AF=86=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/JiLinPlatformServiceImpl.java | 11 ++++------- .../service/impl/YunWeiPlatformServiceImpl.java | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiLinPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiLinPlatformServiceImpl.java index 04b9c7672..66d6e0c76 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiLinPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiLinPlatformServiceImpl.java @@ -226,7 +226,7 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService { // 未查到数据 return null; } - ThirdPartySecretInfoVO thirdPartySecretInfoVO = null; + ThirdPartySecretInfoVO thirdPartySecretInfoVO = getJiLinSecretInfo(); PageInfo pageInfo = new PageInfo<>(stationInfos); List resultList = new ArrayList<>(); @@ -529,8 +529,7 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService { Map map = new LinkedHashMap<>(); map.put("StationStatusInfos", stationStatusInfos); - Map resultMap = ThirdPartyPlatformUtils.generateResultMap(map, thirdPartySecretInfoVO.getOurDataSecret(), - thirdPartySecretInfoVO.getOurDataSecretIv(), thirdPartySecretInfoVO.getTheirSigSecret()); + Map resultMap = ThirdPartyPlatformUtils.generateResultMap(map, thirdPartySecretInfoVO); return resultMap; } @@ -1010,8 +1009,7 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService { log.info("请求参数：{}", JSON.toJSONString(json)); - return ThirdPartyPlatformUtils.generateResultMapV2(json, jiLinSecretInfo.getOurDataSecret() - , jiLinSecretInfo.getOurDataSecretIv(), jiLinSecretInfo.getOurSigSecret()); + return ThirdPartyPlatformUtils.generateResultMap(json, jiLinSecretInfo); } @@ -1273,8 +1271,7 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService { Map map = new LinkedHashMap<>(); map.put("StationStats", supStationStatsInfo); - Map resultMap = ThirdPartyPlatformUtils.generateResultMapV2(map, thirdPartySecretInfoVO.getOurDataSecret(), - thirdPartySecretInfoVO.getOurDataSecretIv(), thirdPartySecretInfoVO.getTheirSigSecret()); + Map resultMap = ThirdPartyPlatformUtils.generateResultMap(map, thirdPartySecretInfoVO); return resultMap; } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/YunWeiPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/YunWeiPlatformServiceImpl.java index db1e2c943..3418b2d00 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/YunWeiPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/YunWeiPlatformServiceImpl.java @@ -151,7 +151,7 @@ public class YunWeiPlatformServiceImpl implements ThirdPartyPlatformService { vo.setFailReason(failReason); vo.setSuccStat(succStat); vo.setOperatorID(dto.getOperatorID()); - + logger.info("queryToken result: " + JSON.toJSONString(vo)); Map resultMap = ThirdPartyPlatformUtils.generateResultMap(vo, thirdPartySecretInfoVO); return resultMap; }