From e44b365b8a4e2520dd4cae1ce6adef9169f70b53 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 15 七月 2025 19:13:21 +0800
Subject: [PATCH] 政务云数据上传、川易充bug修改
---
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/ChargingMessageController.java | 45 ----------------------
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/TaskUtil.java | 45 ----------------------
2 files changed, 0 insertions(+), 90 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);
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/TaskUtil.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/TaskUtil.java
index 2df955e..c3bd646 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/TaskUtil.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/TaskUtil.java
@@ -178,51 +178,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