From 5b64f31f1d35b38b51935b5fa7f4b8cf46fbf4cf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 08 五月 2025 14:08:57 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into 1.1
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 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 8ae8366..bdf4a07 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
@@ -244,11 +244,12 @@
public void updateChargingPileStatus(@RequestBody UpdateChargingPileStatusVo vo){
String pile_code = vo.getPile_code();
String gun_code = vo.getGun_code();
+ //0：正常，1：故障，2=插枪
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秒才处理数据，防止频繁查询数据
- if(null != time && (System.currentTimeMillis() - time) < 30000){
+ //小于1分钟才处理数据，防止频繁查询数据
+ if(null != time && (System.currentTimeMillis() - time) < 60000){
return;
}
TChargingGun tChargingGun = chargingGunService.getOne(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getFullNumber, (pile_code + gun_code)).eq(TChargingGun::getDelFlag, 0));
@@ -263,8 +264,13 @@
tChargingGun1.setId(tChargingGun.getId());
tChargingGun1.setStatus(2);
chargingGunService.updateById(tChargingGun1);
- //推送状态给三方平台
- tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), tChargingGun1.getStatus());
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ //推送状态给三方平台
+ tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), tChargingGun1.getStatus());
+ }
+ }).start();
if(chargingPile.getStatus() != 1){
TChargingPile chargingPile1 = new TChargingPile();
@@ -286,8 +292,13 @@
tChargingGun1.setId(tChargingGun.getId());
tChargingGun1.setStatus(7);
chargingGunService.updateById(tChargingGun1);
- //推送状态给三方平台
- tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), tChargingGun1.getStatus());
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ //推送状态给三方平台
+ tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), tChargingGun1.getStatus());
+ }
+ }).start();
//桩处于正常，桩所属的枪都处于非正常，修改桩状态为异常
List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, chargingPile.getId()).eq(TChargingGun::getDelFlag, 0));
@@ -334,15 +345,25 @@
tChargingGun1.setId(tChargingGun.getId());
chargingGunService.updateById(tChargingGun1);
}
- //推送状态给三方平台
- tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), tChargingGun1.getStatus());
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ //推送状态给三方平台
+ tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), tChargingGun1.getStatus());
+ }
+ }).start();
}else{
TChargingGun tChargingGun1 = new TChargingGun();
tChargingGun1.setId(tChargingGun.getId());
tChargingGun1.setStatus(3);
chargingGunService.updateById(tChargingGun1);
- //推送状态给三方平台
- tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), tChargingGun1.getStatus());
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ //推送状态给三方平台
+ tcecClient.pushChargingGunStatus(tChargingGun.getFullNumber(), tChargingGun1.getStatus());
+ }
+ }).start();
}
List<TFaultMessage> list = faultMessageService.list(new LambdaQueryWrapper<TFaultMessage>().eq(TFaultMessage::getChargingGunId, tChargingGun.getId())
--
Gitblit v1.7.1