From 2abe7ee27eaa61879a641e2d9ae6efe9620b3e66 Mon Sep 17 00:00:00 2001 From: "YAS\\29473" <2947326429@qq.com> Date: Sun, 28 Sep 2025 17:16:37 +0800 Subject: [PATCH] update --- .../jsowell/api/thirdparty/XDTController.java | 22 ++++++++++--------- .../impl/XinDiantuPlatfromServiceImpl.java | 4 +--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/XDTController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/XDTController.java index 2b3b3b19f..330d5a4f0 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/XDTController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/XDTController.java @@ -2,11 +2,13 @@ package com.jsowell.api.thirdparty; import com.alibaba.fastjson2.JSON; import com.jsowell.common.annotation.Anonymous; +import com.jsowell.common.dto.thirdparty.JCTCommonParamsDTO; import com.jsowell.common.enums.thirdparty.ThirdPartyReturnCodeEnum; import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; +import com.jsowell.common.util.bean.BeanUtils; import com.jsowell.pile.dto.*; import com.jsowell.pile.thirdparty.CommonParamsDTO; import com.jsowell.thirdparty.lianlian.common.CommonResult; @@ -47,8 +49,8 @@ public class XDTController extends ThirdPartyBaseController { public CommonResult queryToken(@RequestBody CommonParamsDTO dto) { try { Map map = platformLogic.queryToken(dto); - logger.info("{}-请求令牌, params:{}, result:{}", platformName, JSON.toJSONString(dto), JSON.toJSONString(map)); - return CommonResult.success(Integer.parseInt(map.get("Ret")), map.get("Msg"), map.get("Data"), map.get("Sig")); + logger.info("{}-请求令牌 result:{}" , platformName , map); + return CommonResult.success(0 , "请求令牌成功！" , map.get("Data") , map.get("Sig")); } catch (Exception e) { logger.error("{}-获取token接口, 异常, params:{}", platformName, JSON.toJSONString(dto), e); return CommonResult.failed("获取token发生异常"); @@ -82,7 +84,7 @@ public class XDTController extends ThirdPartyBaseController { // 执行逻辑 Map map = platformLogic.queryStationsInfo(queryStationInfoDTO); - return CommonResult.success(Integer.parseInt(map.get("Ret")), map.get("Msg"), map.get("Data"), map.get("Sig")); + return CommonResult.success(0 , "请求令牌成功！" , map.get("Data") , map.get("Sig")); } catch (Exception e) { logger.info("{}-查询充电站信息 error:", platformName, e); } @@ -177,7 +179,7 @@ public class XDTController extends ThirdPartyBaseController { // 执行逻辑 Map map = platformLogic.queryQrcodeData(queryQrcodeDTO); - return CommonResult.success(Integer.parseInt(map.get("Ret")), map.get("Msg"), map.get("Data"), map.get("Sig")); + return CommonResult.success(0 , "请求令牌成功！" , map.get("Data") , map.get("Sig")); } catch (Exception e) { logger.error("{}-二维码解析接口 error:", platformName, e); } @@ -213,7 +215,7 @@ public class XDTController extends ThirdPartyBaseController { // 执行逻辑 Map map = platformLogic.queryEquipAuth(queryEquipmentDTO); - return CommonResult.success(Integer.parseInt(map.get("Ret")), map.get("Msg"), map.get("Data"), map.get("Sig")); + return CommonResult.success(0 , "请求令牌成功！" , map.get("Data") , map.get("Sig")); } catch (Exception e) { logger.error("{}-请求设备认证 error:", platformName, e); } @@ -250,7 +252,7 @@ public class XDTController extends ThirdPartyBaseController { // 执行逻辑 Map map = platformLogic.queryEquipBusinessPolicy(queryStartChargeDTO); - return CommonResult.success(Integer.parseInt(map.get("Ret")), map.get("Msg"), map.get("Data"), map.get("Sig")); + return CommonResult.success(0 , "请求令牌成功！" , map.get("Data") , map.get("Sig")); } catch (Exception e) { logger.error("{}-查询业务策略信息结果 error:", platformName, e); } @@ -287,7 +289,7 @@ public class XDTController extends ThirdPartyBaseController { // 执行逻辑 Map map = platformLogic.queryEquipChargeStatus(queryEquipChargeStatusDTO); - return CommonResult.success(Integer.parseInt(map.get("Ret")), map.get("Msg"), map.get("Data"), map.get("Sig")); + return CommonResult.success(0 , "请求令牌成功！" , map.get("Data") , map.get("Sig")); } catch (Exception e) { logger.error("{}-查询充电状态 error:", platformName, e); } @@ -326,7 +328,7 @@ public class XDTController extends ThirdPartyBaseController { // 执行逻辑 Map map = platformLogic.queryStationStatus(queryStationInfoDTO); - return CommonResult.success(Integer.parseInt(map.get("Ret")), map.get("Msg"), map.get("Data"), map.get("Sig")); + return CommonResult.success(0 , "请求令牌成功！" , map.get("Data") , map.get("Sig")); } catch (Exception e) { logger.error("{}-查询充电站状态信息 error:", platformName, e); } @@ -365,7 +367,7 @@ public class XDTController extends ThirdPartyBaseController { // 执行逻辑 Map map = platformLogic.queryStartCharge(queryStartChargeDTO); - return CommonResult.success(Integer.parseInt(map.get("Ret")), map.get("Msg"), map.get("Data"), map.get("Sig")); + return CommonResult.success(0 , "请求令牌成功！" , map.get("Data") , map.get("Sig")); } catch (Exception e) { logger.error("{}-请求启动充电 error:", platformName, e); } @@ -403,7 +405,7 @@ public class XDTController extends ThirdPartyBaseController { // 执行逻辑 Map map = platformLogic.queryStopCharge(queryStartChargeDTO); - return CommonResult.success(Integer.parseInt(map.get("Ret")), map.get("Msg"), map.get("Data"), map.get("Sig")); + return CommonResult.success(0 , "请求令牌成功！" , map.get("Data") , map.get("Sig")); } catch (Exception e) { logger.error("{}-请求停止充电 error:", platformName, e); } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/XinDiantuPlatfromServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/XinDiantuPlatfromServiceImpl.java index a297fc67c..215d23972 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/XinDiantuPlatfromServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/XinDiantuPlatfromServiceImpl.java @@ -436,9 +436,7 @@ public class XinDiantuPlatfromServiceImpl implements ThirdPartyPlatformService { vo.setFailReason(failReason); // 设备检测失败 vo.setFailReasonMsg(failReasonMsg); - Map resultMap = ThirdPartyPlatformUtils.generateResultMapV2(vo, thirdPartySecretInfoVO.getOurDataSecret(), - thirdPartySecretInfoVO.getOurDataSecretIv(), thirdPartySecretInfoVO.getTheirSigSecret()); - return resultMap; + return ThirdPartyPlatformUtils.generateResultMap(vo, thirdPartySecretInfoVO); }