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 | 299 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 283 insertions(+), 16 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 ad7ceec..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
@@ -1,42 +1,58 @@
package com.ruoyi.chargingPile.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.chargingPile.api.model.TChargingGun;
-import com.ruoyi.chargingPile.api.model.TChargingPile;
+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.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.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.dto.PageChargingPileListDTO;
-import com.ruoyi.chargingPile.api.model.TChargingPile;
-import com.ruoyi.chargingPile.api.query.BatchSetAccountingStrategy;
-import com.ruoyi.chargingPile.service.TChargingPileService;
-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.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 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.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -46,6 +62,7 @@
* @author xiaochen
* @since 2024-08-06
*/
+@Slf4j
@Api(tags = "充电桩")
@RestController
@RequestMapping("/t-charging-pile")
@@ -53,6 +70,26 @@
private final TChargingPileService chargingPileService;
private final TChargingGunService chargingGunService;
+
+ @Resource
+ private RedisTemplate redisTemplate;
+
+ @Resource
+ private TFaultMessageService faultMessageService;
+
+ @Resource
+ private ChargingOrderClient chargingOrderClient;
+
+ @Resource
+ private TCECClient tcecClient;
+
+ @Resource
+ private ISiteService siteService;
+
+ @Resource
+ private ELuTongClient eLuTongClient;
+
+
@Autowired
@@ -94,8 +131,16 @@
return R.ok(chargingPileService.list(Wrappers.lambdaQuery(TChargingPile.class)
.eq(TChargingPile::getSiteId,siteId)));
}
+
+ @PostMapping(value = "/getChargingPileBySiteIds")
+ public R<List<TChargingPile>> getChargingPileBySiteIds(@RequestParam("siteIds") List<Integer> siteIds) {
+ return R.ok(chargingPileService.list(Wrappers.lambdaQuery(TChargingPile.class)
+ .in(!siteIds.isEmpty(),TChargingPile::getSiteId,siteIds)));
+ }
+
+ @RequiresPermissions(value = {"/chargingPile", "/chargingGun"}, logical = Logical.OR)
@ResponseBody
@GetMapping("/pageChargingPileList")
@ApiOperation(value = "获取充电桩列表数据", tags = {"管理后台-充电桩信息"})
@@ -104,6 +149,8 @@
return AjaxResult.success(list);
}
+
+ @RequiresPermissions(value = {"/chargingPile/add"}, logical = Logical.OR)
@ResponseBody
@Log(title = "【充电桩信息】添加充电桩数据", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@PostMapping("/addChargingPile")
@@ -113,6 +160,7 @@
}
+ @RequiresPermissions(value = {"/chargingPile/select", "/chargingPile/update"}, logical = Logical.OR)
@ResponseBody
@GetMapping("/getChargingPile/{id}")
@ApiOperation(value = "获取充电桩详情数据", tags = {"管理后台-充电桩信息"})
@@ -122,6 +170,7 @@
}
+ @RequiresPermissions(value = {"/chargingPile/update"}, logical = Logical.OR)
@ResponseBody
@Log(title = "【充电桩信息】编辑充电桩数据", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@PostMapping("/editChargingPile")
@@ -132,6 +181,7 @@
+ @RequiresPermissions(value = {"/chargingPile/del", "/chargingPile/batch_del"}, logical = Logical.OR)
@ResponseBody
@DeleteMapping("/delChargingPile")
@Log(title = "【充电桩信息】删除充电桩", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@@ -144,6 +194,7 @@
}
+ @RequiresPermissions(value = {"/chargingPile/accountingStrategy"}, logical = Logical.OR)
@ResponseBody
@Log(title = "【充电桩信息】批量设置计费策略", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@PostMapping("/batchSetAccountingStrategy")
@@ -154,6 +205,7 @@
}
+ @RequiresPermissions(value = {"/chargingEquipmentMonitoring"}, logical = Logical.OR)
@ResponseBody
@GetMapping("/chargeMonitoring/{siteId}")
@ApiOperation(value = "获取充电设施监控数据", tags = {"管理后台-充电设备监控"})
@@ -162,6 +214,8 @@
return AjaxResult.success(chargeMonitoring);
}
+
+ @RequiresPermissions(value = {"/chargingEquipmentMonitoring"}, logical = Logical.OR)
@ResponseBody
@GetMapping("/getChargingGunCountMonitoring/{siteId}")
@ApiOperation(value = "获取充电枪各种状态汇总监控数据", tags = {"管理后台-充电设备监控"})
@@ -171,6 +225,7 @@
}
+ @RequiresPermissions(value = {"/operationMaintenanceAnalysis", "/chargingEquipmentMonitoring"}, logical = Logical.OR)
@ResponseBody
@GetMapping("/getChargingGunMonitoring")
@ApiOperation(value = "获取充电枪监控数据", tags = {"管理后台-充电设备监控"})
@@ -178,8 +233,8 @@
PageInfo<ChargingGunMonitoring> chargingGunMonitoring = chargingPileService.getChargingGunMonitoring(query);
return AjaxResult.success(chargingGunMonitoring);
}
-
-
+
+
/**
* 根据id获取充电桩信息
* @param id
@@ -187,9 +242,221 @@
*/
@ResponseBody
@PostMapping("/getChargingPileById/{id}")
- public R<TChargingPile> getChargingPileById(@PathVariable Integer id){
+ public R<TChargingPile> getChargingPileById(@PathVariable("id") Integer id){
TChargingPile chargingPile = chargingPileService.getById(id);
return R.ok(chargingPile);
}
+
+
+ /**
+ * 更新充电桩状态
+ */
+ @ResponseBody
+ @PostMapping("/updateChargingPileStatus")
+ public void updateChargingPileStatus(@RequestBody UpdateChargingPileStatusVo vo){
+ String pile_code = vo.getPile_code();
+ String gun_code = vo.getGun_code();
+ //0：正常，1：故障，2=插枪
+ Integer status = vo.getStatus();
+ Long time = (Long) redisTemplate.opsForHash().get("charging_gun_online", (pile_code + gun_code));
+ //小于1分钟才处理数据，防止频繁查询数据
+ 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));
+ if(null != tChargingGun){
+ redisTemplate.opsForHash().put("charging_gun_online", tChargingGun.getFullNumber(), System.currentTimeMillis());
+
+ 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);
+ 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();
+ chargingPile1.setId(chargingPile.getId());
+ chargingPile1.setStatus(1);
+ chargingPileService.updateById(chargingPile1);
+ }
+
+ List<TFaultMessage> list = faultMessageService.list(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingGunId, tChargingGun.getId())
+ .isNull(TFaultMessage::getEndTime));
+ if(!list.isEmpty()){
+ list.forEach(s->s.setEndTime(LocalDateTime.now()));
+ faultMessageService.updateBatchById(list);
+ }
+ }
+ //枪处于正常，返回状态为故障，则修改其状态
+ 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);
+ 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));
+ int size = list.stream().filter(s -> s.getStatus() == 1 || s.getStatus() == 7).collect(Collectors.toList()).size();
+ if(chargingPile.getStatus() == 1 && list.size() == size){
+ TChargingPile chargingPile1 = new TChargingPile();
+ chargingPile1.setId(chargingPile.getId());
+ chargingPile1.setStatus(3);
+ chargingPileService.updateById(chargingPile1);
+ }
+
+ TFaultMessage faultMessage = new TFaultMessage();
+ faultMessage.setSiteId(chargingPile.getSiteId());
+ faultMessage.setChargingPileId(chargingPile.getId());
+ faultMessage.setChargingGunId(tChargingGun.getId());
+ faultMessage.setStatus(2);
+ faultMessage.setDownTime(LocalDateTime.now());
+ faultMessage.setCreateTime(LocalDateTime.now());
+ faultMessage.setDelFlag(false);
+ faultMessage.setContent("设备故障");
+ faultMessageService.save(faultMessage);
+ }
+ if(2 == status){
+ TChargingOrderVo order = new TChargingOrderVo();
+ order.setChargingPileId(tChargingGun.getChargingPileId());
+ order.setChargingGunId(tChargingGun.getId());
+ 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())){
+ tChargingGun1.setStatus(3);
+ tChargingGun1.setId(tChargingGun.getId());
+ chargingGunService.updateById(tChargingGun1);
+ }
+ if(Arrays.asList(3).contains(chargingOrder.getStatus())){
+ tChargingGun1.setStatus(4);
+ tChargingGun1.setId(tChargingGun.getId());
+ chargingGunService.updateById(tChargingGun1);
+ }
+ if(Arrays.asList(4).contains(chargingOrder.getStatus()) && chargingOrder.getEndMode() == 2){
+ tChargingGun1.setStatus(5);
+ tChargingGun1.setId(tChargingGun.getId());
+ chargingGunService.updateById(tChargingGun1);
+ }
+ 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);
+ 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())
+ .isNull(TFaultMessage::getEndTime));
+ if(!list.isEmpty()){
+ list.forEach(s->s.setEndTime(LocalDateTime.now()));
+ faultMessageService.updateBatchById(list);
+ }
+ }
+ }
+ }
+
+
+ /**
+ * 推送设备接口状态信息
+ * @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