From 15dcbd07dfb421e81bf2401cc37b8a6bca6d4211 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 十月 2025 18:34:49 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java | 178 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 131 insertions(+), 47 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
index 52fb479..c1d17cf 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
@@ -3,53 +3,55 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.chargingPile.api.model.*;
+import com.ruoyi.chargingPile.api.query.TChargingGunQuery;
+import com.ruoyi.chargingPile.api.vo.TChargingGunVO;
+import com.ruoyi.chargingPile.api.dto.PageChargingPileListDTO;
+import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.chargingPile.api.model.TFaultMessage;
-import com.ruoyi.chargingPile.api.query.TChargingGunQuery;
-import com.ruoyi.chargingPile.api.vo.TChargingGunVO;
+import com.ruoyi.chargingPile.api.query.BatchSetAccountingStrategy;
+import com.ruoyi.chargingPile.api.query.PageChargingPileList;
import com.ruoyi.chargingPile.api.vo.UpdateChargingPileStatusVo;
import com.ruoyi.chargingPile.dto.ChargeMonitoring;
import com.ruoyi.chargingPile.dto.ChargingGunCountMonitoring;
import com.ruoyi.chargingPile.dto.ChargingGunMonitoring;
import com.ruoyi.chargingPile.dto.GetChargingGunMonitoring;
-import com.ruoyi.chargingPile.service.*;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.PageInfo;
-import com.ruoyi.chargingPile.api.dto.PageChargingPileListDTO;
-import com.ruoyi.chargingPile.api.model.TChargingPile;
-import com.ruoyi.chargingPile.api.query.BatchSetAccountingStrategy;
+import com.ruoyi.chargingPile.service.ISiteService;
+import com.ruoyi.chargingPile.service.TChargingGunService;
import com.ruoyi.chargingPile.service.TChargingPileService;
+import com.ruoyi.chargingPile.service.TFaultMessageService;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
-import com.ruoyi.chargingPile.api.query.PageChargingPileList;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.log.enums.OperatorType;
-import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.annotation.Logical;
import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.integration.api.elutong.model.ConnectorStatusInfo;
+import com.ruoyi.integration.api.elutong.model.ConnectorStatusReq;
+import com.ruoyi.integration.api.feignClient.ELuTongClient;
import com.ruoyi.integration.api.feignClient.TCECClient;
import com.ruoyi.order.api.feignClient.ChargingOrderClient;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.vo.TChargingOrderVo;
-import com.ruoyi.other.api.domain.TVip;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import java.util.stream.Collectors;
/**
@@ -60,6 +62,7 @@
* @author xiaochen
* @since 2024-08-06
*/
+@Slf4j
@Api(tags = "充电桩")
@RestController
@RequestMapping("/t-charging-pile")
@@ -79,6 +82,14 @@
@Resource
private TCECClient tcecClient;
+
+ @Resource
+ private ISiteService siteService;
+
+ @Resource
+ private ELuTongClient eLuTongClient;
+
+
@Autowired
@@ -249,7 +260,7 @@
Integer status = vo.getStatus();
Long time = (Long) redisTemplate.opsForHash().get("charging_gun_online", (pile_code + gun_code));
//小于1分钟才处理数据，防止频繁查询数据
- if(null != time && (System.currentTimeMillis() - time) < 60000){
+ if(null != time && (System.currentTimeMillis() - time) < 30000){
return;
}
TChargingGun tChargingGun = chargingGunService.getOne(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getFullNumber, (pile_code + gun_code)).eq(TChargingGun::getDelFlag, 0));
@@ -259,17 +270,21 @@
TChargingPile chargingPile = chargingPileService.getById(tChargingGun.getChargingPileId());
//枪处于离线或者故障，返回状态为正常，则修改其状态
if(0 == status && tChargingGun.getStatus() != 2){
+ Site site = siteService.getById(tChargingGun.getSiteId());
TChargingGun tChargingGun1 = new TChargingGun();
tChargingGun1.setId(tChargingGun.getId());
tChargingGun1.setStatus(2);
chargingGunService.updateById(tChargingGun1);
- new Thread(new Runnable() {
- @Override
- public void run() {
- //推送状态给三方平台
- tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), tChargingGun1.getStatus());
- }
- }).start();
+ if(site.getIsOpenSynchronization() == 1){
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ //推送状态给三方平台
+ tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), 2);
+ pushConnectorStatus(tChargingGun);
+ }
+ }).start();
+ }
if(chargingPile.getStatus() != 1){
TChargingPile chargingPile1 = new TChargingPile();
@@ -287,17 +302,22 @@
}
//枪处于正常，返回状态为故障，则修改其状态
if(1 == status && tChargingGun.getStatus() != 1 && tChargingGun.getStatus() != 7){
+ Site site = siteService.getById(tChargingGun.getSiteId());
TChargingGun tChargingGun1 = new TChargingGun();
tChargingGun1.setId(tChargingGun.getId());
tChargingGun1.setStatus(7);
chargingGunService.updateById(tChargingGun1);
- new Thread(new Runnable() {
- @Override
- public void run() {
- //推送状态给三方平台
- tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), tChargingGun1.getStatus());
- }
- }).start();
+ if(site.getIsOpenSynchronization() == 1){
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ //推送状态给三方平台
+ tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), 7);
+ pushConnectorStatus(tChargingGun);
+ }
+ }).start();
+ }
+
//桩处于正常，桩所属的枪都处于非正常，修改桩状态为异常
List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, chargingPile.getId()).eq(TChargingGun::getDelFlag, 0));
@@ -327,6 +347,7 @@
order.setStatusList(Arrays.asList(1, 2, 3, 4, 5));
List<TChargingOrder> orders = chargingOrderClient.getChargingOrder(order).getData();
if(orders.size() > 0){
+ Site site = siteService.getById(tChargingGun.getSiteId());
TChargingOrder chargingOrder = orders.get(0);
TChargingGun tChargingGun1 = new TChargingGun();
if(Arrays.asList(1, 2, 5).contains(chargingOrder.getStatus())){
@@ -344,25 +365,33 @@
tChargingGun1.setId(tChargingGun.getId());
chargingGunService.updateById(tChargingGun1);
}
- new Thread(new Runnable() {
- @Override
- public void run() {
- //推送状态给三方平台
- tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), tChargingGun1.getStatus());
- }
- }).start();
+ if(site.getIsOpenSynchronization() == 1){
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ //推送状态给三方平台
+ tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), 5);
+ pushConnectorStatus(tChargingGun);
+ }
+ }).start();
+ }
+
}else{
+ Site site = siteService.getById(tChargingGun.getSiteId());
TChargingGun tChargingGun1 = new TChargingGun();
tChargingGun1.setId(tChargingGun.getId());
tChargingGun1.setStatus(3);
chargingGunService.updateById(tChargingGun1);
- new Thread(new Runnable() {
- @Override
- public void run() {
- //推送状态给三方平台
- tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), tChargingGun1.getStatus());
- }
- }).start();
+ if(site.getIsOpenSynchronization() == 1){
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ //推送状态给三方平台
+ tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), 3);
+ pushConnectorStatus(tChargingGun);
+ }
+ }).start();
+ }
}
List<TFaultMessage> list = faultMessageService.list(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingGunId, tChargingGun.getId())
@@ -374,5 +403,60 @@
}
}
}
+
+
+ /**
+ * 推送设备接口状态信息
+ * @param chargingGun
+ */
+ private void pushConnectorStatus(TChargingGun chargingGun){
+ Site site = siteService.getById(chargingGun.getSiteId());
+ if(StringUtils.isNotEmpty(site.getSerAreaCode())){
+ ConnectorStatusReq connectorStatusReq = new ConnectorStatusReq();
+ connectorStatusReq.setOperatorId("91510903906171535D");
+ connectorStatusReq.setSerAreaCode(site.getSerAreaCode());
+ connectorStatusReq.setStationId(site.getCode());
+ List<ConnectorStatusInfo> connectorStatusInfos = new ArrayList<>();
+ connectorStatusInfos.add(buildConnectorStatus(chargingGun));
+ connectorStatusReq.setItemSize(connectorStatusInfos.size());
+ connectorStatusReq.setConnectorStatusInfos(connectorStatusInfos);
+ R r = eLuTongClient.pushConnectorStatus(connectorStatusReq);
+ if(200 != r.getCode()){
+ log.error(r.getMsg());
+ }
+ }
+ }
+
+
+ private ConnectorStatusInfo buildConnectorStatus(TChargingGun chargingGun){
+ ConnectorStatusInfo connectorStatusInfo = new ConnectorStatusInfo();
+ connectorStatusInfo.setConnectorId(chargingGun.getFullNumber());
+ switch (chargingGun.getStatus()){
+ case 1:
+ connectorStatusInfo.setStatus(0);
+ break;
+ case 2:
+ connectorStatusInfo.setStatus(1);
+ break;
+ case 3:
+ connectorStatusInfo.setStatus(2);
+ break;
+ case 4:
+ connectorStatusInfo.setStatus(3);
+ break;
+ case 5:
+ connectorStatusInfo.setStatus(3);
+ break;
+ case 6:
+ connectorStatusInfo.setStatus(4);
+ break;
+ case 7:
+ connectorStatusInfo.setStatus(255);
+ break;
+ }
+ connectorStatusInfo.setSoc(0D);
+ connectorStatusInfo.setRemainingTime(0);
+ return connectorStatusInfo;
+ }
}
--
Gitblit v1.7.1