From cbf8b239ab852c52eb9db529333e9beb6add21ac Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 15 七月 2025 18:53:04 +0800
Subject: [PATCH] 政务云数据上传、川易充bug修改
---
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/ChargingMessageController.java | 91 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 74 insertions(+), 17 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 f3157a0..333a281 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
@@ -1,6 +1,8 @@
package com.ruoyi.jianguan.controller;
import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.chargingPile.api.feignClient.ChargingGunClient;
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.common.core.domain.R;
@@ -9,12 +11,12 @@
import com.ruoyi.jianguan.model.SupEquipChargeStatus;
import com.ruoyi.jianguan.util.ChuanYiChongSuperviseUtil;
import com.ruoyi.jianguan.util.TCECSuperviseUtil;
+import com.ruoyi.order.api.feignClient.ChargingOrderClient;
+import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.other.api.domain.Operator;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -39,8 +41,12 @@
@Resource
private ChargingGunClient chargingGunClient;
@Resource
+ private AppUserClient appUserClient;
+ @Resource
private ChuanYiChongSuperviseUtil chuanYiChongSuperviseUtil;
-
+ @Resource
+ private ChargingOrderClient chargingOrderClient;
+
/**
* 推送充电订单信息
@@ -152,13 +158,17 @@
supEquipChargeStatus.setEndTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
supEquipChargeStatus.setTotalPower(chargingOrder.getElectrovalence());
tcecSuperviseUtil.notificationSupEquipChargeStatus(new Operator(), supEquipChargeStatus);
+ TAppUser data = appUserClient.getUserById(chargingOrder.getAppUserId()).getData();
// 川逸充
if (chargingOrder.getRechargePaymentType()==3){
JSONObject jsonObject = new JSONObject();
jsonObject.put("StartChargeSeq",chargingOrder.getCode());
jsonObject.put("ConnectorID",chargingGun2.getFullNumber());
LocalDateTime startTime = chargingOrder.getStartTime();
-
+ log.info("川逸充用户信息"+data);
+ if (StringUtils.hasLength(data.getPhone())){
+ jsonObject.put("Mobile",data.getPhone());
+ }
//状态（0=未知，1=等待中/已插枪，2=启动中，3=充电中，4=停止中，5=已结束）
int tempStatus = 0;
switch (chargingOrder.getStatus()){
@@ -190,16 +200,51 @@
chuanYiChongSuperviseUtil.notificationStationStatus(new Operator(), jsonObject);
break;
case 4:
- tempStatus=3;
- jsonObject.put("StartChargeSeqStat",tempStatus);
- if (startTime!=null){
- jsonObject.put("StartTime",startTime.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
- }else{
- LocalDateTime now = LocalDateTime.now();
- // 转化为yyyy-MM-dd HH:mm:ss格式字符串
- jsonObject.put("StartTime",now.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ 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;
}
- chuanYiChongSuperviseUtil.notificationStationStatus(new Operator(), jsonObject);
+ 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);
@@ -229,11 +274,11 @@
break;
}
jsonObject.put("ConnectorStatus",temp);
-
+
jsonObject.put("CurrentA",chargingOrder.getCurrent());
jsonObject.put("VoltageA",chargingOrder.getVoltage());
LocalDateTime startTime2 = chargingOrder.getStartTime();
-
+
if (startTime2!=null){
jsonObject.put("StartTime",startTime2.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
}else{
@@ -252,4 +297,16 @@
}
return R.ok();
}
+
+ /**
+ * 查询订单状态
+ * @return
+ */
+ @ResponseBody
+ @GetMapping("/getOrderById")
+ public R pushOrderStatus(@RequestParam Long orderId){
+ log.info("川易充通过id查询订单:{}", orderId);
+ R<TChargingOrder> tChargingOrderR = chargingOrderClient.orderDetail(orderId);
+ return R.ok(tChargingOrderR.getData());
+ }
}
--
Gitblit v1.7.1