From a8e57cc3440987cefe81d9169cf910b4b1465e96 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Fri, 20 Sep 2024 10:39:43 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=94=B5=E5=8D=95=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/pile/PileBillingTemplateController.java | 1 + .../pile/service/impl/PileConnectorInfoServiceImpl.java | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBillingTemplateController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBillingTemplateController.java index df63fe439..8336adeb2 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBillingTemplateController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBillingTemplateController.java @@ -123,6 +123,7 @@ public class PileBillingTemplateController extends BaseController { * @param dto * @return */ + @Log(title = "计费模板", businessType = BusinessType.UPDATE) @PostMapping("/updateBillingTemplate") public AjaxResult updateBillingTemplate(@RequestBody CreateOrUpdateBillingTemplateDTO dto) { logger.info("修改计费模板 param:{}", JSON.toJSONString(dto)); 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 da585d790..122b33bb5 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 @@ -520,8 +520,12 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService { BigDecimal outputCurrent = new BigDecimal(realTimeMonitorData.getOutputCurrent()); pileConnectorInfoVO.setCurrent(outputCurrent); pileConnectorInfoVO.setSOC(realTimeMonitorData.getSOC()); // 充电百分比 - pileConnectorInfoVO.setChargingAmount(new BigDecimal(realTimeMonitorData.getChargingAmount())); - pileConnectorInfoVO.setChargingDegree(new BigDecimal(realTimeMonitorData.getChargingDegree())); + if (StringUtils.isNotBlank(realTimeMonitorData.getChargingAmount())) { + pileConnectorInfoVO.setChargingAmount(new BigDecimal(realTimeMonitorData.getChargingAmount())); + } + if (StringUtils.isNotBlank(realTimeMonitorData.getChargingDegree())) { + pileConnectorInfoVO.setChargingDegree(new BigDecimal(realTimeMonitorData.getChargingDegree())); + } pileConnectorInfoVO.setGunLineTemperature(realTimeMonitorData.getGunLineTemperature()); // 枪线温度 pileConnectorInfoVO.setTimeRemaining(realTimeMonitorData.getTimeRemaining()); // 剩余时间 pileConnectorInfoVO.setChargingTime(realTimeMonitorData.getSumChargingTime()); // 已充时长 @@ -529,7 +533,6 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService { BigDecimal instantPowerTemp = outputVoltage.multiply(outputCurrent); BigDecimal instantPower = instantPowerTemp.divide(new BigDecimal(1000), 2, BigDecimal.ROUND_HALF_UP); pileConnectorInfoVO.setInstantPower(instantPower); - log.info("枪口实时数据：{}", JSON.toJSONString(pileConnectorInfoVO)); } // 查缓存是否故障