diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java index b348149..3807fa9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java @@ -20,7 +20,7 @@ public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataDcPower dcPower) { if (StringUtils.isNotBlank(dcPower.getVoltageRegulation()) && StringUtils.isNotBlank(dcPower.getTechnicalIndex()) && !"/".equals(dcPower.getVoltageRegulation()) && !"/".equals(dcPower.getTechnicalIndex())) { int digit = dcPower.getTechnicalIndexDigit(); - BigDecimal voltageRegulation = new BigDecimal(dcPower.getVoltageRegulation()).setScale(digit + 1); + BigDecimal voltageRegulation = new BigDecimal(dcPower.getVoltageRegulation()).setScale(digit); BigDecimal technicalIndex = new BigDecimal(dcPower.getTechnicalIndex()); if ("≤".equals(dcPower.getTechnicalIndexSymbol())) { int compare = voltageRegulation.compareTo(technicalIndex); @@ -50,7 +50,7 @@ public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataDcPower dcPower) { if (StringUtils.isNotBlank(dcPower.getTechnicalIndex()) && StringUtils.isNotBlank(dcPower.getLoadRegulation()) && !"/".equals(dcPower.getTechnicalIndex()) && !"/".equals(dcPower.getLoadRegulation())) { int digit = dcPower.getTechnicalIndexDigit(); - BigDecimal loadRegulation = new BigDecimal(dcPower.getLoadRegulation()).setScale(digit + 1); + BigDecimal loadRegulation = new BigDecimal(dcPower.getLoadRegulation()).setScale(digit); BigDecimal technicalIndex = new BigDecimal(dcPower.getTechnicalIndex()); int compare = loadRegulation.compareTo(technicalIndex); dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%");