From 8abbee67c5e887ca858d8b669d2fb5b0d5c4683c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 29 十月 2024 14:08:07 +0800
Subject: [PATCH] 优化枪状态
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java | 45 +++++++++++++++++++++++++++------------------
1 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
index 70a11ec..510e91b 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
@@ -585,30 +585,39 @@
*/
@Override
public void updateStatus() {
- List<TChargingPile> list = this.list(new LambdaQueryWrapper<TChargingPile>().eq(TChargingPile::getDelFlag, 0));
- Map<String, Object> charging_pile_online = redisService.getCacheMap("charging_pile_online");
- for (TChargingPile chargingPile : list) {
- Long time = (Long) charging_pile_online.get(chargingPile.getCode());
+ Map<String, Object> charging_gun_online = redisService.getCacheMap("charging_gun_online");
+ Set<String> keySet = charging_gun_online.keySet();
+ List<TChargingGun> list = new ArrayList<>();
+ if(keySet.size() > 0){
+ list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getDelFlag, 0).in(TChargingGun::getFullNumber, keySet));
+ }
+ for (TChargingGun chargingGun : list) {
+ Long time = (Long) charging_gun_online.get(chargingGun.getFullNumber());
if(null != time && System.currentTimeMillis() - time > 60000){
- TChargingPile chargingPile1 = new TChargingPile();
- chargingPile1.setId(chargingPile.getId());
- chargingPile1.setStatus(2);
- this.updateById(chargingPile1);
- List<TChargingGun> list1 = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, chargingPile.getId()));
- for (TChargingGun chargingGun : list1) {
- TChargingGun chargingGun1 = new TChargingGun();
- chargingGun1.setId(chargingGun.getId());
- chargingGun1.setStatus(1);
- chargingGunService.updateById(chargingGun1);
+ TChargingGun chargingGun1 = new TChargingGun();
+ chargingGun1.setId(chargingGun.getId());
+ chargingGun1.setStatus(1);
+ chargingGunService.updateById(chargingGun1);
+
+ //桩处于正常，桩所属的枪都处于非正常，修改桩状态为异常
+ TChargingPile chargingPile = this.getById(chargingGun1.getChargingPileId());
+ List<TChargingGun> list1 = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, chargingPile.getId()).eq(TChargingGun::getDelFlag, 0));
+ int size = list1.stream().filter(s -> s.getStatus() == 1 || s.getStatus() == 7).collect(Collectors.toList()).size();
+ if(chargingPile.getStatus() == 1 && list1.size() == size){
+ TChargingPile chargingPile1 = new TChargingPile();
+ chargingPile1.setId(chargingGun.getChargingPileId());
+ chargingPile1.setStatus(2);
+ this.updateById(chargingPile1);
}
//添加记录
- TFaultMessage faultMessage = faultMessageService.getOne(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingPileId, chargingPile.getId())
- .eq(TFaultMessage::getStatus, 1).eq(TFaultMessage::getDelFlag, 0).isNull(TFaultMessage::getEndTime));
+ TFaultMessage faultMessage = faultMessageService.getOne(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingPileId, chargingGun.getChargingPileId())
+ .eq(TFaultMessage::getChargingGunId, chargingGun.getId()).eq(TFaultMessage::getStatus, 1).eq(TFaultMessage::getDelFlag, 0).isNull(TFaultMessage::getEndTime));
if(null == faultMessage){
faultMessage = new TFaultMessage();
- faultMessage.setSiteId(chargingPile.getSiteId());
- faultMessage.setChargingPileId(chargingPile.getId());
+ faultMessage.setSiteId(chargingGun.getSiteId());
+ faultMessage.setChargingPileId(chargingGun.getChargingPileId());
+ faultMessage.setChargingGunId(chargingGun.getId());
faultMessage.setStatus(1);
faultMessage.setDownTime(LocalDateTime.now());
faultMessage.setCreateTime(LocalDateTime.now());
--
Gitblit v1.7.1