From 4c00e691a6c95efb5e4c19b8601d31f383578564 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 16 七月 2025 17:48:54 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/ChargingMessageController.java | 45 ---------------------------------------------
1 files changed, 0 insertions(+), 45 deletions(-)
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/ChargingMessageController.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/ChargingMessageController.java
index 333a281..d35b64f 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/ChargingMessageController.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/ChargingMessageController.java
@@ -200,51 +200,6 @@
chuanYiChongSuperviseUtil.notificationStationStatus(new Operator(), jsonObject);
break;
case 4:
- jsonObject.put("StartChargeSeqStat",4);
- int temp1 = 0;
- //充电枪状态（1=离线，2=空闲，3=占用（未充电），4=占用（充电中），5=占用（已充满），6=占用（预约锁定），7=故障）
- switch (chargingGun2.getStatus()){
- case 1:
- temp1 = 0;
- break;
- case 2:
- temp1=1;
- break;
- case 3:
- temp1=2;
- break;
- case 4:
- temp1=3;
- break;
- case 5:
- temp1=4;
- break;
- case 6:
- temp1=4;
- break;
- case 7:
- temp1 = 255;
- break;
- }
- jsonObject.put("ConnectorStatus",temp1);
-
- jsonObject.put("CurrentA",chargingOrder.getCurrent());
- jsonObject.put("VoltageA",chargingOrder.getVoltage());
- LocalDateTime startTime3 = chargingOrder.getStartTime();
-
- if (startTime3!=null){
- jsonObject.put("StartTime",startTime3.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
- }else{
- LocalDateTime now1 = LocalDateTime.now();
- // 转化为yyyy-MM-dd HH:mm:ss格式字符串
- jsonObject.put("StartTime",now1.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
- }
- LocalDateTime now1 = LocalDateTime.now();
- // 转化为yyyy-MM-dd HH:mm:ss格式字符串
- jsonObject.put("EndTime",now1.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
- jsonObject.put("TotalPower",chargingOrder.getElectricity());
- jsonObject.put("TotalMoney",chargingOrder.getOrderAmount());
- chuanYiChongSuperviseUtil.notificationSupEquipChargeStatus(new Operator(), jsonObject);
break;
case 5:
jsonObject.put("StartChargeSeqStat",4);
--
Gitblit v1.7.1