autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-17 16:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 华为相关接口添加日志

Browse Source
This commit is contained in:
Lemon
2024-03-13 14:00:30 +08:00
parent 07bb61fcb1
commit c506c390ed
3 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiControllerV2.java vendored
View File

@@ -68,6 +68,7 @@ public class HuaWeiControllerV2 extends BaseController {
ConnectorStatusInfo connectorStatusInfo = JSONObject.parseObject(dataStr, ConnectorStatusInfo.class); ConnectorStatusInfo connectorStatusInfo = JSONObject.parseObject(dataStr, ConnectorStatusInfo.class);
connectorStatusInfo.setOperatorId(dto.getOperatorID()); connectorStatusInfo.setOperatorId(dto.getOperatorID());
Map<String, String> map = huaweiServiceV2.receiveNotificationStationStatus(connectorStatusInfo); Map<String, String> map = huaweiServiceV2.receiveNotificationStationStatus(connectorStatusInfo);
logger.info("华为设备接口状态变化推送 result:{}", map);
return CommonResult.success(0, "设备接口状态变化推送成功！", map.get("Data"), map.get("Sig")); 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 requestEquipBusinessPolicyDTO = JSONObject.parseObject(dataStr, RequestEquipBusinessPolicyDTO.class);
requestEquipBusinessPolicyDTO.setOperatorId(dto.getOperatorID()); requestEquipBusinessPolicyDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = huaweiServiceV2.requestEquipBusinessPolicy(requestEquipBusinessPolicyDTO); Map<String, String> map = huaweiServiceV2.requestEquipBusinessPolicy(requestEquipBusinessPolicyDTO);
logger.info("华为请求设备计费信息 result:{}", map);
return CommonResult.success(0, "请求设备计费信息成功！", map.get("Data"), map.get("Sig")); 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 receiveStartChargeResultDTO = JSONObject.parseObject(dataStr, ReceiveStartChargeResultDTO.class);
// receiveStartChargeResultDTO.setOperatorId(dto.getOperatorID()); // receiveStartChargeResultDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = huaweiServiceV2.receiveStartChargeResult(receiveStartChargeResultDTO); Map<String, String> map = huaweiServiceV2.receiveStartChargeResult(receiveStartChargeResultDTO);
logger.info("接收华为启动充电结果 result:{}", map);
return CommonResult.success(0, "推送启动充电结果成功！", map.get("Data"), map.get("Sig")); 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 receiveEquipChargeStatusDTO = JSONObject.parseObject(dataStr, ReceiveEquipChargeStatusDTO.class);
// receiveEquipChargeStatusDTO.setOperatorId(dto.getOperatorID()); // receiveEquipChargeStatusDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = huaweiServiceV2.receiveEquipChargeStatus(receiveEquipChargeStatusDTO); Map<String, String> map = huaweiServiceV2.receiveEquipChargeStatus(receiveEquipChargeStatusDTO);
logger.info("接收华为设备充电状态 result:{}", map);
return CommonResult.success(0, "接收设备充电状态成功！", map.get("Data"), map.get("Sig")); 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 receiveStopChargeResultVO = JSONObject.parseObject(dataStr, ReceiveStopChargeResultVO.class);
// receiveStopChargeResultVO.setOperatorId(dto.getOperatorID()); // receiveStopChargeResultVO.setOperatorId(dto.getOperatorID());
Map<String, String> map = huaweiServiceV2.receiveStopChargeResult(receiveStopChargeResultVO); Map<String, String> map = huaweiServiceV2.receiveStopChargeResult(receiveStopChargeResultVO);
logger.info("接收华为停止充电结果 result:{}", map);
return CommonResult.success(0, "接收停止充电结果成功！", map.get("Data"), map.get("Sig")); 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 receiveOrderInfoDTO = JSONObject.parseObject(dataStr, ReceiveOrderInfoDTO.class);
// receiveOrderInfoDTO.setOperatorId(dto.getOperatorID()); // receiveOrderInfoDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = huaweiServiceV2.receiveOrderInfo(receiveOrderInfoDTO); Map<String, String> map = huaweiServiceV2.receiveOrderInfo(receiveOrderInfoDTO);
logger.info("接收华为订单信息 result:{}", map);
return CommonResult.success(0, "接收订单信息成功！", map.get("Data"), map.get("Sig")); return CommonResult.success(0, "接收订单信息成功！", map.get("Data"), map.get("Sig"));
} }
@@ -176,6 +182,7 @@ public class HuaWeiControllerV2 extends BaseController {
Map<String, String> resultMap = null; Map<String, String> resultMap = null;
try { try {
resultMap = huaweiServiceV2.vinStartCharge(vinStartChargeDTO); resultMap = huaweiServiceV2.vinStartCharge(vinStartChargeDTO);
logger.info("华为vin启动充电 result:{}", resultMap);
}catch (Exception e) { }catch (Exception e) {
logger.error("华为vin启动充电 error", e); logger.error("华为vin启动充电 error", e);
} }
@@ -200,6 +207,7 @@ public class HuaWeiControllerV2 extends BaseController {
DeliverBusinessPolicyResponseDTO deliverPolicyResponseDTO = JSONObject.parseObject(dataStr, DeliverBusinessPolicyResponseDTO.class); DeliverBusinessPolicyResponseDTO deliverPolicyResponseDTO = JSONObject.parseObject(dataStr, DeliverBusinessPolicyResponseDTO.class);
// receiveOrderInfoDTO.setOperatorId(dto.getOperatorID()); // receiveOrderInfoDTO.setOperatorId(dto.getOperatorID());
Map<String, String> map = huaweiServiceV2.receiveDeliverEquipBusinessPolicyResult(deliverPolicyResponseDTO); Map<String, String> map = huaweiServiceV2.receiveDeliverEquipBusinessPolicyResult(deliverPolicyResponseDTO);
logger.info("华为下发计费策略响应 result:{}", map);
return CommonResult.success(0, "接收下发计费策略响应信息成功！", map.get("Data"), map.get("Sig")); return CommonResult.success(0, "接收下发计费策略响应信息成功！", map.get("Data"), map.get("Sig"));
} }
@@ -232,16 +240,16 @@ public class HuaWeiControllerV2 extends BaseController {
* @return * @return
*/ */
@PostMapping("/v2/query_station_status") @PostMapping("/v2/query_station_status")
public List<StationStatusInfo> queryStationStatus(@RequestBody List<String> stationIds) { public String queryStationStatus(@RequestBody List<String> stationIds) {
logger.info("查询华为设备接口状态 stationIds:{}", stationIds); logger.info("查询华为设备接口状态 stationIds:{}", stationIds);
List<StationStatusInfo> list = null; String result = null;
try { try {
list = huaweiServiceV2.queryStationStatus(stationIds); result = huaweiServiceV2.queryStationStatus(stationIds);
} catch (Exception e) { } catch (Exception e) {
logger.error("查询华为设备接口状态 error", e); logger.error("查询华为设备接口状态 error", e);
} }
logger.info("查询华为设备接口状态 result:{}", list); logger.info("查询华为设备接口状态 result:{}", result);
return list; return result;
} }
/** /**

17
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaweiServiceV2.java vendored
View File

@@ -229,7 +229,7 @@ public class HuaweiServiceV2 {
* @param stationIds * @param stationIds
* @return * @return
*/ */
public List<StationStatusInfo> queryStationStatus(List<String> stationIds) { public String queryStationStatus(List<String> stationIds) {
String requestName = "query_station_status"; String requestName = "query_station_status";
// 拼装参数 // 拼装参数
@@ -241,15 +241,18 @@ public class HuaweiServiceV2 {
String token = getHuaWeiToken(); String token = getHuaWeiToken();
// 发送请求 // 发送请求
String result = sendMsg2HuaWei(jsonString, token, requestName); String result = sendMsg2HuaWei(jsonString, token, requestName);
if (result == null) {
return new ArrayList<>();
}
// 转换成 StationStatus 对象 // 转换成 StationStatus 对象
List<StationStatusInfo> list = JSON.parseArray(result, StationStatusInfo.class); // List<StationStatusInfo> list = JSON.parseArray(result, StationStatusInfo.class);
return list; 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 * 需在Controller传入operatorId
@@ -857,6 +860,7 @@ public class HuaweiServiceV2 {
* @return 请求结果 * @return 请求结果
*/ */
private String sendMsg2HuaWei(String jsonString, String token, String requestName) { private String sendMsg2HuaWei(String jsonString, String token, String requestName) {
log.info("向华为发送请求 jsonString:{}, token:{}, requestName:{}", jsonString, token, requestName);
ThirdPartySettingInfo settingInfo = getHuaWeiSettingInfo(); ThirdPartySettingInfo settingInfo = getHuaWeiSettingInfo();
if (settingInfo == null) { if (settingInfo == null) {
return null; return null;
@@ -909,6 +913,7 @@ public class HuaweiServiceV2 {
* @return * @return
*/ */
private Map<String, String> getResultMap(JSONObject jsonObject) { private Map<String, String> getResultMap(JSONObject jsonObject) {
log.info("加密华为数据 jsonObject:{}", jsonObject.toJSONString());
String operatorId = ThirdPartyOperatorIdEnum.HUA_WEI.getOperatorId(); String operatorId = ThirdPartyOperatorIdEnum.HUA_WEI.getOperatorId();
ThirdPartyPlatformConfig platformConfig = thirdPartyPlatformConfigService.getInfoByOperatorId(operatorId); ThirdPartyPlatformConfig platformConfig = thirdPartyPlatformConfigService.getInfoByOperatorId(operatorId);
if (platformConfig == null) { if (platformConfig == null) {

6
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java vendored
View File

@@ -384,10 +384,10 @@ public class LianLianServiceImpl implements LianLianService {
public static void main(String[] args) throws UnsupportedEncodingException { public static void main(String[] args) throws UnsupportedEncodingException {
String dataSecret = "E6gnWuz0QzBW75CR"; // SPBNJ1Z5EQNmpK08 VTAEKDPVN9CUS7WO String dataSecret = "zd4NrLWJ38XCTaqP"; // SPBNJ1Z5EQNmpK08 VTAEKDPVN9CUS7WO huawei: zd4NrLWJ38XCTaqP E6gnWuz0QzBW75CR
String dataSecretIV = "SXejaSUx5yud8UHm"; // peRoTcb2C7zqKeII 83UZFFRRZDYNF5CR String dataSecretIV = "RJJecvNTJ48SGMG7"; // peRoTcb2C7zqKeII 83UZFFRRZDYNF5CR huawei: RJJecvNTJ48SGMG7 SXejaSUx5yud8UHm
String signSecret = "sRjCDeokckFGpYpA"; // sRjCDeokckFGpYpA String signSecret = "sRjCDeokckFGpYpA"; // sRjCDeokckFGpYpA
String dataString = "GZlmSIZOVzT+Yvpc2PmvNr2P2qkhe5aubvzxs/F8zMuiJdVOJZ8JkH8x1UbBloCETEcTrxb1F/VIeQqnMVE+9nDv5/mg3717jl9Tk6sHCBxfCH8lO9jisLF58YNcKzJB"; String dataString = "E+V2sg+xpOjwWcqI9IQVgrN0gIs6tfyeKltpvB2G4mbQLtZREPk7bo7Q22k00/ufrcz+xZa9x/MyAzA3Eo2ZEo9UFKKKG3VLB+nfYX/kWWk=";
// 解密data // 解密data
byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(dataString), dataSecret.getBytes(), dataSecretIV.getBytes()); byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(dataString), dataSecret.getBytes(), dataSecretIV.getBytes());