From 15dcbd07dfb421e81bf2401cc37b8a6bca6d4211 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 十月 2025 18:34:49 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 13 +++++++++----
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/util/TaskUtil.java | 2 +-
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java | 1 +
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java | 2 +-
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java | 2 +-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 1 +
6 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
index 49a5dc5..c1d17cf 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
@@ -430,7 +430,7 @@
private ConnectorStatusInfo buildConnectorStatus(TChargingGun chargingGun){
ConnectorStatusInfo connectorStatusInfo = new ConnectorStatusInfo();
- connectorStatusInfo.setConnectorId(chargingGun.getCode());
+ connectorStatusInfo.setConnectorId(chargingGun.getFullNumber());
switch (chargingGun.getStatus()){
case 1:
connectorStatusInfo.setStatus(0);
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
index 2756dc1..9cf18a7 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
@@ -373,7 +373,7 @@
return new ArrayList<ConnectorInfo>(){{
for (TChargingGun chargingGun : list) {
ConnectorInfo connectorInfo = new ConnectorInfo();
- connectorInfo.setConnectorId(chargingGun.getCode());
+ connectorInfo.setConnectorId(chargingGun.getFullNumber());
connectorInfo.setConnectorName(chargingGun.getName());
connectorInfo.setConnectorType(0 == chargingGun.getType() ? 6 : chargingGun.getType());
connectorInfo.setVoltageUpperLimits(chargingGun.getUpperRatedVoltage().intValue());
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/util/TaskUtil.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/util/TaskUtil.java
index 1060a87..4297dc1 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/util/TaskUtil.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/util/TaskUtil.java
@@ -102,7 +102,7 @@
return new ArrayList<ConnectorStatusInfo>(){{
for (TChargingGun chargingGun : list) {
ConnectorStatusInfo connectorStatusInfo = new ConnectorStatusInfo();
- connectorStatusInfo.setConnectorId(chargingGun.getCode());
+ connectorStatusInfo.setConnectorId(chargingGun.getFullNumber());
switch (chargingGun.getStatus()){
case 1:
connectorStatusInfo.setStatus(0);
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 6ba363b..27425b7 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
@@ -1350,6 +1350,7 @@
//执行停机操作
R r = chargingOrderClient.tripartitePlatformStopCharge(queryStopCharge.getStartChargeSeq());
if(200 != r.getCode()){
+ log.info("三方平台请求停止充电失败：" + r.getMsg());
queryStopChargeResult.setStartChargeSeqStat(5);
queryStopChargeResult.setSuccStat(1);
queryStopChargeResult.setFailReason(3);
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index f7bf4dc..0c89614 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -919,6 +919,7 @@
@ApiImplicitParam(name = "id", value = "订单id", required = true)
})
public AjaxResult stopCharging(@PathVariable String id) {
+ log.info("小程序主动发起停止充电，订单ID：{}", id);
return chargingOrderService.stopCharging(id);
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index 0269952..070bbbc 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1277,12 +1277,14 @@
}
Long userId = tokenService.getLoginUserApplet().getUserId();
if (!order.getAppUserId().equals(userId)) {
+ log.info("【" + order.getCode() + "】主动停止充电失败，用户权限不足。当前登录用户id：{}，订单用户id：{}", userId, order.getAppUserId());
return AjaxResult.error("权限不足");
}
order.setEndTime(LocalDateTime.now());
order.setStatus(4);
order.setEndMode(1);
this.updateById(order);
+ log.info("【" + order.getCode() + "】主动停止充电成功，订单状态已被修改。");
String code1 = order.getCode();
TChargingGun chargingGun = chargingGunClient.getChargingGunById(order.getChargingGunId()).getData();
@@ -4133,12 +4135,16 @@
*/
@Override
public R tripartitePlatformStopCharge(String startChargeSeq) {
+ log.info("三方平台请求停止充电：" + startChargeSeq);
TChargingOrder order = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getStartChargeSeq, startChargeSeq));
Integer status = order.getStatus();
+ String code1 = order.getCode();
if (status != 3) {
+ log.info("【" + code1 + "】三方平台请求停止充电失败：还未开始充电");
return R.fail("还未开始充电");
}
if (status == 4 || status == 5) {
+ log.info("【" + code1 + "】三方平台请求停止充电：不能重复操作");
return R.fail("不能重复操作");
}
TChargingOrder chargingOrder = new TChargingOrder();
@@ -4148,12 +4154,10 @@
chargingOrder.setStatus(4);
chargingOrder.setEndMode(1);
this.updateById(chargingOrder);
- Site site = siteClient.getSiteByIds(Arrays.asList(chargingOrder.getSiteId())).getData().get(0);
+ Site site = siteClient.getSiteByIds(Arrays.asList(order.getSiteId())).getData().get(0);
if(1 == site.getIsOpenSynchronization()){
tcecClient.notificationEquipChargeStatus(order.getStartChargeSeq(), order.getOperatorId());
}
-
- String code1 = order.getCode();
TChargingGun chargingGun = chargingGunClient.getChargingGunById(order.getChargingGunId()).getData();
//异步线程处理停机
ExecutorService cachedThreadPool = Executors.newFixedThreadPool(1);
@@ -4163,8 +4167,9 @@
PlatformStopCharging platformStopCharging = new PlatformStopCharging();
platformStopCharging.setCharging_pile_code(chargingPile.getCode());
platformStopCharging.setCharging_gun_code(chargingGun.getCode());
+ log.info("【" + code1 + "】三方平台请求停止充电发起消息：" + JSON.toJSONString(platformStopCharging));
sendMessageClient.platformStopCharging(platformStopCharging);
- log.info(code1 + "：-------------------远程停止充电请求-------------------");
+ log.info("【" + code1 + "】三方平台请求停止充电发起消息结束");
log.info(platformStopCharging.toString());
});
return R.ok();
--
Gitblit v1.7.1