From ab71786f3018e33a8225a52dfd2e2d8bbb4e2258 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 18 九月 2025 14:34:16 +0800
Subject: [PATCH] 修改bug
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/GetChargingGunByChargingPileIdsVo.java | 11 +++++++++++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/LargeScreenController.java | 1 -
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java | 2 +-
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/GetChargingGunByChargingPileIdsVo.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/GetChargingGunByChargingPileIdsVo.java
new file mode 100644
index 0000000..4e422f5
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/GetChargingGunByChargingPileIdsVo.java
@@ -0,0 +1,11 @@
+package com.ruoyi.chargingPile.api.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class GetChargingGunByChargingPileIdsVo {
+
+ List<Integer> chargingPileIds;
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/LargeScreenController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/LargeScreenController.java
index 8a10c24..1643cef 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/LargeScreenController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/LargeScreenController.java
@@ -54,7 +54,6 @@
List<TChargingOrder> list = list1.stream().filter(e ->e.getCreateTime().toString().contains(time)).collect(Collectors.toList());
if(!list.isEmpty()){
- System.out.println(list);
list.stream().forEach(e -> {
if(e.getChargingPower()==null){
e.setChargingPower(BigDecimal.ZERO);
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
index 4529c75..9de497a 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
@@ -191,7 +191,7 @@
R r = chargingOrderService.endChargeBillingCharge(vo);
log.info("定时任务执行，停止中的订单处理结果：{}", JSON.toJSONString(r));
}else{
-// endOrder(order);
+ endOrder(order);
}
}
//处理状态为充电中，但硬件已完成的订单
--
Gitblit v1.7.1