From e755145ce3a5d14468a09b4062c84d7c13a92f0c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 04 十一月 2024 15:39:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 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 ab5661a..644e120 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
@@ -8,6 +8,7 @@
import com.ruoyi.chargingPile.api.model.TFaultMessage;
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;
@@ -219,11 +220,13 @@
/**
* 更新充电桩状态
- * @param status
*/
@ResponseBody
@PostMapping("/updateChargingPileStatus")
- public void updateChargingPileStatus(@RequestParam("pile_code") String pile_code, @RequestParam("gun_code") String gun_code, @RequestParam("status") Integer status){
+ public void updateChargingPileStatus(@RequestBody UpdateChargingPileStatusVo vo){
+ String pile_code = vo.getPile_code();
+ String gun_code = vo.getGun_code();
+ Integer status = vo.getStatus();
Map<String, Object> charging_pile_online = redisService.getCacheMap("charging_gun_online");
Long time = (Long) charging_pile_online.get(pile_code + gun_code);
//小于30秒才处理数据，防止频繁查询数据
@@ -232,6 +235,9 @@
}
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){
@@ -281,11 +287,6 @@
faultMessage.setContent("设备故障");
faultMessageService.save(faultMessage);
}
-
- if(1 != status){
- charging_pile_online.put(tChargingGun.getFullNumber(), System.currentTimeMillis());
- redisService.setCacheMap("charging_gun_online", charging_pile_online);
- }
if(2 == status){
TChargingOrderVo order = new TChargingOrderVo();
order.setChargingPileId(tChargingGun.getChargingPileId());
@@ -312,6 +313,13 @@
tChargingGun1.setStatus(3);
chargingGunService.updateById(tChargingGun1);
}
+
+ 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