From 2e44b182b43fecaf6a2510c9226f18ffd2cee6c9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 15 四月 2025 17:33:46 +0800
Subject: [PATCH] 监管平台调试完毕

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java |   69 +++++++++++++++++++++++++---------
 1 files changed, 50 insertions(+), 19 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 644e120..8ae8366 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
@@ -28,6 +28,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;
@@ -72,6 +75,9 @@
 	
 	@Resource
 	private ChargingOrderClient chargingOrderClient;
+	
+	@Resource
+	private TCECClient tcecClient;
 
 
     @Autowired
@@ -119,7 +125,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 = {"管理后台-充电桩信息"})
@@ -127,7 +136,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")
@@ -135,8 +146,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 = {"管理后台-充电桩信息"})
@@ -144,8 +156,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")
@@ -153,9 +166,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)
@@ -166,8 +180,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")
@@ -176,8 +191,9 @@
 		chargingPileService.batchSetAccountingStrategy(setAccountingStrategy);
 		return AjaxResult.success();
 	}
-
-
+	
+	
+	@RequiresPermissions(value = {"/chargingEquipmentMonitoring"}, logical = Logical.OR)
 	@ResponseBody
 	@GetMapping("/chargeMonitoring/{siteId}")
 	@ApiOperation(value = "获取充电设施监控数据", tags = {"管理后台-充电设备监控"})
@@ -185,8 +201,9 @@
 		ChargeMonitoring chargeMonitoring = chargingPileService.chargeMonitoring(siteId);
 		return AjaxResult.success(chargeMonitoring);
 	}
-
-
+	
+	
+	@RequiresPermissions(value = {"/chargingEquipmentMonitoring"}, logical = Logical.OR)
 	@ResponseBody
 	@GetMapping("/getChargingGunCountMonitoring/{siteId}")
 	@ApiOperation(value = "获取充电枪各种状态汇总监控数据", tags = {"管理后台-充电设备监控"})
@@ -194,8 +211,9 @@
 		ChargingGunCountMonitoring chargingGunCountMonitoring = chargingPileService.getChargingGunCountMonitoring(siteId);
 		return AjaxResult.success(chargingGunCountMonitoring);
 	}
-
-
+	
+	
+	@RequiresPermissions(value = {"/operationMaintenanceAnalysis", "/chargingEquipmentMonitoring"}, logical = Logical.OR)
 	@ResponseBody
 	@GetMapping("/getChargingGunMonitoring")
 	@ApiOperation(value = "获取充电枪监控数据", tags = {"管理后台-充电设备监控"})
@@ -245,6 +263,9 @@
 				tChargingGun1.setId(tChargingGun.getId());
 				tChargingGun1.setStatus(2);
 				chargingGunService.updateById(tChargingGun1);
+				//推送状态给三方平台
+				tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), tChargingGun1.getStatus());
+				
 				if(chargingPile.getStatus() != 1){
 					TChargingPile chargingPile1 = new TChargingPile();
 					chargingPile1.setId(chargingPile.getId());
@@ -265,6 +286,8 @@
 				tChargingGun1.setId(tChargingGun.getId());
 				tChargingGun1.setStatus(7);
 				chargingGunService.updateById(tChargingGun1);
+				//推送状态给三方平台
+				tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), tChargingGun1.getStatus());
 				
 				//桩处于正常,桩所属的枪都处于非正常,修改桩状态为异常
 				List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, chargingPile.getId()).eq(TChargingGun::getDelFlag, 0));
@@ -298,20 +321,28 @@
 					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);
+					//推送状态给三方平台
+					tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), tChargingGun1.getStatus());
 				}else{
 					TChargingGun tChargingGun1 = new TChargingGun();
 					tChargingGun1.setId(tChargingGun.getId());
 					tChargingGun1.setStatus(3);
 					chargingGunService.updateById(tChargingGun1);
+					//推送状态给三方平台
+					tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), tChargingGun1.getStatus());
 				}
 				
 				List<TFaultMessage> list = faultMessageService.list(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingGunId, tChargingGun.getId())

--
Gitblit v1.7.1