From bf954ec42f6f36742b8c5e36a4c3e9ad3f4470fc Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 01 十一月 2024 18:37:09 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 d1456af..ab5661a 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
@@ -211,7 +211,7 @@
*/
@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);
}
@@ -227,7 +227,7 @@
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){
+ 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));
@@ -295,7 +295,7 @@
if(orders.size() > 0){
TChargingOrder chargingOrder = orders.get(0);
TChargingGun tChargingGun1 = new TChargingGun();
- if(Arrays.asList(1, 2).contains(chargingOrder.getStatus())){
+ if(Arrays.asList(1, 2, 5).contains(chargingOrder.getStatus())){
tChargingGun1.setStatus(3);
}
if(Arrays.asList(3).contains(chargingOrder.getStatus())){
@@ -306,6 +306,11 @@
}
tChargingGun1.setId(tChargingGun.getId());
chargingGunService.updateById(tChargingGun1);
+ }else{
+ TChargingGun tChargingGun1 = new TChargingGun();
+ tChargingGun1.setId(tChargingGun.getId());
+ tChargingGun1.setStatus(3);
+ chargingGunService.updateById(tChargingGun1);
}
}
}
--
Gitblit v1.7.1