From ce3b68cce4b030e222448044adf7325d0c897376 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 13 二月 2025 14:02:00 +0800
Subject: [PATCH] 优化功能
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java
index 11e81bc..f931203 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java
@@ -271,7 +271,7 @@
stationInfo.setOperatorID("906171535");
stationInfo.setEquipmentOwnerID("906171535");
stationInfo.setStationName(datum.getName());
- stationInfo.setCountryCode(datum.getCountryCode());
+ stationInfo.setCountryCode(StringUtils.isNotEmpty(datum.getCountryCode()) ? datum.getCountryCode() : "CN");
stationInfo.setAreaCode(datum.getDistrictsCode());
stationInfo.setAddress(datum.getAddress());
stationInfo.setStationTel(datum.getPhone());
@@ -393,6 +393,7 @@
//构建设备接口信息
equipmentInfo.setConnectorInfos(buildConnectorInfos(tChargingPile.getId(), tChargingPile.getCode(), chargingGunList));
+ equipmentInfo.setPower(tChargingPile.getRatedPower());
equipmentInfos.add(equipmentInfo);
}
return equipmentInfos;
@@ -475,6 +476,9 @@
connectorStatusInfo.setStatus(255);
break;
}
+ ConnectorStatusInfo connectorStatusInfo1 = new ConnectorStatusInfo();
+ BeanUtils.copyProperties(connectorStatusInfo, connectorStatusInfo1);
+ connectorStatusInfo.setConnectorStatusInfo(connectorStatusInfo1);
List<Operator> operators = operatorClient.getAllOperator().getData();
for (Operator operator : operators) {
TCECUtil.notificationStationStatus(operator, connectorStatusInfo);
@@ -902,7 +906,7 @@
addTripartitePlatformOrder.setStartChargeSeq(queryStartCharge.getStartChargeSeq());
addTripartitePlatformOrder.setChargingGunId(tChargingGun.getId());
addTripartitePlatformOrder.setOperatorId(operator.getOperatorId());
- addTripartitePlatformOrder.setPaymentAmount(queryStartCharge.getChargingAmt());
+ addTripartitePlatformOrder.setPaymentAmount(null == queryStartCharge.getChargingAmt() ? new BigDecimal(9999) : queryStartCharge.getChargingAmt());
addTripartitePlatformOrder.setRechargePaymentType(0);
addTripartitePlatformOrder.setPlateNum(queryStartCharge.getPlateNum());
R order = chargingOrderClient.addTripartitePlatformOrder(addTripartitePlatformOrder);
@@ -1422,8 +1426,11 @@
QueryTerminalCode queryTerminalCode = JSON.parseObject(decrypt, QueryTerminalCode.class);
String qrCode = queryTerminalCode.getQRCode();
String substring = qrCode.substring(qrCode.indexOf("=") + 1);
+ TChargingGun chargingGun = chargingGunClient.getChargingGunByFullNumber(substring).getData();
QueryTerminalCodeResult queryTerminalCodeResult = new QueryTerminalCodeResult();
- queryTerminalCodeResult.setTerminalCode(substring);
+ if(null != chargingGun){
+ queryTerminalCodeResult.setTerminalCode(chargingGun.getId().toString());
+ }
//参数加密
String jsonString = JacksonUtils.toJson(queryTerminalCodeResult);
--
Gitblit v1.7.1