From e0fc8f7e2230b51e3bbe8dea43790cf11b7170e9 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 04 十一月 2024 15:39:01 +0800
Subject: [PATCH] merge
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java | 159 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 115 insertions(+), 44 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 0f54b24..6326c71 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
@@ -27,6 +27,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.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;
@@ -41,9 +44,8 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -60,12 +62,15 @@
private final TChargingPileService chargingPileService;
private final TChargingGunService chargingGunService;
-
+
@Resource
private RedisService redisService;
-
+
@Resource
private TFaultMessageService faultMessageService;
+
+ @Resource
+ private ChargingOrderClient chargingOrderClient;
@Autowired
@@ -113,7 +118,7 @@
return R.ok(chargingPileService.list(Wrappers.lambdaQuery(TChargingPile.class)
.in(!siteIds.isEmpty(),TChargingPile::getSiteId,siteIds)));
}
-
+
@ResponseBody
@GetMapping("/pageChargingPileList")
@ApiOperation(value = "获取充电桩列表数据", tags = {"管理后台-充电桩信息"})
@@ -121,7 +126,7 @@
PageInfo<PageChargingPileListDTO> list = chargingPileService.pageChargingPileList(page);
return AjaxResult.success(list);
}
-
+
@ResponseBody
@Log(title = "【充电桩信息】添加充电桩数据", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@PostMapping("/addChargingPile")
@@ -129,8 +134,8 @@
public AjaxResult addChargingPile(@RequestBody TChargingPile chargingPile){
return chargingPileService.addChargingPile(chargingPile);
}
-
-
+
+
@ResponseBody
@GetMapping("/getChargingPile/{id}")
@ApiOperation(value = "获取充电桩详情数据", tags = {"管理后台-充电桩信息"})
@@ -138,8 +143,8 @@
TChargingPile chargingPile = chargingPileService.getChargingPile(id);
return AjaxResult.success(chargingPile);
}
-
-
+
+
@ResponseBody
@Log(title = "【充电桩信息】编辑充电桩数据", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@PostMapping("/editChargingPile")
@@ -147,9 +152,9 @@
public AjaxResult editChargingPile(@RequestBody TChargingPile chargingPile){
return chargingPileService.editChargingPile(chargingPile);
}
-
-
-
+
+
+
@ResponseBody
@DeleteMapping("/delChargingPile")
@Log(title = "【充电桩信息】删除充电桩", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@@ -160,8 +165,8 @@
public AjaxResult delChargingPile(@RequestParam("id") Integer[] id){
return chargingPileService.delChargingPile(id);
}
-
-
+
+
@ResponseBody
@Log(title = "【充电桩信息】批量设置计费策略", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@PostMapping("/batchSetAccountingStrategy")
@@ -170,8 +175,8 @@
chargingPileService.batchSetAccountingStrategy(setAccountingStrategy);
return AjaxResult.success();
}
-
-
+
+
@ResponseBody
@GetMapping("/chargeMonitoring/{siteId}")
@ApiOperation(value = "获取充电设施监控数据", tags = {"管理后台-充电设备监控"})
@@ -188,8 +193,8 @@
ChargingGunCountMonitoring chargingGunCountMonitoring = chargingPileService.getChargingGunCountMonitoring(siteId);
return AjaxResult.success(chargingGunCountMonitoring);
}
-
-
+
+
@ResponseBody
@GetMapping("/getChargingGunMonitoring")
@ApiOperation(value = "获取充电枪监控数据", tags = {"管理后台-充电设备监控"})
@@ -197,8 +202,8 @@
PageInfo<ChargingGunMonitoring> chargingGunMonitoring = chargingPileService.getChargingGunMonitoring(query);
return AjaxResult.success(chargingGunMonitoring);
}
-
-
+
+
/**
* 根据id获取充电桩信息
* @param id
@@ -206,46 +211,112 @@
*/
@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);
}
-
-
+
+
/**
* 更新充电桩状态
- * @param code
* @param status
*/
@ResponseBody
@PostMapping("/updateChargingPileStatus")
- public void updateChargingPileStatus(@RequestParam("code") String code, @RequestParam("status") Integer status){
- TChargingPile chargingPile = chargingPileService.getOne(new LambdaQueryWrapper<TChargingPile>()
- .eq(TChargingPile::getCode, code).eq(TChargingPile::getDelFlag, 0));
- if(null != chargingPile){
- if(chargingPile.getStatus() == 1){
+ 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秒才处理数据，防止频繁查询数据
+ 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);
+
+ TChargingPile chargingPile = chargingPileService.getById(tChargingGun.getChargingPileId());
+ //枪处于离线或者故障，返回状态为正常，则修改其状态
+ if(0 == status && tChargingGun.getStatus() != 2){
+ TChargingGun tChargingGun1 = new TChargingGun();
+ tChargingGun1.setId(tChargingGun.getId());
+ tChargingGun1.setStatus(2);
+ chargingGunService.updateById(tChargingGun1);
+ 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){
+ TChargingGun tChargingGun1 = new TChargingGun();
+ tChargingGun1.setId(tChargingGun.getId());
+ tChargingGun1.setStatus(7);
+ chargingGunService.updateById(tChargingGun1);
+
+ //桩处于正常，桩所属的枪都处于非正常，修改桩状态为异常
+ 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.setStatus(1);
+ faultMessage.setChargingGunId(tChargingGun.getId());
+ faultMessage.setStatus(2);
faultMessage.setDownTime(LocalDateTime.now());
faultMessage.setCreateTime(LocalDateTime.now());
faultMessage.setDelFlag(false);
- faultMessage.setContent("设备离线");
+ faultMessage.setContent("设备故障");
faultMessageService.save(faultMessage);
-
- chargingPile.setStatus(0 == status ? 1 : 3);
- chargingPileService.updateById(chargingPile);
}
- if(chargingPile.getStatus() != 1 && 0 == status){
- TFaultMessage one = faultMessageService.getOne(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingPileId, chargingPile.getId()).isNull(TFaultMessage::getEndTime));
- if(null != one){
- one.setEndTime(LocalDateTime.now());
- faultMessageService.updateById(one);
+ 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){
+ TChargingOrder chargingOrder = orders.get(0);
+ TChargingGun tChargingGun1 = new TChargingGun();
+ if(Arrays.asList(1, 2, 5).contains(chargingOrder.getStatus())){
+ tChargingGun1.setStatus(3);
+ }
+ if(Arrays.asList(3).contains(chargingOrder.getStatus())){
+ tChargingGun1.setStatus(4);
+ }
+ if(Arrays.asList(4).contains(chargingOrder.getStatus()) && chargingOrder.getEndMode() == 2){
+ tChargingGun1.setStatus(5);
+ }
+ tChargingGun1.setId(tChargingGun.getId());
+ chargingGunService.updateById(tChargingGun1);
+ }else{
+ TChargingGun tChargingGun1 = new TChargingGun();
+ tChargingGun1.setId(tChargingGun.getId());
+ tChargingGun1.setStatus(3);
+ chargingGunService.updateById(tChargingGun1);
}
- }
- if(0 == status){
- redisService.getCacheMap("charging_pile_online").put(code, System.currentTimeMillis());
+
+ 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);
+ }
}
}
}
--
Gitblit v1.7.1