From 72a76cd3ad51a520100ec59481d99118ffebd33c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 28 十月 2024 15:18:50 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 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 ff411ec..b499c19 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
@@ -237,9 +237,19 @@
faultMessage.setDelFlag(false);
faultMessage.setContent("设备故障");
faultMessageService.save(faultMessage);
-
- chargingPile.setStatus(0 == status ? 1 : 3);
- chargingPileService.updateById(chargingPile);
+
+ TChargingPile chargingPile1 = new TChargingPile();
+ chargingPile1.setId(chargingPile.getId());
+ chargingPile1.setStatus(3);
+ chargingPileService.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(7);
+ chargingGunService.updateById(chargingGun1);
+ }
}
}
if(chargingPile.getStatus() != 1 && 0 == status){
@@ -249,9 +259,19 @@
one.setEndTime(LocalDateTime.now());
faultMessageService.updateById(one);
}
-
- chargingPile.setStatus(0 == status ? 1 : 3);
- chargingPileService.updateById(chargingPile);
+
+ TChargingPile chargingPile1 = new TChargingPile();
+ chargingPile1.setId(chargingPile.getId());
+ chargingPile1.setStatus(1);
+ chargingPileService.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(2);
+ chargingGunService.updateById(chargingGun1);
+ }
}
if(0 == status){
Map<String, Object> charging_pile_online = redisService.getCacheMap("charging_pile_online");
--
Gitblit v1.7.1