From 1affeef32cf30a1765ee749db0344258058b4e2e Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 24 七月 2025 16:24:21 +0800
Subject: [PATCH] 大屏替换路径
---
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/TaskUtil.java | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
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 4c2d906..4d12d1b 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
@@ -1,6 +1,9 @@
package com.ruoyi.jianguan.util;
import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.jianguan.model.ConnectorStatusInfo;
@@ -9,10 +12,13 @@
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.vo.TChargingOrderVo;
import com.ruoyi.other.api.domain.Operator;
+import com.ruoyi.other.api.domain.TSystemConfiguration;
+import com.ruoyi.other.api.feignClient.OtherClient;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -39,6 +45,11 @@
private TCECSuperviseUtil tcecSuperviseUtil;
@Resource
private ChargingOrderClient chargingOrderClient;
+ @Resource
+ private AppUserClient appUserClient;
+
+ @Resource
+ private OtherClient otherClient;
@Resource
private RedisTemplate redisTemplate;
@@ -129,11 +140,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());
+ log.info("川逸充用户信息"+data);
+ if (StringUtils.hasLength(data.getPhone())){
+ jsonObject.put("Mobile",data.getPhone());
+ }
LocalDateTime startTime = chargingOrder.getStartTime();
//状态（0=未知，1=等待中/已插枪，2=启动中，3=充电中，4=停止中，5=已结束）
@@ -167,16 +184,6 @@
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")));
- }
- chuanYiChongSuperviseUtil.notificationStationStatus(new Operator(), jsonObject);
break;
case 5:
jsonObject.put("StartChargeSeqStat",4);
@@ -283,6 +290,14 @@
}
});
}
-
-
+
+
+ @Scheduled(cron = "0 0 0 * * ?")
+ public void reset() {
+ String electricity = KsolarUtils.getElectricity();
+ otherClient.reset(electricity);
+
+ }
+
+
}
--
Gitblit v1.7.1