From 66794a3e6b3feb01d4b6ae5710a0725b525a99dd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 08 十月 2024 15:13:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index 10f849d..19512b4 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -190,6 +190,9 @@
@Resource
private AppUserTagClient appUserTagClient;
+
+ @Resource
+ private SecurityDetectionClient securityDetectionClient;
//计数器
private Map<String, Integer> counter_map = new HashMap<>();
@@ -650,6 +653,19 @@
//执行5分钟的定时任务检测
ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
scheduler.scheduleAtFixedRate(()->{
+ //获取安全校验
+ SecurityDetection securityDetection = securityDetectionClient.getSecurityDetection(chargingOrder.getCode()).getData();
+ if(null != securityDetection){
+ PreChargeCheck preChargeCheck1 = redisService.getCacheObject("AQJC_" + chargingOrder.getChargingGunId());
+ if(null != preChargeCheck1){
+ preChargeCheck1.setElectronicLockLock(preChargeCheck1.getElectronicLockLock());
+ preChargeCheck1.setInsulationTesting(true);
+ preChargeCheck1.setSecureConnectionDetection(preChargeCheck1.getSecureConnectionDetection());
+ preChargeCheck1.setStartupSuccess(1);
+ redisService.setCacheObject("AQJC_" + chargingOrder.getChargingGunId(), preChargeCheck1);
+ }
+ }
+
List<PlatformStartChargingReply> data = platformStartChargingReplyClient.getPlatformStartChargingReply(code).getData();
System.err.println("-------------------开始检查调起充电结果-------------------");
System.err.println(data.toString());
@@ -659,10 +675,9 @@
Integer failure_cause = platformStartChargingReply.getFailure_cause();
Integer counter = counter_map.get(code);
PreChargeCheck preChargeCheck1 = redisService.getCacheObject(key);
- //状态为5的时候，硬件会间隔60秒后再次检测，依然未插枪，则不启动充电
- //因这里是间隔5秒执行检测，所以累计次数在30次以上
- if(failure_cause == 5 && (null == counter || counter < 35)){
- counter++;
+ //5分钟内还未插枪则取消充电，退回金额。
+ if(failure_cause == 5 && (null == counter || counter < 300)){
+ counter = (null == counter ? 0 : counter) + 1;
counter_map.put(code, counter);
//启动失败
preChargeCheck1.setStartupSuccess(3);
@@ -670,9 +685,9 @@
redisService.setCacheObject(key, preChargeCheck1);
return;
}
+
//清除计时器中的无效数据
counter_map.remove(code);
- //开始处理退款
TChargingOrder order = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getCode, code));
if(0 == startup_result){
//启动失败
@@ -683,6 +698,7 @@
order.setStatus(-1);
order.setEndMode(0);
}else{
+ //启动成功
preChargeCheck1.setStartupSuccess(2);
order.setStatus(3);
order.setStartTime(LocalDateTime.now());
@@ -691,8 +707,10 @@
redisService.setCacheObject(key, preChargeCheck1);
//提前结束定时任务
scheduler.shutdown();
+ }else{
+ log.error("未上传开启充电结果........");
}
- }, 5000, 300, TimeUnit.MILLISECONDS);
+ }, 5, 1, TimeUnit.SECONDS);
return AjaxResult.success();
}
@@ -946,6 +964,9 @@
throw new RuntimeException(failure_cause);
}
+ // 将枪状态重置为空闲
+ chargingGun.setStatus(2);
+ chargingGunClient.updateChargingGunById(chargingGun);
//计算费用，处理退款
endCharge(chargingOrder);
break;
--
Gitblit v1.7.1