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 27a9bf4..b348149 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 @@ -18,20 +18,31 @@ */ @Override public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataDcPower dcPower) { - if (StringUtils.isNotBlank(dcPower.getVoltageRegulation()) && StringUtils.isNotBlank(dcPower.getTechnicalIndex()) && !"/".equals(dcPower.getVoltageRegulation()) && "/".equals(dcPower.getTechnicalIndex())) { + 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 technicalIndex = new BigDecimal(dcPower.getTechnicalIndex()); - int compare = voltageRegulation.compareTo(technicalIndex); - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); - dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); - if (compare > 0) { - dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "*"); + if ("≤".equals(dcPower.getTechnicalIndexSymbol())) { + int compare = voltageRegulation.compareTo(technicalIndex); + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); + if (compare > 0) { + dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "*"); + } + } + if ("±".equals(dcPower.getTechnicalIndexSymbol())) { + BigDecimal negateTechnicalIndex = technicalIndex.negate(); + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); + int max = voltageRegulation.compareTo(technicalIndex); + int min = voltageRegulation.compareTo(negateTechnicalIndex); + if (max > 0 || min < 0) { + dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "*"); + } } } } - }, - LOAD_REGULATION { + }, LOAD_REGULATION { /** * @param dcPower */ @@ -49,8 +60,7 @@ } } } - }, - ABSOLUTE_ERROR { + }, ABSOLUTE_ERROR { /** * @param dcPower */ @@ -70,8 +80,7 @@ } } } - }, - RIPPLE_VOLTAGE { + }, RIPPLE_VOLTAGE { /** * @param dcPower */ @@ -88,14 +97,13 @@ } } } - }, - SHORT_TERM_STABILITY { + }, SHORT_TERM_STABILITY { /** * @param dcPower */ @Override public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataDcPower dcPower) { - if (StringUtils.isNotBlank(dcPower.getTechnicalIndex()) && StringUtils.isNotBlank(dcPower.getShortTermStability()) && !"/".equals(dcPower.getShortTermStability()) && "/".equals(dcPower.getTechnicalIndex())){ + if (StringUtils.isNotBlank(dcPower.getTechnicalIndex()) && StringUtils.isNotBlank(dcPower.getShortTermStability()) && !"/".equals(dcPower.getShortTermStability()) && "/".equals(dcPower.getTechnicalIndex())) { int digit = dcPower.getTechnicalIndexDigit(); BigDecimal shortTermStability = new BigDecimal(dcPower.getShortTermStability()).setScale(digit + 1); BigDecimal technicalIndex = new BigDecimal(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 27a9bf4..b348149 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 @@ -18,20 +18,31 @@ */ @Override public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataDcPower dcPower) { - if (StringUtils.isNotBlank(dcPower.getVoltageRegulation()) && StringUtils.isNotBlank(dcPower.getTechnicalIndex()) && !"/".equals(dcPower.getVoltageRegulation()) && "/".equals(dcPower.getTechnicalIndex())) { + 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 technicalIndex = new BigDecimal(dcPower.getTechnicalIndex()); - int compare = voltageRegulation.compareTo(technicalIndex); - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); - dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); - if (compare > 0) { - dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "*"); + if ("≤".equals(dcPower.getTechnicalIndexSymbol())) { + int compare = voltageRegulation.compareTo(technicalIndex); + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); + if (compare > 0) { + dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "*"); + } + } + if ("±".equals(dcPower.getTechnicalIndexSymbol())) { + BigDecimal negateTechnicalIndex = technicalIndex.negate(); + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); + int max = voltageRegulation.compareTo(technicalIndex); + int min = voltageRegulation.compareTo(negateTechnicalIndex); + if (max > 0 || min < 0) { + dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "*"); + } } } } - }, - LOAD_REGULATION { + }, LOAD_REGULATION { /** * @param dcPower */ @@ -49,8 +60,7 @@ } } } - }, - ABSOLUTE_ERROR { + }, ABSOLUTE_ERROR { /** * @param dcPower */ @@ -70,8 +80,7 @@ } } } - }, - RIPPLE_VOLTAGE { + }, RIPPLE_VOLTAGE { /** * @param dcPower */ @@ -88,14 +97,13 @@ } } } - }, - SHORT_TERM_STABILITY { + }, SHORT_TERM_STABILITY { /** * @param dcPower */ @Override public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataDcPower dcPower) { - if (StringUtils.isNotBlank(dcPower.getTechnicalIndex()) && StringUtils.isNotBlank(dcPower.getShortTermStability()) && !"/".equals(dcPower.getShortTermStability()) && "/".equals(dcPower.getTechnicalIndex())){ + if (StringUtils.isNotBlank(dcPower.getTechnicalIndex()) && StringUtils.isNotBlank(dcPower.getShortTermStability()) && !"/".equals(dcPower.getShortTermStability()) && "/".equals(dcPower.getTechnicalIndex())) { int digit = dcPower.getTechnicalIndexDigit(); BigDecimal shortTermStability = new BigDecimal(dcPower.getShortTermStability()).setScale(digit + 1); BigDecimal technicalIndex = new BigDecimal(dcPower.getTechnicalIndex()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java index 4e03e75..64bb22f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java @@ -273,7 +273,7 @@ replaceSlash(map); map.put("pdfStatus", 1); List templateUrls = new ArrayList<>(); - templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "1", request.getItemCategoryName())); + templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(DC_POWER_SUPPLY, "1", request.getItemCategoryName())); //与证书模板区分 SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -344,43 +344,6 @@ map.put("shortRepList", shortRepList); } - /** - * 封面基本信息的定制化参数 - * - * @param map - * @param measureDataElectricalSafetyList - */ - private void prepareCustomCoverParams(Map map, List measureDataElectricalSafetyList) { - //定制参数 - //初始化方框 - map.put("test", "\uF0A3"); - map.put("calibrate", "\uF0A3"); - map.put("measure", "\uF0A3"); - //选择方框 - switch ((String) map.get("measureCategoryName")) { - case TEST_REPORT: - map.put("test", "\uF052"); - break; - case CALIBRATE_REPORT: - map.put("calibrate", "\uF052"); - break; - case MEASURE_REPORT: - map.put("measure", "\uF052"); - break; - default: - return; - } - //填充有效日期 - if (!ObjectUtils.isEmpty(map.get(MEASURE_TRACE_DATE))) { - String traceDate = (String) map.get(MEASURE_TRACE_DATE); - try { - map.put(MEASURE_TRACE_DATE, new SimpleDateFormat("yyyy年MM月dd日").format(new SimpleDateFormat("yyyy-MM-dd").parse(traceDate))); - } catch (Exception e) { - throw new BusinessException(1500, String.format(traceDate, "检定有效日期,格式不正确")); - } - } - } - @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { @@ -415,7 +378,7 @@ log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getItemCategoryName())); + customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(DC_POWER_SUPPLY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); map.put("pdfStatus", 1);