From c506c390edbb75a1af4a12c59e79f17ff2fdff40 Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 13 Mar 2024 14:00:30 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=20=E5=8D=8E=E4=B8=BA=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thirdparty/huawei/HuaWeiControllerV2.java | 18 +++++++++++++----- .../thirdparty/huawei/HuaweiServiceV2.java | 17 +++++++++++------ .../service/impl/LianLianServiceImpl.java | 6 +++--- 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiControllerV2.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiControllerV2.java index 68f16324f..2eb53f27e 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiControllerV2.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiControllerV2.java @@ -68,6 +68,7 @@ public class HuaWeiControllerV2 extends BaseController { ConnectorStatusInfo connectorStatusInfo = JSONObject.parseObject(dataStr, ConnectorStatusInfo.class); connectorStatusInfo.setOperatorId(dto.getOperatorID()); Map map = huaweiServiceV2.receiveNotificationStationStatus(connectorStatusInfo); + logger.info("华为设备接口状态变化推送 result:{}", map); return CommonResult.success(0, "设备接口状态变化推送成功！", map.get("Data"), map.get("Sig")); } @@ -86,6 +87,7 @@ public class HuaWeiControllerV2 extends BaseController { RequestEquipBusinessPolicyDTO requestEquipBusinessPolicyDTO = JSONObject.parseObject(dataStr, RequestEquipBusinessPolicyDTO.class); requestEquipBusinessPolicyDTO.setOperatorId(dto.getOperatorID()); Map map = huaweiServiceV2.requestEquipBusinessPolicy(requestEquipBusinessPolicyDTO); + logger.info("华为请求设备计费信息 result:{}", map); return CommonResult.success(0, "请求设备计费信息成功！", map.get("Data"), map.get("Sig")); } @@ -104,6 +106,7 @@ public class HuaWeiControllerV2 extends BaseController { ReceiveStartChargeResultDTO receiveStartChargeResultDTO = JSONObject.parseObject(dataStr, ReceiveStartChargeResultDTO.class); // receiveStartChargeResultDTO.setOperatorId(dto.getOperatorID()); Map map = huaweiServiceV2.receiveStartChargeResult(receiveStartChargeResultDTO); + logger.info("接收华为启动充电结果 result:{}", map); return CommonResult.success(0, "推送启动充电结果成功！", map.get("Data"), map.get("Sig")); } @@ -122,6 +125,7 @@ public class HuaWeiControllerV2 extends BaseController { ReceiveEquipChargeStatusDTO receiveEquipChargeStatusDTO = JSONObject.parseObject(dataStr, ReceiveEquipChargeStatusDTO.class); // receiveEquipChargeStatusDTO.setOperatorId(dto.getOperatorID()); Map map = huaweiServiceV2.receiveEquipChargeStatus(receiveEquipChargeStatusDTO); + logger.info("接收华为设备充电状态 result:{}", map); return CommonResult.success(0, "接收设备充电状态成功！", map.get("Data"), map.get("Sig")); } @@ -140,6 +144,7 @@ public class HuaWeiControllerV2 extends BaseController { ReceiveStopChargeResultVO receiveStopChargeResultVO = JSONObject.parseObject(dataStr, ReceiveStopChargeResultVO.class); // receiveStopChargeResultVO.setOperatorId(dto.getOperatorID()); Map map = huaweiServiceV2.receiveStopChargeResult(receiveStopChargeResultVO); + logger.info("接收华为停止充电结果 result:{}", map); return CommonResult.success(0, "接收停止充电结果成功！", map.get("Data"), map.get("Sig")); } @@ -157,6 +162,7 @@ public class HuaWeiControllerV2 extends BaseController { ReceiveOrderInfoDTO receiveOrderInfoDTO = JSONObject.parseObject(dataStr, ReceiveOrderInfoDTO.class); // receiveOrderInfoDTO.setOperatorId(dto.getOperatorID()); Map map = huaweiServiceV2.receiveOrderInfo(receiveOrderInfoDTO); + logger.info("接收华为订单信息 result:{}", map); return CommonResult.success(0, "接收订单信息成功！", map.get("Data"), map.get("Sig")); } @@ -176,6 +182,7 @@ public class HuaWeiControllerV2 extends BaseController { Map resultMap = null; try { resultMap = huaweiServiceV2.vinStartCharge(vinStartChargeDTO); + logger.info("华为vin启动充电 result:{}", resultMap); }catch (Exception e) { logger.error("华为vin启动充电 error", e); } @@ -200,6 +207,7 @@ public class HuaWeiControllerV2 extends BaseController { DeliverBusinessPolicyResponseDTO deliverPolicyResponseDTO = JSONObject.parseObject(dataStr, DeliverBusinessPolicyResponseDTO.class); // receiveOrderInfoDTO.setOperatorId(dto.getOperatorID()); Map map = huaweiServiceV2.receiveDeliverEquipBusinessPolicyResult(deliverPolicyResponseDTO); + logger.info("华为下发计费策略响应 result:{}", map); return CommonResult.success(0, "接收下发计费策略响应信息成功！", map.get("Data"), map.get("Sig")); } @@ -232,16 +240,16 @@ public class HuaWeiControllerV2 extends BaseController { * @return */ @PostMapping("/v2/query_station_status") - public List queryStationStatus(@RequestBody List stationIds) { + public String queryStationStatus(@RequestBody List stationIds) { logger.info("查询华为设备接口状态 stationIds:{}", stationIds); - List list = null; + String result = null; try { - list = huaweiServiceV2.queryStationStatus(stationIds); + result = huaweiServiceV2.queryStationStatus(stationIds); } catch (Exception e) { logger.error("查询华为设备接口状态 error", e); } - logger.info("查询华为设备接口状态 result:{}", list); - return list; + logger.info("查询华为设备接口状态 result:{}", result); + return result; } /** diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaweiServiceV2.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaweiServiceV2.java index e60554427..2e4497c13 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaweiServiceV2.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaweiServiceV2.java @@ -229,7 +229,7 @@ public class HuaweiServiceV2 { * @param stationIds * @return */ - public List queryStationStatus(List stationIds) { + public String queryStationStatus(List stationIds) { String requestName = "query_station_status"; // 拼装参数 @@ -241,15 +241,18 @@ public class HuaweiServiceV2 { String token = getHuaWeiToken(); // 发送请求 String result = sendMsg2HuaWei(jsonString, token, requestName); - if (result == null) { - return new ArrayList<>(); - } // 转换成 StationStatus 对象 - List list = JSON.parseArray(result, StationStatusInfo.class); - return list; + // List list = JSON.parseArray(result, StationStatusInfo.class); + return result; } + public static void main(String[] args) { + String result = "{\"StationStatusInfos\":[{\"ConnectorStatusInfos\":[{\"ConnectorID\":\"8823000000112302\",\"Status\":2},{\"ConnectorID\":\"8823000000112301\",\"Status\":2}],\"StationID\":\"19\"}]}"; + JSONObject jsonObject = JSONObject.parseObject(result); + System.out.println(jsonObject); + } + /** * 接收设备接口状态变化推送 * 需在Controller传入operatorId @@ -857,6 +860,7 @@ public class HuaweiServiceV2 { * @return 请求结果 */ private String sendMsg2HuaWei(String jsonString, String token, String requestName) { + log.info("向华为发送请求 jsonString:{}, token:{}, requestName:{}", jsonString, token, requestName); ThirdPartySettingInfo settingInfo = getHuaWeiSettingInfo(); if (settingInfo == null) { return null; @@ -909,6 +913,7 @@ public class HuaweiServiceV2 { * @return */ private Map getResultMap(JSONObject jsonObject) { + log.info("加密华为数据 jsonObject:{}", jsonObject.toJSONString()); String operatorId = ThirdPartyOperatorIdEnum.HUA_WEI.getOperatorId(); ThirdPartyPlatformConfig platformConfig = thirdPartyPlatformConfigService.getInfoByOperatorId(operatorId); if (platformConfig == null) { 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 8cb5118ee..a549d5e68 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 @@ -384,10 +384,10 @@ public class LianLianServiceImpl implements LianLianService { public static void main(String[] args) throws UnsupportedEncodingException { - String dataSecret = "E6gnWuz0QzBW75CR"; // SPBNJ1Z5EQNmpK08 VTAEKDPVN9CUS7WO - String dataSecretIV = "SXejaSUx5yud8UHm"; // peRoTcb2C7zqKeII 83UZFFRRZDYNF5CR + String dataSecret = "zd4NrLWJ38XCTaqP"; // SPBNJ1Z5EQNmpK08 VTAEKDPVN9CUS7WO huawei: zd4NrLWJ38XCTaqP E6gnWuz0QzBW75CR + String dataSecretIV = "RJJecvNTJ48SGMG7"; // peRoTcb2C7zqKeII 83UZFFRRZDYNF5CR huawei: RJJecvNTJ48SGMG7 SXejaSUx5yud8UHm String signSecret = "sRjCDeokckFGpYpA"; // sRjCDeokckFGpYpA - String dataString = "GZlmSIZOVzT+Yvpc2PmvNr2P2qkhe5aubvzxs/F8zMuiJdVOJZ8JkH8x1UbBloCETEcTrxb1F/VIeQqnMVE+9nDv5/mg3717jl9Tk6sHCBxfCH8lO9jisLF58YNcKzJB"; + String dataString = "E+V2sg+xpOjwWcqI9IQVgrN0gIs6tfyeKltpvB2G4mbQLtZREPk7bo7Q22k00/ufrcz+xZa9x/MyAzA3Eo2ZEo9UFKKKG3VLB+nfYX/kWWk="; // 解密data byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(dataString), dataSecret.getBytes(), dataSecretIV.getBytes());