From 4f9263aeee1c7e5a87a7ff58d008fb1c47ceed6b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 28 九月 2025 10:12:19 +0800
Subject: [PATCH] 增加同步引流平台的开关的功能
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java | 131 +++++++++++++++++++++++++++++++++----------
1 files changed, 100 insertions(+), 31 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 6326c71..ae5bcf1 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,11 +3,10 @@
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.TFaultMessage;
+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.vo.UpdateChargingPileStatusVo;
import com.ruoyi.chargingPile.dto.ChargeMonitoring;
import com.ruoyi.chargingPile.dto.ChargingGunCountMonitoring;
import com.ruoyi.chargingPile.dto.ChargingGunMonitoring;
@@ -27,6 +26,9 @@
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.feignClient.TCECClient;
import com.ruoyi.order.api.feignClient.ChargingOrderClient;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.vo.TChargingOrderVo;
@@ -35,6 +37,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -62,15 +65,21 @@
private final TChargingPileService chargingPileService;
private final TChargingGunService chargingGunService;
-
+
@Resource
- private RedisService redisService;
+ private RedisTemplate redisTemplate;
@Resource
private TFaultMessageService faultMessageService;
@Resource
private ChargingOrderClient chargingOrderClient;
+
+ @Resource
+ private TCECClient tcecClient;
+
+ @Resource
+ private ISiteService siteService;
@Autowired
@@ -118,7 +127,10 @@
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 = {"管理后台-充电桩信息"})
@@ -126,7 +138,9 @@
PageInfo<PageChargingPileListDTO> list = chargingPileService.pageChargingPileList(page);
return AjaxResult.success(list);
}
-
+
+
+ @RequiresPermissions(value = {"/chargingPile/add"}, logical = Logical.OR)
@ResponseBody
@Log(title = "【充电桩信息】添加充电桩数据", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@PostMapping("/addChargingPile")
@@ -134,8 +148,9 @@
public AjaxResult addChargingPile(@RequestBody TChargingPile chargingPile){
return chargingPileService.addChargingPile(chargingPile);
}
-
-
+
+
+ @RequiresPermissions(value = {"/chargingPile/select", "/chargingPile/update"}, logical = Logical.OR)
@ResponseBody
@GetMapping("/getChargingPile/{id}")
@ApiOperation(value = "获取充电桩详情数据", tags = {"管理后台-充电桩信息"})
@@ -143,8 +158,9 @@
TChargingPile chargingPile = chargingPileService.getChargingPile(id);
return AjaxResult.success(chargingPile);
}
-
-
+
+
+ @RequiresPermissions(value = {"/chargingPile/update"}, logical = Logical.OR)
@ResponseBody
@Log(title = "【充电桩信息】编辑充电桩数据", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@PostMapping("/editChargingPile")
@@ -152,9 +168,10 @@
public AjaxResult editChargingPile(@RequestBody TChargingPile chargingPile){
return chargingPileService.editChargingPile(chargingPile);
}
-
-
-
+
+
+
+ @RequiresPermissions(value = {"/chargingPile/del", "/chargingPile/batch_del"}, logical = Logical.OR)
@ResponseBody
@DeleteMapping("/delChargingPile")
@Log(title = "【充电桩信息】删除充电桩", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@@ -165,8 +182,9 @@
public AjaxResult delChargingPile(@RequestParam("id") Integer[] id){
return chargingPileService.delChargingPile(id);
}
-
-
+
+
+ @RequiresPermissions(value = {"/chargingPile/accountingStrategy"}, logical = Logical.OR)
@ResponseBody
@Log(title = "【充电桩信息】批量设置计费策略", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@PostMapping("/batchSetAccountingStrategy")
@@ -175,8 +193,9 @@
chargingPileService.batchSetAccountingStrategy(setAccountingStrategy);
return AjaxResult.success();
}
-
-
+
+
+ @RequiresPermissions(value = {"/chargingEquipmentMonitoring"}, logical = Logical.OR)
@ResponseBody
@GetMapping("/chargeMonitoring/{siteId}")
@ApiOperation(value = "获取充电设施监控数据", tags = {"管理后台-充电设备监控"})
@@ -184,8 +203,9 @@
ChargeMonitoring chargeMonitoring = chargingPileService.chargeMonitoring(siteId);
return AjaxResult.success(chargeMonitoring);
}
-
-
+
+
+ @RequiresPermissions(value = {"/chargingEquipmentMonitoring"}, logical = Logical.OR)
@ResponseBody
@GetMapping("/getChargingGunCountMonitoring/{siteId}")
@ApiOperation(value = "获取充电枪各种状态汇总监控数据", tags = {"管理后台-充电设备监控"})
@@ -193,8 +213,9 @@
ChargingGunCountMonitoring chargingGunCountMonitoring = chargingPileService.getChargingGunCountMonitoring(siteId);
return AjaxResult.success(chargingGunCountMonitoring);
}
-
-
+
+
+ @RequiresPermissions(value = {"/operationMaintenanceAnalysis", "/chargingEquipmentMonitoring"}, logical = Logical.OR)
@ResponseBody
@GetMapping("/getChargingGunMonitoring")
@ApiOperation(value = "获取充电枪监控数据", tags = {"管理后台-充电设备监控"})
@@ -219,29 +240,41 @@
/**
* 更新充电桩状态
- * @param status
*/
@ResponseBody
@PostMapping("/updateChargingPileStatus")
- public void updateChargingPileStatus(@RequestParam("pile_code") String pile_code, @RequestParam("gun_code") String gun_code, @RequestParam("status") Integer status){
- Map<String, Object> charging_pile_online = redisService.getCacheMap("charging_gun_online");
- Long time = (Long) charging_pile_online.get(pile_code + gun_code);
- //小于30秒才处理数据，防止频繁查询数据
+ 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){
- charging_pile_online.put(tChargingGun.getFullNumber(), System.currentTimeMillis());
- redisService.setCacheMap("charging_gun_online", charging_pile_online);
+ 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);
+ }
+ }).start();
+ }
+
if(chargingPile.getStatus() != 1){
TChargingPile chargingPile1 = new TChargingPile();
chargingPile1.setId(chargingPile.getId());
@@ -258,10 +291,21 @@
}
//枪处于正常，返回状态为故障，则修改其状态
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);
+ }
+ }).start();
+ }
+
//桩处于正常，桩所属的枪都处于非正常，修改桩状态为异常
List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, chargingPile.getId()).eq(TChargingGun::getDelFlag, 0));
@@ -291,24 +335,49 @@
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);
}
- tChargingGun1.setId(tChargingGun.getId());
- chargingGunService.updateById(tChargingGun1);
+ if(site.getIsOpenSynchronization() == 1){
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ //推送状态给三方平台
+ tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), 5);
+ }
+ }).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);
+ }
+ }).start();
+ }
}
List<TFaultMessage> list = faultMessageService.list(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingGunId, tChargingGun.getId())
--
Gitblit v1.7.1