From 5e6b9cdb9cdf8c9362491b337a4e15bf1a107125 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 10 二月 2025 11:14:21 +0800
Subject: [PATCH] 修改bug
---
ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/feignClient/BmsDemandAndChargerExportationClient.java | 2
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 5 ++
ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml | 10 ++--
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java | 34 ++++++++++++-----
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/controller/BmsDemandAndChargerExportationController.java | 2
ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml | 56 ++++++++++++++--------------
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 4 ++
7 files changed, 68 insertions(+), 45 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/feignClient/BmsDemandAndChargerExportationClient.java b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/feignClient/BmsDemandAndChargerExportationClient.java
index 9130248..f980896 100644
--- a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/feignClient/BmsDemandAndChargerExportationClient.java
+++ b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/feignClient/BmsDemandAndChargerExportationClient.java
@@ -22,6 +22,6 @@
* @return
*/
@PostMapping("/bmsDemandAndChargerExportation/getBmsDemandAndChargerExportation")
- R<BmsDemandAndChargerExportation> getBmsDemandAndChargerExportation(@RequestParam("orderCode") String orderCode);
+ R<BmsDemandAndChargerExportation> getBmsDemandAndChargerExportation(@RequestParam(value = "orderCode") String orderCode);
}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
index ef2e441..30cc8bd 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
@@ -83,6 +83,10 @@
@TableField("app_user_car_id")
private Long appUserCarId;
+ @ApiModelProperty(value = "充电车辆车牌号")
+ @TableField("plate_num")
+ private String plateNum;
+
@ApiModelProperty(value = "站点 id")
@TableField("site_id")
private Integer siteId;
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
index c8f030b..dbd2ab0 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -11,8 +11,8 @@
allow-bean-definition-overriding: true
profiles:
# 环境配置
-# active: dev
- active: prod
+ active: dev
+# active: prod
---
spring:
config:
@@ -55,52 +55,52 @@
type: nacos
nacos:
# 开发环境
-# server-addr: 192.168.110.169:8848
-# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
-# group: DEFAULT_GROUP
-# data-id: seata-server.properties
-# username: nacos
-# password: nacos
- # 生产环境
- server-addr: 192.168.0.137:8848,192.168.0.123:8848
- namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+ server-addr: 192.168.110.169:8848
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
group: DEFAULT_GROUP
data-id: seata-server.properties
username: nacos
password: nacos
+ # 生产环境
+# server-addr: 192.168.0.137:8848,192.168.0.123:8848
+# namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+# group: DEFAULT_GROUP
+# data-id: seata-server.properties
+# username: nacos
+# password: nacos
registry:
type: nacos
nacos:
application: seata-server
# 开发环境
-# server-addr: 192.168.110.169:8848
-# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
-# group: DEFAULT_GROUP
-# username: nacos
-# password: nacos
- # 生产环境
- server-addr: 192.168.0.137:8848,192.168.0.123:8848
- namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+ server-addr: 192.168.110.169:8848
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
group: DEFAULT_GROUP
username: nacos
password: nacos
+ # 生产环境
+# server-addr: 192.168.0.137:8848,192.168.0.123:8848
+# namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+# group: DEFAULT_GROUP
+# username: nacos
+# password: nacos
cloud:
nacos:
discovery:
# 开发环境
-# server-addr: 192.168.110.169:8848 # nacos注册中心地址
-# namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
-# group: DEFAULT_GROUP
-# application: seata-server #Nacos 中 Seata 名称
-# username: nacos
-# password: nacos
- # 生产环境
- server-addr: 192.168.0.137:8848,192.168.0.123:8848
- namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+ server-addr: 192.168.110.169:8848 # nacos注册中心地址
+ namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
group: DEFAULT_GROUP
application: seata-server #Nacos 中 Seata 名称
username: nacos
password: nacos
+ # 生产环境
+# server-addr: 192.168.0.137:8848,192.168.0.123:8848
+# namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+# group: DEFAULT_GROUP
+# application: seata-server #Nacos 中 Seata 名称
+# username: nacos
+# password: nacos
sentinel:
transport:
dashboard: 127.0.0.1:8080 # Sentinel控制台地址
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/controller/BmsDemandAndChargerExportationController.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/controller/BmsDemandAndChargerExportationController.java
index 2018927..8c63a26 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/controller/BmsDemandAndChargerExportationController.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/controller/BmsDemandAndChargerExportationController.java
@@ -33,7 +33,7 @@
* @return
*/
@PostMapping("/getBmsDemandAndChargerExportation")
- public R<BmsDemandAndChargerExportation> getBmsDemandAndChargerExportation(@RequestParam("orderCode") String orderCode){
+ public R<BmsDemandAndChargerExportation> getBmsDemandAndChargerExportation(@RequestParam(value = "orderCode") String orderCode){
List<BmsDemandAndChargerExportation> bmsDemandAndChargerExportation = bmsDemandAndChargerExportationService.getBmsDemandAndChargerExportation(orderCode);
if(bmsDemandAndChargerExportation.size() > 0){
BmsDemandAndChargerExportation uploadRealTimeMonitoringData = bmsDemandAndChargerExportation.get(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 f3f6243..11e81bc 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
@@ -32,9 +32,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
import java.util.stream.Collectors;
/**
@@ -976,6 +974,22 @@
}
});
}
+
+ //定义定时任务推送订单状态
+ ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
+ Runnable task = new Runnable() {
+ @Override
+ public void run() {
+ TChargingOrder chargingOrder = chargingOrderClient.getChargingOrderByStartChargeSeq(result.getStartChargeSeq()).getData();
+ if(null == chargingOrder || chargingOrder.getStatus() != 3){
+ scheduler.shutdown();
+ return;
+ }
+ notificationEquipChargeStatus(result.getStartChargeSeq(), operator.getId());
+ }
+ };
+ //一分钟执行一次
+ scheduler.scheduleAtFixedRate(task, 1, 1, TimeUnit.MINUTES);
return R.ok();
}
@@ -1079,7 +1093,7 @@
queryEquipChargeStatusResult.setVoltageA(chargingOrder.getVoltage());
queryEquipChargeStatusResult.setSoc(chargingOrder.getTotalElectricity());
queryEquipChargeStatusResult.setStartTime((null == chargingOrder.getStartTime() ? chargingOrder.getCreateTime() : chargingOrder.getStartTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
- queryEquipChargeStatusResult.setEndTime((null == chargingOrder.getStartTime() ? LocalDateTime.now() : chargingOrder.getEndTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ queryEquipChargeStatusResult.setEndTime((null == chargingOrder.getEndTime() ? LocalDateTime.now() : chargingOrder.getEndTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
queryEquipChargeStatusResult.setTotalPower(chargingOrder.getElectricity());
queryEquipChargeStatusResult.setElecMoney(chargingOrder.getTotalElectricity());
queryEquipChargeStatusResult.setSeviceMoney(chargingOrder.getServiceCharge());
@@ -1090,7 +1104,7 @@
List<TChargingOrderAccountingStrategy> data = chargingOrderAccountingStrategyClient.getChargingOrderAccountingStrategyByOrderId(chargingOrder.getId()).getData();
LocalDateTime startTime = chargingOrder.getStartTime();
- LocalDateTime endTime = chargingOrder.getEndTime();
+ LocalDateTime endTime = null == chargingOrder.getEndTime() ? LocalDateTime.now() : chargingOrder.getEndTime();
String s_format = startTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
String e_format = endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
for (TChargingOrderAccountingStrategy datum : data) {
@@ -1126,7 +1140,7 @@
* @return
*/
@PostMapping("/notificationEquipChargeStatus")
- public R notificationEquipChargeStatus(@RequestParam("startChargeSeq") String startChargeSeq, @RequestParam("operatorId") Integer operatorId){
+ public R notificationEquipChargeStatus(@RequestParam(value = "startChargeSeq") String startChargeSeq, @RequestParam(value = "operatorId") Integer operatorId){
QueryEquipChargeStatusResult queryEquipChargeStatusResult = buildQueryEquipChargeStatusResult(startChargeSeq);
Operator operator = operatorClient.getOperatorById(operatorId).getData();
NotificationEquipChargeStatusResult notificationEquipChargeStatusResult = TCECUtil.notificationEquipChargeStatus(operator, queryEquipChargeStatusResult);
@@ -1321,7 +1335,7 @@
}
notificationChargeOrderInfo.setConnectorID(chargingOrder.getChargingGunId().toString());
notificationChargeOrderInfo.setStartTime((null == chargingOrder.getStartTime() ? chargingOrder.getCreateTime() : chargingOrder.getStartTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
- notificationChargeOrderInfo.setEndTime((null == chargingOrder.getStartTime() ? LocalDateTime.now() : chargingOrder.getEndTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ notificationChargeOrderInfo.setEndTime((null == chargingOrder.getEndTime() ? LocalDateTime.now() : chargingOrder.getEndTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
notificationChargeOrderInfo.setTotalPower(chargingOrder.getElectricity());
notificationChargeOrderInfo.setTotalElecMoney(chargingOrder.getTotalElectricity());
notificationChargeOrderInfo.setTotalSeviceMoney(chargingOrder.getServiceCharge());
@@ -1353,7 +1367,7 @@
List<TChargingOrderAccountingStrategy> data = chargingOrderAccountingStrategyClient.getChargingOrderAccountingStrategyByOrderId(chargingOrder.getId()).getData();
LocalDateTime startTime = chargingOrder.getStartTime();
- LocalDateTime endTime = chargingOrder.getEndTime();
+ LocalDateTime endTime = null == chargingOrder.getEndTime() ? LocalDateTime.now() : chargingOrder.getEndTime();
String s_format = startTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
String e_format = endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
for (TChargingOrderAccountingStrategy datum : data) {
@@ -1519,7 +1533,7 @@
orderInfo.setStartChargeSeq(chargingOrder.getStartChargeSeq());
orderInfo.setConnectorID(chargingOrder.getChargingGunId().toString());
orderInfo.setStartTime((null == chargingOrder.getStartTime() ? chargingOrder.getCreateTime() : chargingOrder.getStartTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
- orderInfo.setEndTime((null == chargingOrder.getStartTime() ? LocalDateTime.now() : chargingOrder.getEndTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ orderInfo.setEndTime((null == chargingOrder.getEndTime() ? LocalDateTime.now() : chargingOrder.getEndTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
orderInfo.setTotalPower(chargingOrder.getTotalElectricity());
orderInfo.setTotalElecMoney(chargingOrder.getElectrovalence());
orderInfo.setTotalSeviceMoney(chargingOrder.getServiceCharge());
@@ -1544,7 +1558,7 @@
List<TChargingOrderAccountingStrategy> data = chargingOrderAccountingStrategyClient.getChargingOrderAccountingStrategyByOrderId(chargingOrder.getId()).getData();
LocalDateTime startTime = chargingOrder.getStartTime();
- LocalDateTime endTime = chargingOrder.getEndTime();
+ LocalDateTime endTime = null == chargingOrder.getEndTime() ? LocalDateTime.now() : chargingOrder.getEndTime();
String s_format = startTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
String e_format = endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
for (TChargingOrderAccountingStrategy datum : data) {
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 461958a..6268f1e 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
@@ -459,6 +459,10 @@
chargingOrder.setOrderClassification(1);
chargingOrder.setAppUserId(userId);
chargingOrder.setAppUserCarId(addChargingOrder.getAppUserCarId());
+ TAppUserCar userCar = appUserCarClient.getCarById(addChargingOrder.getAppUserCarId().toString()).getData();
+ if(null != userCar){
+ chargingOrder.setPlateNum(userCar.getLicensePlate());
+ }
TChargingGun tChargingGun = chargingGunClient.getChargingGunById(addChargingOrder.getId()).getData();
TChargingPile chargingPile = chargingPileClient.getChargingPileById(tChargingGun.getChargingPileId()).getData();
chargingOrder.setSiteId(tChargingGun.getSiteId());
@@ -4058,6 +4062,7 @@
if(null != appUserCar){
chargingOrder.setAppUserCarId(appUserCar.getId());
}
+ chargingOrder.setPlateNum(query.getPlateNum());
}
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml
index ec14335..5592450 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml
@@ -23,7 +23,7 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 127.0.0.1:8848
+ server-addr: 192.168.110.169:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
@@ -31,7 +31,7 @@
password: nacos
config:
# 配置中心地址
- server-addr: 127.0.0.1:8848
+ server-addr: 192.168.110.169:8848
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
group: DEFAULT_GROUP
name: ${spring.application.name}
@@ -56,7 +56,7 @@
type: nacos
nacos:
# 开发环境
- server-addr: 127.0.0.1:8848
+ server-addr: 192.168.110.169:8848
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
group: DEFAULT_GROUP
data-id: seata-server.properties
@@ -74,7 +74,7 @@
nacos:
application: seata-server
# 开发环境
- server-addr: 127.0.0.1:8848
+ server-addr: 192.168.110.169:8848
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
group: DEFAULT_GROUP
username: nacos
@@ -89,7 +89,7 @@
nacos:
discovery:
# 开发环境
- server-addr: 127.0.0.1:8848
+ server-addr: 192.168.110.169:8848
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
group: DEFAULT_GROUP
application: seata-server #Nacos 中 Seata 名称
--
Gitblit v1.7.1