From 16956330eb3f36b4a8ad7b1f03a80bcdc44aab57 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 10 May 2023 14:47:03 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E5=85=85=E7=94=B5?= =?UTF-8?q?=E7=AB=99=E5=90=8D=E7=A7=B0=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OrderBasicInfoServiceImpl.java | 20 +++++++++++++++++++ .../impl/PileConnectorInfoServiceImpl.java | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index f95f78efd..3e91b6373 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -692,6 +692,26 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { } catch (Exception e) { logger.error("小程序发送充电停止推送消息 error", e); } + + realTimeMonitorDataRedis2DB(orderBasicInfo.getTransactionCode()); + } + + /** + * 从redis中取出实时记录保存到表中 + * 当订单完成的时候调用 + */ + private void realTimeMonitorDataRedis2DB(String transactionCode) { + if (StringUtils.isBlank(transactionCode)) { + return; + } + + + List chargingRealTimeData = getChargingRealTimeData(transactionCode); + + // 删除redis中缓存 + String pileConnectorCode = transactionCode.substring(0, 16); + String redisKey = CacheConstants.PILE_REAL_TIME_MONITOR_DATA + pileConnectorCode + "_" + transactionCode; + redisCache.deleteObject(redisKey); } @Override diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java index be7b3c4b0..bda70444c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java @@ -467,8 +467,8 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService { pileConnectorInfoVO.setChargingTime(realTimeMonitorData.getSumChargingTime()); // 已充时长 // 计算实时功率（单位：kw） BigDecimal instantPowerTemp = outputVoltage.multiply(outputCurrent); - BigDecimal instantPower = instantPowerTemp.divide(new BigDecimal(1000)); - pileConnectorInfoVO.setInstantPower(instantPower.setScale(2, BigDecimal.ROUND_HALF_UP)); + BigDecimal instantPower = instantPowerTemp.divide(new BigDecimal(1000), 2, BigDecimal.ROUND_HALF_UP); + pileConnectorInfoVO.setInstantPower(instantPower); log.info("枪口实时数据：{}", JSONObject.toJSONString(pileConnectorInfoVO)); }