From 3e3cbed3a50aa4aa8eeec70868d93fd738e113a3 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Mon, 20 Nov 2023 11:26:24 +0800 Subject: [PATCH] =?UTF-8?q?#=E5=8D=95=E4=BD=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/operation/home/impl/RealTargetServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java index 8674140..9bdfc9e 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java @@ -1515,28 +1515,28 @@ public class RealTargetServiceImpl implements RealTargetService { return; } // 有功功率单位 - String power = unitMap.get(device.getId().toString().toUpperCase()+HomePageConstant.CONCAT_P); + String power = unitMap.get(device.getEmCode().toUpperCase()+HomePageConstant.CONCAT_P); if(StringUtil.isNotBlank(power)){ realVo.setPowerUnit(power); } else { realVo.setPowerUnit("kW"); } // 无功功率 - String reactivePowerUnit = unitMap.get(device.getId().toString().toUpperCase()+HomePageConstant.CONCAT_Q); + String reactivePowerUnit = unitMap.get(device.getEmCode().toUpperCase()+HomePageConstant.CONCAT_Q); if(StringUtil.isNotBlank(reactivePowerUnit)){ realVo.setReactivePowerUnit(reactivePowerUnit); } else { realVo.setReactivePowerUnit("kVa r"); } // 定子电压单位 - String voltage = unitMap.get(device.getId().toString().toUpperCase()+HomePageConstant.CONCAT_UAB); + String voltage = unitMap.get(device.getEmCode().toUpperCase()+HomePageConstant.CONCAT_UAB); if(StringUtil.isNotBlank(voltage)){ realVo.setVoltageUnit(voltage); } else { realVo.setVoltageUnit("V"); } // 定子电流单位 - String current = unitMap.get(device.getId().toString().toUpperCase()+HomePageConstant.CONCAT_IA); + String current = unitMap.get(device.getEmCode().toUpperCase()+HomePageConstant.CONCAT_IA); if(StringUtil.isNotBlank(current)){ realVo.setCurrentUnit(current); } else {