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() + "%"); 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() + "%"); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java index b559f32..7ad1f32 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java @@ -21,11 +21,9 @@ @Override public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataSignalGenerator signalGenerator) { signalGenerator.setNominalValue(StringUtils.isNotBlank(signalGenerator.getNominalValue()) ? signalGenerator.getNominalValue() + signalGenerator.getUnit() : ""); -// signalGenerator.setLowerIndex(StringUtils.isNotBlank(signalGenerator.getLowerIndex()) ? signalGenerator.getLowerIndex() + signalGenerator.getUnit() : ""); -// signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndex() + signalGenerator.getUnit() : ""); signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : ""); if (signalGenerator.getExceedMark() == 1) { - signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue())?signalGenerator.getMeasureValue() + "*":signalGenerator.getMeasureValue()); + signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : signalGenerator.getMeasureValue()); } } }, @@ -44,7 +42,7 @@ // signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndex() + signalGenerator.getUnit() : ""); signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : ""); if (signalGenerator.getExceedMark() == 1) { - signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue())?signalGenerator.getMeasureValue() + "*":signalGenerator.getMeasureValue()); + signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : signalGenerator.getMeasureValue()); } } }, @@ -64,11 +62,11 @@ signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : ""); signalGenerator.setThd(StringUtils.isNotBlank(signalGenerator.getThd()) ? signalGenerator.getThd() + "%" : ""); signalGenerator.setUpperThd(StringUtils.isNotBlank(signalGenerator.getUpperThd()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperThd() + signalGenerator.getUpperIndexUnit() : ""); - if (signalGenerator.getExceedMark() == 1){ - signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue())?signalGenerator.getMeasureValue() + "*":""); + if (signalGenerator.getExceedMark() == 1) { + signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : ""); } - if (signalGenerator.getExceedMarkOne()==1){ - signalGenerator.setThd(StringUtils.isNotBlank(signalGenerator.getThd())?signalGenerator.getThd() + "*":signalGenerator.getThd()); + if (signalGenerator.getExceedMarkOne() == 1) { + signalGenerator.setThd(StringUtils.isNotBlank(signalGenerator.getThd()) ? signalGenerator.getThd() + "*" : signalGenerator.getThd()); } } }, @@ -82,10 +80,10 @@ @Override public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataSignalGenerator signalGenerator) { signalGenerator.setFrequency(StringUtils.isNotBlank(signalGenerator.getFrequency()) ? signalGenerator.getFrequency() + signalGenerator.getFrequencyUnit() : ""); - signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation())? signalGenerator.getRemainAmplitudeModulation() + signalGenerator.getUpperIndexUnit() : ""); - signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : ""); - if (signalGenerator.getExceedMark() == 1){ - signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation())? signalGenerator.getRemainAmplitudeModulation() + "*" : signalGenerator.getRemainAmplitudeModulation()); + signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + "%" : ""); + signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : ""); + if (signalGenerator.getExceedMark() == 1) { + signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + "*" : signalGenerator.getRemainAmplitudeModulation()); } } }, @@ -100,9 +98,9 @@ public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataSignalGenerator signalGenerator) { signalGenerator.setFrequency(StringUtils.isNotBlank(signalGenerator.getFrequency()) ? signalGenerator.getFrequency() + signalGenerator.getFrequencyUnit() : ""); signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : ""); - signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : ""); - if (signalGenerator.getExceedMark() == 1){ - signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue())?signalGenerator.getMeasureValue() + "*":""); + signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : ""); + if (signalGenerator.getExceedMark() == 1) { + signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : ""); } } } 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() + "%"); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java index b559f32..7ad1f32 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/SignalGeneratorStrategyType.java @@ -21,11 +21,9 @@ @Override public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataSignalGenerator signalGenerator) { signalGenerator.setNominalValue(StringUtils.isNotBlank(signalGenerator.getNominalValue()) ? signalGenerator.getNominalValue() + signalGenerator.getUnit() : ""); -// signalGenerator.setLowerIndex(StringUtils.isNotBlank(signalGenerator.getLowerIndex()) ? signalGenerator.getLowerIndex() + signalGenerator.getUnit() : ""); -// signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndex() + signalGenerator.getUnit() : ""); signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : ""); if (signalGenerator.getExceedMark() == 1) { - signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue())?signalGenerator.getMeasureValue() + "*":signalGenerator.getMeasureValue()); + signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : signalGenerator.getMeasureValue()); } } }, @@ -44,7 +42,7 @@ // signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndex() + signalGenerator.getUnit() : ""); signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : ""); if (signalGenerator.getExceedMark() == 1) { - signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue())?signalGenerator.getMeasureValue() + "*":signalGenerator.getMeasureValue()); + signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : signalGenerator.getMeasureValue()); } } }, @@ -64,11 +62,11 @@ signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : ""); signalGenerator.setThd(StringUtils.isNotBlank(signalGenerator.getThd()) ? signalGenerator.getThd() + "%" : ""); signalGenerator.setUpperThd(StringUtils.isNotBlank(signalGenerator.getUpperThd()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperThd() + signalGenerator.getUpperIndexUnit() : ""); - if (signalGenerator.getExceedMark() == 1){ - signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue())?signalGenerator.getMeasureValue() + "*":""); + if (signalGenerator.getExceedMark() == 1) { + signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : ""); } - if (signalGenerator.getExceedMarkOne()==1){ - signalGenerator.setThd(StringUtils.isNotBlank(signalGenerator.getThd())?signalGenerator.getThd() + "*":signalGenerator.getThd()); + if (signalGenerator.getExceedMarkOne() == 1) { + signalGenerator.setThd(StringUtils.isNotBlank(signalGenerator.getThd()) ? signalGenerator.getThd() + "*" : signalGenerator.getThd()); } } }, @@ -82,10 +80,10 @@ @Override public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataSignalGenerator signalGenerator) { signalGenerator.setFrequency(StringUtils.isNotBlank(signalGenerator.getFrequency()) ? signalGenerator.getFrequency() + signalGenerator.getFrequencyUnit() : ""); - signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation())? signalGenerator.getRemainAmplitudeModulation() + signalGenerator.getUpperIndexUnit() : ""); - signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : ""); - if (signalGenerator.getExceedMark() == 1){ - signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation())? signalGenerator.getRemainAmplitudeModulation() + "*" : signalGenerator.getRemainAmplitudeModulation()); + signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + "%" : ""); + signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : ""); + if (signalGenerator.getExceedMark() == 1) { + signalGenerator.setRemainAmplitudeModulation(StringUtils.isNotBlank(signalGenerator.getRemainAmplitudeModulation()) ? signalGenerator.getRemainAmplitudeModulation() + "*" : signalGenerator.getRemainAmplitudeModulation()); } } }, @@ -100,9 +98,9 @@ public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataSignalGenerator signalGenerator) { signalGenerator.setFrequency(StringUtils.isNotBlank(signalGenerator.getFrequency()) ? signalGenerator.getFrequency() + signalGenerator.getFrequencyUnit() : ""); signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + signalGenerator.getMeasureValueUnit() : ""); - signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : ""); - if (signalGenerator.getExceedMark() == 1){ - signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue())?signalGenerator.getMeasureValue() + "*":""); + signalGenerator.setUpperIndex(StringUtils.isNotBlank(signalGenerator.getUpperIndex()) ? signalGenerator.getUpperIndexSymbol() + signalGenerator.getUpperIndex() + signalGenerator.getUpperIndexUnit() : ""); + if (signalGenerator.getExceedMark() == 1) { + signalGenerator.setMeasureValue(StringUtils.isNotBlank(signalGenerator.getMeasureValue()) ? signalGenerator.getMeasureValue() + "*" : ""); } } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java index eb6aa00..8592ef2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/DocPictureProvider.java @@ -155,7 +155,7 @@ footerParagraph.appendText(" "); footerParagraph.appendText(" 第 "); footerParagraph.appendField("第 " + "page number" + "页", FieldType.Field_Page); - footerParagraph.appendText(" 页 共"); + footerParagraph.appendText(" 页 共 "); footerParagraph.appendField("number of pages", FieldType.Field_Num_Pages); footerParagraph.appendText(" 页 "); footerParagraph.getFormat().setHorizontalAlignment(HorizontalAlignment.Right);