From 86d6cddf9c0feef68b7e3c4fc9dd4fd4c6a5623e Mon Sep 17 00:00:00 2001 From: Lemon Date: Sat, 20 Jan 2024 15:58:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E7=94=B5=E8=81=94=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E7=AB=99=E7=82=B9=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E3=80=81=E6=9E=AA=E5=8F=A3=E5=8A=9F=E7=8E=87=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E9=99=A4=E4=BB=A5=E6=9E=AA=E5=8F=A3=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ZDLServiceImpl.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java index 8dfa9cca0..7a2dc218f 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java @@ -239,6 +239,10 @@ public class ZDLServiceImpl implements ZDLService { String equipmentOwnerId = StringUtils.substring(organizationCode, organizationCode.length() - 10, organizationCode.length() - 1); info.setEquipmentOwnerId(equipmentOwnerId); } + // 站点图片 + if (StringUtils.isNotBlank(pileStationInfo.getPictures())) { + info.setPictures(Lists.newArrayList(pileStationInfo.getPictures().split(","))); + } List pileList = getPileList(pileStationInfo); if (CollectionUtils.isNotEmpty(pileList)) { @@ -642,14 +646,14 @@ public class ZDLServiceImpl implements ZDLService { connectorInfo.setVoltageLowerLimits(Integer.valueOf(modelInfo.getRatedVoltage())); connectorInfo.setCurrent(Integer.valueOf(modelInfo.getRatedCurrent())); connectorInfo.setNationalStandard(2); - if (!StringUtils.equals(modelInfo.getConnectorNum(), "1")) { - // 如果不是单枪，则枪口功率需要除以枪口数量 - String ratedPowerStr = modelInfo.getRatedPower(); - BigDecimal ratedPower = new BigDecimal(ratedPowerStr); - connectorInfo.setPower(ratedPower.divide(new BigDecimal(modelInfo.getConnectorNum()), 1, BigDecimal.ROUND_HALF_UP)); - }else { - connectorInfo.setPower(new BigDecimal(modelInfo.getRatedPower()).setScale(1, BigDecimal.ROUND_HALF_UP)); - } + // if (!StringUtils.equals(modelInfo.getConnectorNum(), "1")) { + // // 如果不是单枪，则枪口功率需要除以枪口数量 + // String ratedPowerStr = modelInfo.getRatedPower(); + // BigDecimal ratedPower = new BigDecimal(ratedPowerStr); + // connectorInfo.setPower(ratedPower.divide(new BigDecimal(modelInfo.getConnectorNum()), 1, BigDecimal.ROUND_HALF_UP)); + // }else { + // } + connectorInfo.setPower(new BigDecimal(modelInfo.getRatedPower()).setScale(1, BigDecimal.ROUND_HALF_UP)); resultList.add(connectorInfo); }