diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 7422613..889a4e6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -15,6 +15,20 @@ public class StandardEquipmentSupport implements MeasureCategoryEnum { /** + * 替换map集合中的空值为斜杠/ + * @param map + */ + protected void mapReplace(Map map) { + List excludedKeys = Arrays.asList("approvalStatus", "processId", "createUserId", "createUserName", + "checkUserName", "approvalStatusName", "taskId", "decisionItem", "staffName","lessThan"); + map.forEach((k, v) -> { + if (!excludedKeys.contains(k) && org.springframework.util.ObjectUtils.isEmpty(v)) { + map.put(k, "/"); + } + }); + } + + /** * 填充固定的信息参数 */ protected void prepareCoverParams(Map map, String labCode) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 7422613..889a4e6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -15,6 +15,20 @@ public class StandardEquipmentSupport implements MeasureCategoryEnum { /** + * 替换map集合中的空值为斜杠/ + * @param map + */ + protected void mapReplace(Map map) { + List excludedKeys = Arrays.asList("approvalStatus", "processId", "createUserId", "createUserName", + "checkUserName", "approvalStatusName", "taskId", "decisionItem", "staffName","lessThan"); + map.forEach((k, v) -> { + if (!excludedKeys.contains(k) && org.springframework.util.ObjectUtils.isEmpty(v)) { + map.put(k, "/"); + } + }); + } + + /** * 填充固定的信息参数 */ protected void prepareCoverParams(Map map, String labCode) { 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 afc322a..bdd83db 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 @@ -16,6 +16,7 @@ import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo; import com.casic.missiles.model.equipment.BizEquipmentInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataDcPower; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataElectricalSafety; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentSupport; @@ -43,8 +44,6 @@ @Slf4j public class DcPowerSupplyHandler extends StandardEquipmentSupport implements PrintFileModuleNameEnum, StandardEquipmentPrint { - private final BizBusinessDeviceMeasureInfoMapper bizBusinessDeviceMeasureInfoMapper; - private final PrintFileRegister printFileRegister; private final BizBusinessDeviceMeasureEquipmentMapper bizBusinessDeviceMeasureEquipmentMapper; @@ -62,104 +61,9 @@ return null; } Map map = BeanUtil.beanToMap(request); - //划分为直流电压，电源效应和负载效应Power and load effects，直流电流（直接测量）Direct current (direct measurement)，直流电流（间接测量）Direct current (indirect measurement)，纹波电压Ripple Voltage - String[] pointStr = {DC_VOLTAGE, POWER_AND_LOAD_EFFECTS, DC_CURRENT_DIRECT_MEASUREMENT, DC_CURRENT_INDIRECT_MEASUREMENT}; - //稳定性、重复性 - final String[] checkTypes = {REPEATABILITY, STABILITY}; - List pointList = Arrays.asList(pointStr); + mapReplace(map); - for (int i = 0; i < pointList.size(); i++) { - String points = pointList.get(i); - //重复性 - List repList = request.getCheckDataDcPowerList() - .stream().filter(e -> points.equals(e.getCheckParam()) - && checkTypes[0].equals(e.getCheckType()) - && StringUtils.isEmpty(e.getTestValueFiveDate())).collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(repList)) { - List repMapList = new ArrayList<>(); - for (BizEquipmentStandardCheckDataDcPower rep : repList) { - Map repMap = BeanUtil.beanToMap(rep); - repMapList.add(repMap); - } - map.put(REPEAT_PREFIX + (i + 1), repMapList); - } - //稳定性 - List staList = request.getCheckDataDcPowerList() - .stream().filter(e -> points.equals(e.getCheckParam()) - && checkTypes[1].equals(e.getCheckType()) - && (StringUtils.isNotEmpty(e.getTestValueOneDate()) - || StringUtils.isNotEmpty(e.getTestValueTwoDate()) - || StringUtils.isNotEmpty(e.getTestValueThreeDate()) - || StringUtils.isNotEmpty(e.getTestValueFourDate()) - || StringUtils.isNotEmpty(e.getTestValueFiveDate()) - || StringUtils.isNotEmpty(e.getTestValueSixDate())) - ).collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(staList)) { - statisticalDate(staList, STA_PREFIX + (i + 1), map); - List repMapList = new ArrayList<>(); - for (BizEquipmentStandardCheckDataDcPower sta : staList) { - Map repMap = BeanUtil.beanToMap(sta); - if (sta.getLessThan() != null) { - repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); - }else { - repMap.put("lessThan",""); - } - repMapList.add(repMap); - } - map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF0A3"); - map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF0A3"); - if (1 == staList.get(0).getQualified()) { - map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF052"); - } else { - map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF052"); - } - map.put(STA_PREFIX + (i + 1), repMapList); - } - } - - List repList = request.getCheckDataDcPowerList().stream() - .filter(d -> RIPPLE_VOLTAGE.equals(d.getCheckParam()) - && checkTypes[0].equals(d.getCheckType())) - .collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(repList)) { - List repMapList = new ArrayList<>(); - for (BizEquipmentStandardCheckDataDcPower rep : repList) { - Map repMap = BeanUtil.beanToMap(rep); - repMapList.add(repMap); - } - map.put(REPEAT_PREFIX + 5, repMapList); - } - - List staList = request.getCheckDataDcPowerList().stream() - .filter(d -> RIPPLE_VOLTAGE.equals(d.getCheckParam()) - && checkTypes[1].equals(d.getCheckType()) - && (StringUtils.isNotEmpty(d.getTestValueOneDate()) - || StringUtils.isNotEmpty(d.getTestValueTwoDate()) - || StringUtils.isNotEmpty(d.getTestValueThreeDate()) - || StringUtils.isNotEmpty(d.getTestValueFourDate()) - || StringUtils.isNotEmpty(d.getTestValueFiveDate()) - || StringUtils.isNotEmpty(d.getTestValueSixDate()))).collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(staList)) { - statisticalDate(staList, STA_PREFIX + 5, map); - List repMapList = new ArrayList<>(); - for (BizEquipmentStandardCheckDataDcPower sta : staList) { - Map repMap = BeanUtil.beanToMap(sta); - if (sta.getLessThan() != null) { - repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); - }else { - repMap.put("lessThan",""); - } - repMapList.add(repMap); - } - map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF0A3"); - map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF0A3"); - if (1 == staList.get(0).getQualified()) { - map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF052"); - } else { - map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF052"); - } - map.put(STA_PREFIX + 5, repMapList); - } + prepareCheckParams(request, map); //除了选用的模板不一致，模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY_CHECK_DATA, "数据打印", null, map, false, null, null); @@ -177,6 +81,148 @@ } } + private void prepareCheckParams(BizEquipmentStandardCheckRecordApproval request, Map map) { + //划分为直流电压，电源效应和负载效应Power and load effects，直流电流（直接测量）Direct current (direct measurement)，直流电流（间接测量）Direct current (indirect measurement)，纹波电压Ripple Voltage + String[] pointStr = {DC_VOLTAGE, POWER_AND_LOAD_EFFECTS, DC_CURRENT_DIRECT_MEASUREMENT, DC_CURRENT_INDIRECT_MEASUREMENT}; + //稳定性、重复性 + final String[] checkTypes = {REPEATABILITY, STABILITY}; + List pointList = Arrays.asList(pointStr); + + Map numMap = new HashMap<>(); + numMap.put(1, 3); + numMap.put(2, 7); + numMap.put(3, 3); + numMap.put(4, 4); + numMap.put(5, 6); + + for (int i = 0; i < pointList.size(); i++) { + String points = pointList.get(i); + //重复性 + List repList = request.getCheckDataDcPowerList() + .stream().filter(e -> points.equals(e.getCheckParam()) + && checkTypes[0].equals(e.getCheckType()) + && StringUtils.isEmpty(e.getTestValueFiveDate())).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(repList)) { + List repMapList = new ArrayList<>(); + for (BizEquipmentStandardCheckDataDcPower rep : repList) { + Map repMap = BeanUtil.beanToMap(rep); + mapReplace(repMap); + repMapList.add(repMap); + } + int size = numMap.get(i + 1) - repMapList.size(); + for (int j = 0; j < size; j++) { + BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); + Map powerMap = BeanUtil.beanToMap(dcPower); + mapReplace(powerMap); + repMapList.add(powerMap); + } + map.put(REPEAT_PREFIX + (i + 1), repMapList); + } + //稳定性 + List staList = request.getCheckDataDcPowerList() + .stream().filter(e -> points.equals(e.getCheckParam()) + && checkTypes[1].equals(e.getCheckType()) + && (StringUtils.isNotEmpty(e.getTestValueOneDate()) + || StringUtils.isNotEmpty(e.getTestValueTwoDate()) + || StringUtils.isNotEmpty(e.getTestValueThreeDate()) + || StringUtils.isNotEmpty(e.getTestValueFourDate()) + || StringUtils.isNotEmpty(e.getTestValueFiveDate()) + || StringUtils.isNotEmpty(e.getTestValueSixDate())) + ).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(staList)) { + statisticalDate(staList, STA_PREFIX + (i + 1), map); + List repMapList = new ArrayList<>(); + for (BizEquipmentStandardCheckDataDcPower sta : staList) { + Map repMap = BeanUtil.beanToMap(sta); + mapReplace(repMap); + if (sta.getLessThan() != null) { + repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); + } else { + repMap.put("lessThan", ""); + } + repMapList.add(repMap); + } + int size = numMap.get(i + 1) - repMapList.size(); + for (int j = 0; j < size; j++) { + BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); + Map powerMap = BeanUtil.beanToMap(dcPower); + mapReplace(powerMap); + powerMap.put("lessThan", ""); + repMapList.add(powerMap); + } + map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF0A3"); + map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF0A3"); + if (1 == staList.get(0).getQualified()) { + map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF052"); + } else { + map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF052"); + } + map.put(STA_PREFIX + (i + 1), repMapList); + } + } + + List repList = request.getCheckDataDcPowerList().stream() + .filter(d -> RIPPLE_VOLTAGE.equals(d.getCheckParam()) + && checkTypes[0].equals(d.getCheckType())) + .collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(repList)) { + List repMapList = new ArrayList<>(); + for (BizEquipmentStandardCheckDataDcPower rep : repList) { + Map repMap = BeanUtil.beanToMap(rep); + mapReplace(repMap); + repMapList.add(repMap); + } + int size = numMap.get(5) - repMapList.size(); + for (int j = 0; j < size; j++) { + BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); + Map powerMap = BeanUtil.beanToMap(dcPower); + mapReplace(powerMap); + repMapList.add(powerMap); + } + map.put(REPEAT_PREFIX + 5, repMapList); + } + + List staList = request.getCheckDataDcPowerList().stream() + .filter(d -> RIPPLE_VOLTAGE.equals(d.getCheckParam()) + && checkTypes[1].equals(d.getCheckType()) + && (StringUtils.isNotEmpty(d.getTestValueOneDate()) + || StringUtils.isNotEmpty(d.getTestValueTwoDate()) + || StringUtils.isNotEmpty(d.getTestValueThreeDate()) + || StringUtils.isNotEmpty(d.getTestValueFourDate()) + || StringUtils.isNotEmpty(d.getTestValueFiveDate()) + || StringUtils.isNotEmpty(d.getTestValueSixDate()))).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(staList)) { + statisticalDate(staList, STA_PREFIX + 5, map); + List repMapList = new ArrayList<>(); + for (BizEquipmentStandardCheckDataDcPower sta : staList) { + Map repMap = BeanUtil.beanToMap(sta); + mapReplace(repMap); + if (sta.getLessThan() != null) { + repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); + } else { + repMap.put("lessThan", ""); + } + repMapList.add(repMap); + } + int size = numMap.get(5) - repMapList.size(); + for (int j = 0; j < size; j++) { + BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); + Map powerMap = BeanUtil.beanToMap(dcPower); + mapReplace(powerMap); + powerMap.put("lessThan", ""); + repMapList.add(powerMap); + } + map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF0A3"); + map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF0A3"); + if (1 == staList.get(0).getQualified()) { + map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF052"); + } else { + map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF052"); + } + map.put(STA_PREFIX + 5, repMapList); + } + } + /** * 组装参数 * @@ -186,16 +232,16 @@ */ private void statisticalDate(List sta, String strListParam, Map map) { //再次健壮性判断，防止其他方法调用，或者已经存在直接退出 - if (com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(sta) || map.containsKey(strListParam + DATE_PREFIX + 1)) { + if (CollectionUtils.isEmpty(sta) || map.containsKey(strListParam + DATE_PREFIX + 1)) { return; } BizEquipmentStandardCheckDataDcPower dataCalibrator = sta.get(0); - map.put(strListParam + DATE_PREFIX + 1, dataCalibrator.getTestValueOneDate()); - map.put(strListParam + DATE_PREFIX + 2, dataCalibrator.getTestValueTwoDate()); - map.put(strListParam + DATE_PREFIX + 3, dataCalibrator.getTestValueThreeDate()); - map.put(strListParam + DATE_PREFIX + 4, dataCalibrator.getTestValueFourDate()); - map.put(strListParam + DATE_PREFIX + 5, dataCalibrator.getTestValueFiveDate()); - map.put(strListParam + DATE_PREFIX + 6, dataCalibrator.getTestValueSixDate()); + map.put(strListParam + DATE_PREFIX + 1, StringUtils.isNotBlank(dataCalibrator.getTestValueOneDate()) ? dataCalibrator.getTestValueOneDate() : "/"); + map.put(strListParam + DATE_PREFIX + 2, StringUtils.isNotBlank(dataCalibrator.getTestValueTwoDate()) ? dataCalibrator.getTestValueTwoDate() : "/"); + map.put(strListParam + DATE_PREFIX + 3, StringUtils.isNotBlank(dataCalibrator.getTestValueThreeDate()) ? dataCalibrator.getTestValueThreeDate() : "/"); + map.put(strListParam + DATE_PREFIX + 4, StringUtils.isNotBlank(dataCalibrator.getTestValueFourDate()) ? dataCalibrator.getTestValueFourDate() : "/"); + map.put(strListParam + DATE_PREFIX + 5, StringUtils.isNotBlank(dataCalibrator.getTestValueFiveDate()) ? dataCalibrator.getTestValueFiveDate() : "/"); + map.put(strListParam + DATE_PREFIX + 6, StringUtils.isNotBlank(dataCalibrator.getTestValueSixDate()) ? dataCalibrator.getTestValueSixDate() : "/"); } @Override @@ -208,10 +254,9 @@ List list = Collections.emptyList(); request.setMeasureDataDcPowerList(list); } - BizBusinessDeviceMeasureInfo measureInfo = bizBusinessDeviceMeasureInfoMapper.selectDetailById(request.getDataId()); DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - map.put("dataNo", measureInfo.getDataNo()); + mapReplace(map); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); if (CollectionUtils.isEmpty(equipmentList)) { @@ -224,66 +269,7 @@ List dcPowerList = request.getMeasureDataDcPowerList(); - //电源电压调整率 - List powerSupplyVoltageAdjustmentList = dcPowerList.stream() - .filter(dcPower -> "1".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); - dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); - return dcPower; - }).collect(Collectors.toList()); - - //负载调整率 - List loadRegulationList = dcPowerList.stream() - .filter(dcPower -> "2".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); - dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); - return dcPower; - }).collect(Collectors.toList()); - - //电压示值误差 - List voltageRepresentationErrorList = dcPowerList.stream() - .filter(dcPower -> "3".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); - return dcPower; - }).collect(Collectors.toList()); - - //电流表示值误差（直接测量） - List directMeasurementList = dcPowerList.stream() - .filter(dcPower -> "4".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); - return dcPower; - }).collect(Collectors.toList()); - - //电流表示值误差（间接测量） - List indirectMeasurementList = dcPowerList.stream() - .filter(dcPower -> "5".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); - return dcPower; - }).collect(Collectors.toList()); - - //波纹电压 - List rippleList = dcPowerList.stream() - .filter(dcPower -> "6".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); - dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "mV"); - return dcPower; - }).collect(Collectors.toList()); - - //输出电压短期稳定性 - List shortRepList = dcPowerList.stream() - .filter(dcPower -> "7".equals(dcPower.getDataType())) - .peek(dcPower -> { - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); - dcPower.setShortTermStability(dcPower.getShortTermStability() + "%"); - }).collect(Collectors.toList()); - - map.put("shortRepList", shortRepList); - map.put("powerSupplyVoltageAdjustmentList", powerSupplyVoltageAdjustmentList); - map.put("loadRegulationList", loadRegulationList); - map.put("voltageRepresentationErrorList", voltageRepresentationErrorList); - map.put("directMeasurementList", directMeasurementList); - map.put("indirectMeasurementList", indirectMeasurementList); - map.put("rippleList", rippleList); + prepareParams(dcPowerList, map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "1", request.getItemCategoryName())); @@ -307,6 +293,102 @@ } /** + * 准备原始记录填充参数 + * + * @param dcPowerList + * @param map + */ + private void prepareParams(List dcPowerList, Map map) { + //电源电压调整率 + List> powerSupplyVoltageAdjustmentList = dcPowerList.stream() + .filter(dcPower -> "1".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //负载调整率 + List> loadRegulationList = dcPowerList.stream() + .filter(dcPower -> "2".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电压示值误差 + List> voltageRepresentationErrorList = dcPowerList.stream() + .filter(dcPower -> "3".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电流表示值误差（直接测量） + List> directMeasurementList = dcPowerList.stream() + .filter(dcPower -> "4".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电流表示值误差（间接测量） + List> indirectMeasurementList = dcPowerList.stream() + .filter(dcPower -> "5".equals(dcPower.getDataType())) + .map(dcPower -> { + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //波纹电压 + List> rippleList = dcPowerList.stream() + .filter(dcPower -> "6".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "mV"); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //输出电压短期稳定性 + List> shortRepList = dcPowerList.stream() + .filter(dcPower -> "7".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setShortTermStability(dcPower.getShortTermStability() + "%"); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + map.put("powerSupplyVoltageAdjustmentList", powerSupplyVoltageAdjustmentList); + map.put("loadRegulationList", loadRegulationList); + map.put("voltageRepresentationErrorList", voltageRepresentationErrorList); + map.put("directMeasurementList", directMeasurementList); + map.put("indirectMeasurementList", indirectMeasurementList); + map.put("rippleList", rippleList); + map.put("shortRepList", shortRepList); + } + + /** * 封面基本信息的定制化参数 * * @param map @@ -356,13 +438,12 @@ list.add(new BizBusinessDeviceMeasureDataDcPower()); request.setMeasureDataDcPowerList(list); } - Long dataId = request.getDataId(); - BizBusinessDeviceMeasureInfo measureInfo = bizBusinessDeviceMeasureInfoMapper.selectDetailById(dataId); DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - map.put("dataNo", measureInfo.getDataNo()); + mapReplace(map); + Long dataId = request.getDataId(); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(dataId); if (CollectionUtils.isEmpty(equipmentList)) { equipmentList = new ArrayList<>(); @@ -371,42 +452,9 @@ map.put("equipmentList", equipmentList); List dcPowerList = request.getMeasureDataDcPowerList(); - //电源电压调整率 - List powerSupplyVoltageAdjustmentList = dcPowerList.stream() - .filter(dcPower -> "1".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //负载调整率 - List loadRegulationList = dcPowerList.stream() - .filter(dcPower -> "2".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //电压示值误差 - List voltageRepresentationErrorList = dcPowerList.stream() - .filter(dcPower -> "3".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //电流表示值误差（直接测量） - List directMeasurementList = dcPowerList.stream() - .filter(dcPower -> "4".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //电流表示值误差（间接测量） - List indirectMeasurementList = dcPowerList.stream() - .filter(dcPower -> "5".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //波纹电压 - List rippleList = dcPowerList.stream() - .filter(dcPower -> "6".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //输出电压短期稳定性 - List shortRepList = dcPowerList.stream() - .filter(dcPower -> "7".equals(dcPower.getDataType())).collect(Collectors.toList()); - - map.put("powerSupplyVoltageAdjustmentList", powerSupplyVoltageAdjustmentList); - map.put("loadRegulationList", loadRegulationList); - map.put("voltageRepresentationErrorList", voltageRepresentationErrorList); - map.put("directMeasurementList", directMeasurementList); - map.put("indirectMeasurementList", indirectMeasurementList); - map.put("rippleList", rippleList); - map.put("shortRepList", shortRepList); - + //准备填充参数 + prepareCertificateParams(dcPowerList, map); + //准备封面参数 prepareCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); @@ -433,6 +481,92 @@ } /** + * 准备检定证书参数 + * + * @param dcPowerList + * @param map + */ + private void prepareCertificateParams(List dcPowerList, Map map) { + //电源电压调整率 + List> powerSupplyVoltageAdjustmentList = dcPowerList.stream() + .filter(dcPower -> "1".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //负载调整率 + List> loadRegulationList = dcPowerList.stream() + .filter(dcPower -> "2".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电压示值误差 + List> voltageRepresentationErrorList = dcPowerList.stream() + .filter(dcPower -> "3".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电流表示值误差（直接测量） + List> directMeasurementList = dcPowerList.stream() + .filter(dcPower -> "4".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电流表示值误差（间接测量） + List> indirectMeasurementList = dcPowerList.stream() + .filter(dcPower -> "5".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //波纹电压 + List> rippleList = dcPowerList.stream() + .filter(dcPower -> "6".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //输出电压短期稳定性 + List> shortRepList = dcPowerList.stream() + .filter(dcPower -> "7".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + map.put("powerSupplyVoltageAdjustmentList", powerSupplyVoltageAdjustmentList); + map.put("loadRegulationList", loadRegulationList); + map.put("voltageRepresentationErrorList", voltageRepresentationErrorList); + map.put("directMeasurementList", directMeasurementList); + map.put("indirectMeasurementList", indirectMeasurementList); + map.put("rippleList", rippleList); + map.put("shortRepList", shortRepList); + } + + /** * 检查是否能生成证书 */ private Boolean checkOutUnablePrint(BizBusinessDeviceMeasureApproval measureItemInfo) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 7422613..889a4e6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -15,6 +15,20 @@ public class StandardEquipmentSupport implements MeasureCategoryEnum { /** + * 替换map集合中的空值为斜杠/ + * @param map + */ + protected void mapReplace(Map map) { + List excludedKeys = Arrays.asList("approvalStatus", "processId", "createUserId", "createUserName", + "checkUserName", "approvalStatusName", "taskId", "decisionItem", "staffName","lessThan"); + map.forEach((k, v) -> { + if (!excludedKeys.contains(k) && org.springframework.util.ObjectUtils.isEmpty(v)) { + map.put(k, "/"); + } + }); + } + + /** * 填充固定的信息参数 */ protected void prepareCoverParams(Map map, String labCode) { 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 afc322a..bdd83db 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 @@ -16,6 +16,7 @@ import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo; import com.casic.missiles.model.equipment.BizEquipmentInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataDcPower; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataElectricalSafety; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentSupport; @@ -43,8 +44,6 @@ @Slf4j public class DcPowerSupplyHandler extends StandardEquipmentSupport implements PrintFileModuleNameEnum, StandardEquipmentPrint { - private final BizBusinessDeviceMeasureInfoMapper bizBusinessDeviceMeasureInfoMapper; - private final PrintFileRegister printFileRegister; private final BizBusinessDeviceMeasureEquipmentMapper bizBusinessDeviceMeasureEquipmentMapper; @@ -62,104 +61,9 @@ return null; } Map map = BeanUtil.beanToMap(request); - //划分为直流电压，电源效应和负载效应Power and load effects，直流电流（直接测量）Direct current (direct measurement)，直流电流（间接测量）Direct current (indirect measurement)，纹波电压Ripple Voltage - String[] pointStr = {DC_VOLTAGE, POWER_AND_LOAD_EFFECTS, DC_CURRENT_DIRECT_MEASUREMENT, DC_CURRENT_INDIRECT_MEASUREMENT}; - //稳定性、重复性 - final String[] checkTypes = {REPEATABILITY, STABILITY}; - List pointList = Arrays.asList(pointStr); + mapReplace(map); - for (int i = 0; i < pointList.size(); i++) { - String points = pointList.get(i); - //重复性 - List repList = request.getCheckDataDcPowerList() - .stream().filter(e -> points.equals(e.getCheckParam()) - && checkTypes[0].equals(e.getCheckType()) - && StringUtils.isEmpty(e.getTestValueFiveDate())).collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(repList)) { - List repMapList = new ArrayList<>(); - for (BizEquipmentStandardCheckDataDcPower rep : repList) { - Map repMap = BeanUtil.beanToMap(rep); - repMapList.add(repMap); - } - map.put(REPEAT_PREFIX + (i + 1), repMapList); - } - //稳定性 - List staList = request.getCheckDataDcPowerList() - .stream().filter(e -> points.equals(e.getCheckParam()) - && checkTypes[1].equals(e.getCheckType()) - && (StringUtils.isNotEmpty(e.getTestValueOneDate()) - || StringUtils.isNotEmpty(e.getTestValueTwoDate()) - || StringUtils.isNotEmpty(e.getTestValueThreeDate()) - || StringUtils.isNotEmpty(e.getTestValueFourDate()) - || StringUtils.isNotEmpty(e.getTestValueFiveDate()) - || StringUtils.isNotEmpty(e.getTestValueSixDate())) - ).collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(staList)) { - statisticalDate(staList, STA_PREFIX + (i + 1), map); - List repMapList = new ArrayList<>(); - for (BizEquipmentStandardCheckDataDcPower sta : staList) { - Map repMap = BeanUtil.beanToMap(sta); - if (sta.getLessThan() != null) { - repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); - }else { - repMap.put("lessThan",""); - } - repMapList.add(repMap); - } - map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF0A3"); - map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF0A3"); - if (1 == staList.get(0).getQualified()) { - map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF052"); - } else { - map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF052"); - } - map.put(STA_PREFIX + (i + 1), repMapList); - } - } - - List repList = request.getCheckDataDcPowerList().stream() - .filter(d -> RIPPLE_VOLTAGE.equals(d.getCheckParam()) - && checkTypes[0].equals(d.getCheckType())) - .collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(repList)) { - List repMapList = new ArrayList<>(); - for (BizEquipmentStandardCheckDataDcPower rep : repList) { - Map repMap = BeanUtil.beanToMap(rep); - repMapList.add(repMap); - } - map.put(REPEAT_PREFIX + 5, repMapList); - } - - List staList = request.getCheckDataDcPowerList().stream() - .filter(d -> RIPPLE_VOLTAGE.equals(d.getCheckParam()) - && checkTypes[1].equals(d.getCheckType()) - && (StringUtils.isNotEmpty(d.getTestValueOneDate()) - || StringUtils.isNotEmpty(d.getTestValueTwoDate()) - || StringUtils.isNotEmpty(d.getTestValueThreeDate()) - || StringUtils.isNotEmpty(d.getTestValueFourDate()) - || StringUtils.isNotEmpty(d.getTestValueFiveDate()) - || StringUtils.isNotEmpty(d.getTestValueSixDate()))).collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(staList)) { - statisticalDate(staList, STA_PREFIX + 5, map); - List repMapList = new ArrayList<>(); - for (BizEquipmentStandardCheckDataDcPower sta : staList) { - Map repMap = BeanUtil.beanToMap(sta); - if (sta.getLessThan() != null) { - repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); - }else { - repMap.put("lessThan",""); - } - repMapList.add(repMap); - } - map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF0A3"); - map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF0A3"); - if (1 == staList.get(0).getQualified()) { - map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF052"); - } else { - map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF052"); - } - map.put(STA_PREFIX + 5, repMapList); - } + prepareCheckParams(request, map); //除了选用的模板不一致，模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY_CHECK_DATA, "数据打印", null, map, false, null, null); @@ -177,6 +81,148 @@ } } + private void prepareCheckParams(BizEquipmentStandardCheckRecordApproval request, Map map) { + //划分为直流电压，电源效应和负载效应Power and load effects，直流电流（直接测量）Direct current (direct measurement)，直流电流（间接测量）Direct current (indirect measurement)，纹波电压Ripple Voltage + String[] pointStr = {DC_VOLTAGE, POWER_AND_LOAD_EFFECTS, DC_CURRENT_DIRECT_MEASUREMENT, DC_CURRENT_INDIRECT_MEASUREMENT}; + //稳定性、重复性 + final String[] checkTypes = {REPEATABILITY, STABILITY}; + List pointList = Arrays.asList(pointStr); + + Map numMap = new HashMap<>(); + numMap.put(1, 3); + numMap.put(2, 7); + numMap.put(3, 3); + numMap.put(4, 4); + numMap.put(5, 6); + + for (int i = 0; i < pointList.size(); i++) { + String points = pointList.get(i); + //重复性 + List repList = request.getCheckDataDcPowerList() + .stream().filter(e -> points.equals(e.getCheckParam()) + && checkTypes[0].equals(e.getCheckType()) + && StringUtils.isEmpty(e.getTestValueFiveDate())).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(repList)) { + List repMapList = new ArrayList<>(); + for (BizEquipmentStandardCheckDataDcPower rep : repList) { + Map repMap = BeanUtil.beanToMap(rep); + mapReplace(repMap); + repMapList.add(repMap); + } + int size = numMap.get(i + 1) - repMapList.size(); + for (int j = 0; j < size; j++) { + BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); + Map powerMap = BeanUtil.beanToMap(dcPower); + mapReplace(powerMap); + repMapList.add(powerMap); + } + map.put(REPEAT_PREFIX + (i + 1), repMapList); + } + //稳定性 + List staList = request.getCheckDataDcPowerList() + .stream().filter(e -> points.equals(e.getCheckParam()) + && checkTypes[1].equals(e.getCheckType()) + && (StringUtils.isNotEmpty(e.getTestValueOneDate()) + || StringUtils.isNotEmpty(e.getTestValueTwoDate()) + || StringUtils.isNotEmpty(e.getTestValueThreeDate()) + || StringUtils.isNotEmpty(e.getTestValueFourDate()) + || StringUtils.isNotEmpty(e.getTestValueFiveDate()) + || StringUtils.isNotEmpty(e.getTestValueSixDate())) + ).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(staList)) { + statisticalDate(staList, STA_PREFIX + (i + 1), map); + List repMapList = new ArrayList<>(); + for (BizEquipmentStandardCheckDataDcPower sta : staList) { + Map repMap = BeanUtil.beanToMap(sta); + mapReplace(repMap); + if (sta.getLessThan() != null) { + repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); + } else { + repMap.put("lessThan", ""); + } + repMapList.add(repMap); + } + int size = numMap.get(i + 1) - repMapList.size(); + for (int j = 0; j < size; j++) { + BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); + Map powerMap = BeanUtil.beanToMap(dcPower); + mapReplace(powerMap); + powerMap.put("lessThan", ""); + repMapList.add(powerMap); + } + map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF0A3"); + map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF0A3"); + if (1 == staList.get(0).getQualified()) { + map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF052"); + } else { + map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF052"); + } + map.put(STA_PREFIX + (i + 1), repMapList); + } + } + + List repList = request.getCheckDataDcPowerList().stream() + .filter(d -> RIPPLE_VOLTAGE.equals(d.getCheckParam()) + && checkTypes[0].equals(d.getCheckType())) + .collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(repList)) { + List repMapList = new ArrayList<>(); + for (BizEquipmentStandardCheckDataDcPower rep : repList) { + Map repMap = BeanUtil.beanToMap(rep); + mapReplace(repMap); + repMapList.add(repMap); + } + int size = numMap.get(5) - repMapList.size(); + for (int j = 0; j < size; j++) { + BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); + Map powerMap = BeanUtil.beanToMap(dcPower); + mapReplace(powerMap); + repMapList.add(powerMap); + } + map.put(REPEAT_PREFIX + 5, repMapList); + } + + List staList = request.getCheckDataDcPowerList().stream() + .filter(d -> RIPPLE_VOLTAGE.equals(d.getCheckParam()) + && checkTypes[1].equals(d.getCheckType()) + && (StringUtils.isNotEmpty(d.getTestValueOneDate()) + || StringUtils.isNotEmpty(d.getTestValueTwoDate()) + || StringUtils.isNotEmpty(d.getTestValueThreeDate()) + || StringUtils.isNotEmpty(d.getTestValueFourDate()) + || StringUtils.isNotEmpty(d.getTestValueFiveDate()) + || StringUtils.isNotEmpty(d.getTestValueSixDate()))).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(staList)) { + statisticalDate(staList, STA_PREFIX + 5, map); + List repMapList = new ArrayList<>(); + for (BizEquipmentStandardCheckDataDcPower sta : staList) { + Map repMap = BeanUtil.beanToMap(sta); + mapReplace(repMap); + if (sta.getLessThan() != null) { + repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); + } else { + repMap.put("lessThan", ""); + } + repMapList.add(repMap); + } + int size = numMap.get(5) - repMapList.size(); + for (int j = 0; j < size; j++) { + BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); + Map powerMap = BeanUtil.beanToMap(dcPower); + mapReplace(powerMap); + powerMap.put("lessThan", ""); + repMapList.add(powerMap); + } + map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF0A3"); + map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF0A3"); + if (1 == staList.get(0).getQualified()) { + map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF052"); + } else { + map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF052"); + } + map.put(STA_PREFIX + 5, repMapList); + } + } + /** * 组装参数 * @@ -186,16 +232,16 @@ */ private void statisticalDate(List sta, String strListParam, Map map) { //再次健壮性判断，防止其他方法调用，或者已经存在直接退出 - if (com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(sta) || map.containsKey(strListParam + DATE_PREFIX + 1)) { + if (CollectionUtils.isEmpty(sta) || map.containsKey(strListParam + DATE_PREFIX + 1)) { return; } BizEquipmentStandardCheckDataDcPower dataCalibrator = sta.get(0); - map.put(strListParam + DATE_PREFIX + 1, dataCalibrator.getTestValueOneDate()); - map.put(strListParam + DATE_PREFIX + 2, dataCalibrator.getTestValueTwoDate()); - map.put(strListParam + DATE_PREFIX + 3, dataCalibrator.getTestValueThreeDate()); - map.put(strListParam + DATE_PREFIX + 4, dataCalibrator.getTestValueFourDate()); - map.put(strListParam + DATE_PREFIX + 5, dataCalibrator.getTestValueFiveDate()); - map.put(strListParam + DATE_PREFIX + 6, dataCalibrator.getTestValueSixDate()); + map.put(strListParam + DATE_PREFIX + 1, StringUtils.isNotBlank(dataCalibrator.getTestValueOneDate()) ? dataCalibrator.getTestValueOneDate() : "/"); + map.put(strListParam + DATE_PREFIX + 2, StringUtils.isNotBlank(dataCalibrator.getTestValueTwoDate()) ? dataCalibrator.getTestValueTwoDate() : "/"); + map.put(strListParam + DATE_PREFIX + 3, StringUtils.isNotBlank(dataCalibrator.getTestValueThreeDate()) ? dataCalibrator.getTestValueThreeDate() : "/"); + map.put(strListParam + DATE_PREFIX + 4, StringUtils.isNotBlank(dataCalibrator.getTestValueFourDate()) ? dataCalibrator.getTestValueFourDate() : "/"); + map.put(strListParam + DATE_PREFIX + 5, StringUtils.isNotBlank(dataCalibrator.getTestValueFiveDate()) ? dataCalibrator.getTestValueFiveDate() : "/"); + map.put(strListParam + DATE_PREFIX + 6, StringUtils.isNotBlank(dataCalibrator.getTestValueSixDate()) ? dataCalibrator.getTestValueSixDate() : "/"); } @Override @@ -208,10 +254,9 @@ List list = Collections.emptyList(); request.setMeasureDataDcPowerList(list); } - BizBusinessDeviceMeasureInfo measureInfo = bizBusinessDeviceMeasureInfoMapper.selectDetailById(request.getDataId()); DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - map.put("dataNo", measureInfo.getDataNo()); + mapReplace(map); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); if (CollectionUtils.isEmpty(equipmentList)) { @@ -224,66 +269,7 @@ List dcPowerList = request.getMeasureDataDcPowerList(); - //电源电压调整率 - List powerSupplyVoltageAdjustmentList = dcPowerList.stream() - .filter(dcPower -> "1".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); - dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); - return dcPower; - }).collect(Collectors.toList()); - - //负载调整率 - List loadRegulationList = dcPowerList.stream() - .filter(dcPower -> "2".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); - dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); - return dcPower; - }).collect(Collectors.toList()); - - //电压示值误差 - List voltageRepresentationErrorList = dcPowerList.stream() - .filter(dcPower -> "3".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); - return dcPower; - }).collect(Collectors.toList()); - - //电流表示值误差（直接测量） - List directMeasurementList = dcPowerList.stream() - .filter(dcPower -> "4".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); - return dcPower; - }).collect(Collectors.toList()); - - //电流表示值误差（间接测量） - List indirectMeasurementList = dcPowerList.stream() - .filter(dcPower -> "5".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); - return dcPower; - }).collect(Collectors.toList()); - - //波纹电压 - List rippleList = dcPowerList.stream() - .filter(dcPower -> "6".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); - dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "mV"); - return dcPower; - }).collect(Collectors.toList()); - - //输出电压短期稳定性 - List shortRepList = dcPowerList.stream() - .filter(dcPower -> "7".equals(dcPower.getDataType())) - .peek(dcPower -> { - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); - dcPower.setShortTermStability(dcPower.getShortTermStability() + "%"); - }).collect(Collectors.toList()); - - map.put("shortRepList", shortRepList); - map.put("powerSupplyVoltageAdjustmentList", powerSupplyVoltageAdjustmentList); - map.put("loadRegulationList", loadRegulationList); - map.put("voltageRepresentationErrorList", voltageRepresentationErrorList); - map.put("directMeasurementList", directMeasurementList); - map.put("indirectMeasurementList", indirectMeasurementList); - map.put("rippleList", rippleList); + prepareParams(dcPowerList, map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "1", request.getItemCategoryName())); @@ -307,6 +293,102 @@ } /** + * 准备原始记录填充参数 + * + * @param dcPowerList + * @param map + */ + private void prepareParams(List dcPowerList, Map map) { + //电源电压调整率 + List> powerSupplyVoltageAdjustmentList = dcPowerList.stream() + .filter(dcPower -> "1".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //负载调整率 + List> loadRegulationList = dcPowerList.stream() + .filter(dcPower -> "2".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电压示值误差 + List> voltageRepresentationErrorList = dcPowerList.stream() + .filter(dcPower -> "3".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电流表示值误差（直接测量） + List> directMeasurementList = dcPowerList.stream() + .filter(dcPower -> "4".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电流表示值误差（间接测量） + List> indirectMeasurementList = dcPowerList.stream() + .filter(dcPower -> "5".equals(dcPower.getDataType())) + .map(dcPower -> { + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //波纹电压 + List> rippleList = dcPowerList.stream() + .filter(dcPower -> "6".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "mV"); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //输出电压短期稳定性 + List> shortRepList = dcPowerList.stream() + .filter(dcPower -> "7".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setShortTermStability(dcPower.getShortTermStability() + "%"); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + map.put("powerSupplyVoltageAdjustmentList", powerSupplyVoltageAdjustmentList); + map.put("loadRegulationList", loadRegulationList); + map.put("voltageRepresentationErrorList", voltageRepresentationErrorList); + map.put("directMeasurementList", directMeasurementList); + map.put("indirectMeasurementList", indirectMeasurementList); + map.put("rippleList", rippleList); + map.put("shortRepList", shortRepList); + } + + /** * 封面基本信息的定制化参数 * * @param map @@ -356,13 +438,12 @@ list.add(new BizBusinessDeviceMeasureDataDcPower()); request.setMeasureDataDcPowerList(list); } - Long dataId = request.getDataId(); - BizBusinessDeviceMeasureInfo measureInfo = bizBusinessDeviceMeasureInfoMapper.selectDetailById(dataId); DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - map.put("dataNo", measureInfo.getDataNo()); + mapReplace(map); + Long dataId = request.getDataId(); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(dataId); if (CollectionUtils.isEmpty(equipmentList)) { equipmentList = new ArrayList<>(); @@ -371,42 +452,9 @@ map.put("equipmentList", equipmentList); List dcPowerList = request.getMeasureDataDcPowerList(); - //电源电压调整率 - List powerSupplyVoltageAdjustmentList = dcPowerList.stream() - .filter(dcPower -> "1".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //负载调整率 - List loadRegulationList = dcPowerList.stream() - .filter(dcPower -> "2".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //电压示值误差 - List voltageRepresentationErrorList = dcPowerList.stream() - .filter(dcPower -> "3".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //电流表示值误差（直接测量） - List directMeasurementList = dcPowerList.stream() - .filter(dcPower -> "4".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //电流表示值误差（间接测量） - List indirectMeasurementList = dcPowerList.stream() - .filter(dcPower -> "5".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //波纹电压 - List rippleList = dcPowerList.stream() - .filter(dcPower -> "6".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //输出电压短期稳定性 - List shortRepList = dcPowerList.stream() - .filter(dcPower -> "7".equals(dcPower.getDataType())).collect(Collectors.toList()); - - map.put("powerSupplyVoltageAdjustmentList", powerSupplyVoltageAdjustmentList); - map.put("loadRegulationList", loadRegulationList); - map.put("voltageRepresentationErrorList", voltageRepresentationErrorList); - map.put("directMeasurementList", directMeasurementList); - map.put("indirectMeasurementList", indirectMeasurementList); - map.put("rippleList", rippleList); - map.put("shortRepList", shortRepList); - + //准备填充参数 + prepareCertificateParams(dcPowerList, map); + //准备封面参数 prepareCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); @@ -433,6 +481,92 @@ } /** + * 准备检定证书参数 + * + * @param dcPowerList + * @param map + */ + private void prepareCertificateParams(List dcPowerList, Map map) { + //电源电压调整率 + List> powerSupplyVoltageAdjustmentList = dcPowerList.stream() + .filter(dcPower -> "1".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //负载调整率 + List> loadRegulationList = dcPowerList.stream() + .filter(dcPower -> "2".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电压示值误差 + List> voltageRepresentationErrorList = dcPowerList.stream() + .filter(dcPower -> "3".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电流表示值误差（直接测量） + List> directMeasurementList = dcPowerList.stream() + .filter(dcPower -> "4".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电流表示值误差（间接测量） + List> indirectMeasurementList = dcPowerList.stream() + .filter(dcPower -> "5".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //波纹电压 + List> rippleList = dcPowerList.stream() + .filter(dcPower -> "6".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //输出电压短期稳定性 + List> shortRepList = dcPowerList.stream() + .filter(dcPower -> "7".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + map.put("powerSupplyVoltageAdjustmentList", powerSupplyVoltageAdjustmentList); + map.put("loadRegulationList", loadRegulationList); + map.put("voltageRepresentationErrorList", voltageRepresentationErrorList); + map.put("directMeasurementList", directMeasurementList); + map.put("indirectMeasurementList", indirectMeasurementList); + map.put("rippleList", rippleList); + map.put("shortRepList", shortRepList); + } + + /** * 检查是否能生成证书 */ private Boolean checkOutUnablePrint(BizBusinessDeviceMeasureApproval measureItemInfo) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ETwoWeightHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ETwoWeightHandler.java index c5ac4e4..2ab844e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ETwoWeightHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ETwoWeightHandler.java @@ -102,154 +102,143 @@ /** * 核查填充参数 + * * @param eTwoList * @param map */ private void prepareCheckParams(List eTwoList, Map map) { - List checkPointList = eTwoList.stream() - .map(BizEquipmentStandardCheckDataETwo::getCheckPoint) - .distinct() - .collect(Collectors.toList()); - List> repList = new ArrayList<>(); + List checkPointList = eTwoList.stream().map(BizEquipmentStandardCheckDataETwo::getCheckPoint).distinct().collect(Collectors.toList()); + List> repList = new ArrayList<>(); for (String s : checkPointList) { //A1 - List> aOneList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map aOneMap = new HashMap<>(); - aOneMap.put("checkPoint", s); - aOneMap.put("project", "A1(" + "Ιᵣ₁ᵢ)"); - aOneMap.put("unit", e.getUnit()); - aOneMap.put("oneValue", e.getAOneValueOne()); - aOneMap.put("twoValue", e.getAOneValueTwo()); - aOneMap.put("threeValue", e.getAOneValueThree()); - aOneMap.put("fourValue", e.getAOneValueFour()); - aOneMap.put("fiveValue", e.getAOneValueFive()); - aOneMap.put("sixValue", e.getAOneValueSix()); - return aOneMap; - }) - .collect(Collectors.toList()); + List> aOneList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map aOneMap = new HashMap<>(); + aOneMap.put("checkPoint", s); + aOneMap.put("project", "A1(" + "Ιᵣ₁ᵢ)"); + aOneMap.put("unit", e.getUnit()); + aOneMap.put("oneValue", e.getAOneValueOne()); + aOneMap.put("twoValue", e.getAOneValueTwo()); + aOneMap.put("threeValue", e.getAOneValueThree()); + aOneMap.put("fourValue", e.getAOneValueFour()); + aOneMap.put("fiveValue", e.getAOneValueFive()); + aOneMap.put("sixValue", e.getAOneValueSix()); + mapReplace(aOneMap); + return aOneMap; + }).collect(Collectors.toList()); repList.add(aOneList.get(0)); //B1 - List> bOneList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map bOneMap = new HashMap<>(); - bOneMap.put("checkPoint", s); - bOneMap.put("project", "B1(" + "Ιᵣ₁ᵢ)"); - bOneMap.put("unit", e.getUnit()); - bOneMap.put("oneValue", e.getBOneValueOne()); - bOneMap.put("twoValue", e.getBOneValueTwo()); - bOneMap.put("threeValue", e.getBOneValueThree()); - bOneMap.put("fourValue", e.getBOneValueFour()); - bOneMap.put("fiveValue", e.getBOneValueFive()); - bOneMap.put("sixValue", e.getBOneValueSix()); - return bOneMap; - }).collect(Collectors.toList()); + List> bOneList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map bOneMap = new HashMap<>(); + bOneMap.put("checkPoint", s); + bOneMap.put("project", "B1(" + "Ιᵣ₁ᵢ)"); + bOneMap.put("unit", e.getUnit()); + bOneMap.put("oneValue", e.getBOneValueOne()); + bOneMap.put("twoValue", e.getBOneValueTwo()); + bOneMap.put("threeValue", e.getBOneValueThree()); + bOneMap.put("fourValue", e.getBOneValueFour()); + bOneMap.put("fiveValue", e.getBOneValueFive()); + bOneMap.put("sixValue", e.getBOneValueSix()); + mapReplace(bOneMap); + return bOneMap; + }).collect(Collectors.toList()); repList.add(bOneList.get(0)); //B2 - List> bTwoList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map bTwoMap = new HashMap<>(); - bTwoMap.put("checkPoint", s); - bTwoMap.put("project", "B2(" + "Ιᵣ₂ᵢ)"); - bTwoMap.put("unit", e.getUnit()); - bTwoMap.put("oneValue", e.getBTwoValueOne()); - bTwoMap.put("twoValue", e.getBTwoValueTwo()); - bTwoMap.put("threeValue", e.getBTwoValueThree()); - bTwoMap.put("fourValue", e.getBTwoValueFour()); - bTwoMap.put("fiveValue", e.getBTwoValueFive()); - bTwoMap.put("sixValue", e.getBTwoValueSix()); - return bTwoMap; - }).collect(Collectors.toList()); + List> bTwoList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map bTwoMap = new HashMap<>(); + bTwoMap.put("checkPoint", s); + bTwoMap.put("project", "B2(" + "Ιᵣ₂ᵢ)"); + bTwoMap.put("unit", e.getUnit()); + bTwoMap.put("oneValue", e.getBTwoValueOne()); + bTwoMap.put("twoValue", e.getBTwoValueTwo()); + bTwoMap.put("threeValue", e.getBTwoValueThree()); + bTwoMap.put("fourValue", e.getBTwoValueFour()); + bTwoMap.put("fiveValue", e.getBTwoValueFive()); + bTwoMap.put("sixValue", e.getBTwoValueSix()); + mapReplace(bTwoMap); + return bTwoMap; + }).collect(Collectors.toList()); repList.add(bTwoList.get(0)); //A2 - List> aTwoList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map aTwoMap = new HashMap<>(); - aTwoMap.put("checkPoint", s); - aTwoMap.put("project", "A2(" + "Ιᵣ₂ᵢ)"); - aTwoMap.put("unit", e.getUnit()); - aTwoMap.put("oneValue", e.getATwoValueOne()); - aTwoMap.put("twoValue", e.getATwoValueTwo()); - aTwoMap.put("threeValue", e.getATwoValueThree()); - aTwoMap.put("fourValue", e.getATwoValueFour()); - aTwoMap.put("fiveValue", e.getATwoValueFive()); - aTwoMap.put("sixValue", e.getATwoValueSix()); - return aTwoMap; - }).collect(Collectors.toList()); + List> aTwoList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map aTwoMap = new HashMap<>(); + aTwoMap.put("checkPoint", s); + aTwoMap.put("project", "A2(" + "Ιᵣ₂ᵢ)"); + aTwoMap.put("unit", e.getUnit()); + aTwoMap.put("oneValue", e.getATwoValueOne()); + aTwoMap.put("twoValue", e.getATwoValueTwo()); + aTwoMap.put("threeValue", e.getATwoValueThree()); + aTwoMap.put("fourValue", e.getATwoValueFour()); + aTwoMap.put("fiveValue", e.getATwoValueFive()); + aTwoMap.put("sixValue", e.getATwoValueSix()); + mapReplace(aTwoMap); + return aTwoMap; + }).collect(Collectors.toList()); repList.add(aTwoList.get(0)); //Δi - List> deltaIotaList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map deltaIotaMap = new HashMap<>(); - deltaIotaMap.put("checkPoint", s); - deltaIotaMap.put("project", "Δ" + "Ιᵢ"); - deltaIotaMap.put("unit", e.getUnit()); - deltaIotaMap.put("oneValue", e.getAverageValueOne()); - deltaIotaMap.put("twoValue", e.getAverageValueTwo()); - deltaIotaMap.put("threeValue", e.getAverageValueThree()); - deltaIotaMap.put("fourValue", e.getAverageValueFour()); - deltaIotaMap.put("fiveValue", e.getAverageValueFive()); - deltaIotaMap.put("sixValue", e.getAverageValueSix()); - return deltaIotaMap; - }).collect(Collectors.toList()); + List> deltaIotaList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map deltaIotaMap = new HashMap<>(); + deltaIotaMap.put("checkPoint", s); + deltaIotaMap.put("project", "Δ" + "Ιᵢ"); + deltaIotaMap.put("unit", e.getUnit()); + deltaIotaMap.put("oneValue", e.getAverageValueOne()); + deltaIotaMap.put("twoValue", e.getAverageValueTwo()); + deltaIotaMap.put("threeValue", e.getAverageValueThree()); + deltaIotaMap.put("fourValue", e.getAverageValueFour()); + deltaIotaMap.put("fiveValue", e.getAverageValueFive()); + deltaIotaMap.put("sixValue", e.getAverageValueSix()); + mapReplace(deltaIotaMap); + ; + return deltaIotaMap; + }).collect(Collectors.toList()); repList.add(deltaIotaList.get(0)); // Δj - List> deltajList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map deltajMap = new HashMap<>(); - deltajMap.put("checkPoint", s); - deltajMap.put("project", "Δ" + "Ιʲ"); - deltajMap.put("unit", e.getUnit()); - deltajMap.put("oneValue", e.getAverageValue()); - deltajMap.put("twoValue", e.getAverageValue()); - deltajMap.put("threeValue", e.getAverageValue()); - deltajMap.put("fourValue", e.getAverageValue()); - deltajMap.put("fiveValue", e.getAverageValue()); - deltajMap.put("sixValue", e.getAverageValue()); - return deltajMap; - }).collect(Collectors.toList()); + List> deltajList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map deltajMap = new HashMap<>(); + deltajMap.put("checkPoint", s); + deltajMap.put("project", "Δ" + "Ιʲ"); + deltajMap.put("unit", e.getUnit()); + deltajMap.put("oneValue", e.getAverageValue()); + deltajMap.put("twoValue", e.getAverageValue()); + deltajMap.put("threeValue", e.getAverageValue()); + deltajMap.put("fourValue", e.getAverageValue()); + deltajMap.put("fiveValue", e.getAverageValue()); + deltajMap.put("sixValue", e.getAverageValue()); + mapReplace(deltajMap); + ; + return deltajMap; + }).collect(Collectors.toList()); repList.add(deltajList.get(0)); //Sn - List> snList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map snMap = new HashMap<>(); - snMap.put("checkPoint", s); - snMap.put("project", "Sn"); - snMap.put("unit", e.getUnit()); - snMap.put("oneValue", e.getAverageValue()); - snMap.put("twoValue", e.getAverageValue()); - snMap.put("threeValue", e.getAverageValue()); - snMap.put("fourValue", e.getAverageValue()); - snMap.put("fiveValue", e.getAverageValue()); - snMap.put("sixValue", e.getAverageValue()); - return snMap; - }).collect(Collectors.toList()); + List> snList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map snMap = new HashMap<>(); + snMap.put("checkPoint", s); + snMap.put("project", "Sn"); + snMap.put("unit", e.getUnit()); + snMap.put("oneValue", e.getAverageValue()); + snMap.put("twoValue", e.getAverageValue()); + snMap.put("threeValue", e.getAverageValue()); + snMap.put("fourValue", e.getAverageValue()); + snMap.put("fiveValue", e.getAverageValue()); + snMap.put("sixValue", e.getAverageValue()); + mapReplace(snMap); + return snMap; + }).collect(Collectors.toList()); repList.add(snList.get(0)); map.put("repList", repList); } - List staList = eTwoList - .stream().filter(e -> STABILITY.equals(e.getCheckType()) - && (StringUtils.isNotEmpty(e.getTestValueOneDate()) - || StringUtils.isNotEmpty(e.getTestValueTwoDate()) - || StringUtils.isNotEmpty(e.getTestValueThreeDate()) - || StringUtils.isNotEmpty(e.getTestValueFourDate()) - || StringUtils.isNotEmpty(e.getTestValueFiveDate()) - || StringUtils.isNotEmpty(e.getTestValueSixDate())) - ).collect(Collectors.toList()); + List staList = eTwoList.stream().filter(e -> STABILITY.equals(e.getCheckType()) && (StringUtils.isNotEmpty(e.getTestValueOneDate()) || StringUtils.isNotEmpty(e.getTestValueTwoDate()) || StringUtils.isNotEmpty(e.getTestValueThreeDate()) || StringUtils.isNotEmpty(e.getTestValueFourDate()) || StringUtils.isNotEmpty(e.getTestValueFiveDate()) || StringUtils.isNotEmpty(e.getTestValueSixDate()))).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(staList)) { statisticalDate(staList, STA_PREFIX, map); List repMapList = new ArrayList<>(); for (BizEquipmentStandardCheckDataETwo sta : staList) { Map repMap = BeanUtil.beanToMap(sta); - repMap.put("lessThan", ObjectUtils.isEmpty(sta.getLessThan()) || 0 == sta.getLessThan() ? "否" : "是"); + mapReplace(repMap); + if (sta.getLessThan() != null) { + repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); + } else { + repMap.put("lessThan", ""); + } repMapList.add(repMap); } map.put("staList", repMapList); @@ -269,17 +258,14 @@ return; } BizEquipmentStandardCheckDataETwo dataCalibrator = sta.get(0); - map.put(strListParam + DATE_PREFIX + 1, dataCalibrator.getTestValueOneDate()); - map.put(strListParam + DATE_PREFIX + 2, dataCalibrator.getTestValueTwoDate()); - map.put(strListParam + DATE_PREFIX + 3, dataCalibrator.getTestValueThreeDate()); - map.put(strListParam + DATE_PREFIX + 4, dataCalibrator.getTestValueFourDate()); - map.put(strListParam + DATE_PREFIX + 5, dataCalibrator.getTestValueFiveDate()); - map.put(strListParam + DATE_PREFIX + 6, dataCalibrator.getTestValueSixDate()); + map.put(strListParam + DATE_PREFIX + 1, StringUtils.isNotBlank(dataCalibrator.getTestValueOneDate()) ? dataCalibrator.getTestValueOneDate() : "/"); + map.put(strListParam + DATE_PREFIX + 2, StringUtils.isNotBlank(dataCalibrator.getTestValueTwoDate()) ? dataCalibrator.getTestValueTwoDate() : "/"); + map.put(strListParam + DATE_PREFIX + 3, StringUtils.isNotBlank(dataCalibrator.getTestValueThreeDate()) ? dataCalibrator.getTestValueThreeDate() : "/"); + map.put(strListParam + DATE_PREFIX + 4, StringUtils.isNotBlank(dataCalibrator.getTestValueFourDate()) ? dataCalibrator.getTestValueFourDate() : "/"); + map.put(strListParam + DATE_PREFIX + 5, StringUtils.isNotBlank(dataCalibrator.getTestValueFiveDate()) ? dataCalibrator.getTestValueFiveDate() : "/"); + map.put(strListParam + DATE_PREFIX + 6, StringUtils.isNotBlank(dataCalibrator.getTestValueSixDate()) ? dataCalibrator.getTestValueSixDate() : "/"); } -// private List> convertToListMap(String checkPoint, List eTwoList) { -// -// } @Override public List doCreateOriginalFile(BizBusinessDeviceMeasureApproval request) { @@ -301,7 +287,7 @@ equipmentList = new ArrayList<>(); equipmentList.add(new MeasureEquipmentInfoDTO()); } - map.put("actualDivisionValue", request.getActualDivisionValue()); + map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); //准备填充参数 prepareParams(map, request.getMeasureDataETwoList()); @@ -338,81 +324,95 @@ //重复性 List repPtOneList = eTwoList.stream() - .filter(e -> "1".equals(e.getDataType()) - && REPEATABILITY.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtOne())) + .filter(e -> "1".equals(e.getDataType()) && REPEATABILITY.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtOne())) .collect(Collectors.toList()); + getEquipment(equipmentList, repPtOneList); List repPtTwoList = eTwoList.stream() - .filter(e -> "1".equals(e.getDataType()) - && REPEATABILITY.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtTwo())) + .filter(e -> "1".equals(e.getDataType()) && REPEATABILITY.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtTwo())) .collect(Collectors.toList()); getEquipment(equipmentList, repPtTwoList); - map.put("repPtOneList", repPtOneList); + List> repOneMapList = repPtOneList.stream().map(e -> { + Map objectMap = BeanUtil.beanToMap(e); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("repPtOneList", repOneMapList); map.put("repPtOne", repPtOneList.get(0).getPtOne()); map.put("repPtOneaManufactureNo", repPtOneList.get(0).getAManufactureNo()); map.put("repPtOnebManufactureNo", repPtOneList.get(0).getBManufactureNo()); - map.put("repPtTwoList", repPtTwoList); + List> repTwoMapList = repPtTwoList.stream().map(e -> { + Map objectMap = BeanUtil.beanToMap(e); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("repPtTwoList", repTwoMapList); map.put("repPtTwo", repPtTwoList.get(0).getPtTwo()); map.put("repPtTwoaManufactureNo", repPtTwoList.get(0).getAManufactureNo()); map.put("repPtTwobManufactureNo", repPtTwoList.get(0).getBManufactureNo()); //偏载误差 - List loadPtOneList = eTwoList.stream() - .filter(e -> "2".equals(e.getDataType()) - && OFFSET_LOAD_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtOne())) - .collect(Collectors.toList()); + List loadPtOneList = eTwoList.stream().filter(e -> "2".equals(e.getDataType()) && OFFSET_LOAD_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtOne())).collect(Collectors.toList()); getEquipment(equipmentList, loadPtOneList); - List loadPtTwoList = eTwoList.stream() - .filter(e -> "2".equals(e.getDataType()) - && OFFSET_LOAD_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtTwo())) - .collect(Collectors.toList()); + List loadPtTwoList = eTwoList.stream().filter(e -> "2".equals(e.getDataType()) && OFFSET_LOAD_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtTwo())).collect(Collectors.toList()); getEquipment(equipmentList, loadPtTwoList); - map.put("loadPtOneList", loadPtOneList); + List> loadOneMapList = loadPtOneList.stream().map(e -> { + Map objectMap = BeanUtil.beanToMap(e); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("loadPtOneList", loadOneMapList); map.put("loadPtOne", loadPtOneList.get(0).getPtOne()); map.put("loadPtOneaManufactureNo", loadPtOneList.get(0).getAManufactureNo()); map.put("loadPtOnebManufactureNo", loadPtOneList.get(0).getBManufactureNo()); - map.put("loadPtTwoList", loadPtTwoList); + List> loadTwoMapList = loadPtTwoList.stream().map(e -> { + Map objectMap = BeanUtil.beanToMap(e); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("loadPtTwoList", loadTwoMapList); map.put("loadPtTwo", loadPtTwoList.get(0).getPtTwo()); map.put("loadPtTwoaManufactureNo", loadPtTwoList.get(0).getAManufactureNo()); map.put("loadPtTwobManufactureNo", loadPtTwoList.get(0).getBManufactureNo()); //局部示值误差 - List errorPtOneList = eTwoList.stream() - .filter(e -> "3".equals(e.getDataType()) - && LOCAL_INDICATION_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtOne())) - .collect(Collectors.toList()); + List errorPtOneList = eTwoList.stream().filter(e -> "3".equals(e.getDataType()) && LOCAL_INDICATION_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtOne())).collect(Collectors.toList()); getEquipment(equipmentList, errorPtOneList); - List errorPtTwoList = eTwoList.stream() - .filter(e -> "3".equals(e.getDataType()) - && LOCAL_INDICATION_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtTwo())) - .collect(Collectors.toList()); + List errorPtTwoList = eTwoList.stream().filter(e -> "3".equals(e.getDataType()) && LOCAL_INDICATION_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtTwo())).collect(Collectors.toList()); getEquipment(equipmentList, errorPtTwoList); - map.put("errorPtOneList", errorPtOneList); + + List> errorOneMapList = errorPtOneList.stream().map(e -> { + Map objectMap = BeanUtil.beanToMap(e); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("errorPtOneList", errorOneMapList); map.put("errorPtOne", errorPtOneList.get(0).getPtOne()); map.put("errorPtOneaManufactureNo", errorPtOneList.get(0).getAManufactureNo()); - map.put("errorPtOnemSValue", errorPtOneList.get(0).getMSValue()); - map.put("errorPtOnempesValue", errorPtOneList.get(0).getMpesValue()); - map.put("errorPtTwoList", errorPtTwoList); + map.put("errorPtOnemSValue", StringUtils.isNotBlank(errorPtOneList.get(0).getMSValue()) ? errorPtOneList.get(0).getMSValue() + "mg" : "/"); + map.put("errorPtOnempesValue", StringUtils.isNotBlank(errorPtOneList.get(0).getMpesValue()) ? errorPtOneList.get(0).getMpesValue() + "mg" : "/"); + + List> errorTwoMapList = errorPtTwoList.stream().map(e -> { + Map objectMap = BeanUtil.beanToMap(e); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("errorPtTwoList", errorTwoMapList); map.put("errorPtTwo", errorPtTwoList.get(0).getPtTwo()); map.put("errorPtTwoaManufactureNo", errorPtTwoList.get(0).getAManufactureNo()); - map.put("errorPtTwomSValue", errorPtTwoList.get(0).getMSValue()); - map.put("errorPtTwompesValue", errorPtTwoList.get(0).getMpesValue()); + map.put("errorPtTwomSValue", StringUtils.isNotBlank(errorPtTwoList.get(0).getMSValue()) ? errorPtTwoList.get(0).getMSValue() + "mg" : "/"); + map.put("errorPtTwompesValue", StringUtils.isNotBlank(errorPtTwoList.get(0).getMpesValue()) ? errorPtTwoList.get(0).getMpesValue() + "mg" : "/"); map.put("equipmentList", equipmentList); + mapReplace(map); } private void getEquipment(List> equipmentList, List list) throws Exception { @@ -432,9 +432,9 @@ aMap.put("uncertainty", aTarget.getUncertainty()); } aMap.put("equipmentType", "标准砝码"); - aMap.put("deviceNumber", list.get(0).getADeviceNumber()); - aMap.put("nominalQualityValue", list.get(0).getANominalQualityValue() + "g"); - aMap.put("convertQualityCorrectValue", list.get(0).getAConvertQualityCorrectValue() + "mg"); + aMap.put("deviceNumber", StringUtils.isNotBlank(list.get(0).getADeviceNumber()) ? list.get(0).getADeviceNumber() : "/"); + aMap.put("nominalQualityValue", StringUtils.isNotBlank(list.get(0).getANominalQualityValue()) ? list.get(0).getANominalQualityValue() + "g" : "/"); + aMap.put("convertQualityCorrectValue", StringUtils.isNotBlank(list.get(0).getAConvertQualityCorrectValue()) ? list.get(0).getAConvertQualityCorrectValue() + "mg" : "/"); aMap.put("remark", "/"); Map bMap = new HashMap<>(); @@ -449,9 +449,9 @@ aMap.put("uncertainty", bTarget.getUncertainty()); } bMap.put("equipmentType", "标准砝码"); - bMap.put("deviceNumber", list.get(0).getBDeviceNumber()); - bMap.put("nominalQualityValue", list.get(0).getBNominalQualityValue() + "g"); - bMap.put("convertQualityCorrectValue", list.get(0).getBConvertQualityCorrectValue() + "mg"); + bMap.put("deviceNumber", StringUtils.isNotBlank(list.get(0).getBDeviceNumber()) ? list.get(0).getBDeviceNumber() : "/"); + bMap.put("nominalQualityValue", StringUtils.isNotBlank(list.get(0).getBNominalQualityValue()) ? list.get(0).getBNominalQualityValue() + "g" : "/"); + bMap.put("convertQualityCorrectValue", StringUtils.isNotBlank(list.get(0).getBConvertQualityCorrectValue()) ? list.get(0).getBConvertQualityCorrectValue() + "mg" : "/"); bMap.put("remark", "/"); equipmentList.add(aMap); @@ -469,9 +469,9 @@ aMap.put("uncertainty", aTarget.getUncertainty()); } aMap.put("equipmentType", "标准砝码"); - aMap.put("deviceNumber", list.get(0).getADeviceNumber()); - aMap.put("nominalQualityValue", list.get(0).getANominalQualityValue() + "g"); - aMap.put("convertQualityCorrectValue", list.get(0).getAConvertQualityCorrectValue() + "mg"); + aMap.put("deviceNumber", StringUtils.isNotBlank(list.get(0).getADeviceNumber()) ? list.get(0).getADeviceNumber() : "/"); + aMap.put("nominalQualityValue", StringUtils.isNotBlank(list.get(0).getANominalQualityValue()) ? list.get(0).getANominalQualityValue() + "g" : "/"); + aMap.put("convertQualityCorrectValue", StringUtils.isNotBlank(list.get(0).getAConvertQualityCorrectValue()) ? list.get(0).getAConvertQualityCorrectValue() + "mg" : "/"); aMap.put("remark", "/"); equipmentList.add(aMap); } @@ -495,6 +495,7 @@ DictCodeUtils.convertDictCodeToName(request); request.setActualDivisionValue(request.getActualDivisionValue() + request.getActualDivisionValueUnit()); Map map = BeanUtil.beanToMap(request); + mapReplace(map); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); if (CollectionUtils.isEmpty(equipmentList)) { @@ -504,7 +505,7 @@ map.put("equipmentList", equipmentList); prepareCertificateParams(map, request.getMeasureDataETwoList()); - prepareParams(map, request.getMeasureDataETwoList()); +// prepareParams(map, request.getMeasureDataETwoList()); prepareCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); @@ -532,64 +533,64 @@ private void prepareCertificateParams(Map map, List eTwoList) { //重复性PtOne - List repPtOneList = eTwoList.stream() - .filter(e -> "1".equals(e.getDataType()) - && REPEATABILITY.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtOne())) - .collect(Collectors.toList()); + List repPtOneList = eTwoList.stream().filter(e -> "1".equals(e.getDataType()) && REPEATABILITY.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtOne())).collect(Collectors.toList()); //重复性PtTwo - List repPtTwoList = eTwoList.stream() - .filter(e -> "1".equals(e.getDataType()) - && REPEATABILITY.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtTwo())) - .collect(Collectors.toList()); + List repPtTwoList = eTwoList.stream().filter(e -> "1".equals(e.getDataType()) && REPEATABILITY.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtTwo())).collect(Collectors.toList()); + BizBusinessDeviceMeasureDataETwo repOne = repPtOneList.get(0); repOne.setPtOne(repOne.getPtOne() + repOne.getPtOneUnit()); + repOne.setSValue(StringUtils.isNotBlank(repOne.getSValue()) ? repOne.getSValue() + "mg" : "/"); + repOne.setURValue(StringUtils.isNotBlank(repOne.getURValue()) ? repOne.getURValue() + "mg" : "/"); + Map repOneMap = BeanUtil.beanToMap(repOne); + mapReplace(repOneMap); + map.put("repOne", repOneMap); - map.put("repOne", repOne); BizBusinessDeviceMeasureDataETwo repTwo = repPtTwoList.get(0); repTwo.setPtTwo(repTwo.getPtTwo() + repTwo.getPtTwoUnit()); - - map.put("repTwo", repTwo); + repTwo.setSValue(StringUtils.isNotBlank(repTwo.getSValue()) ? repTwo.getSValue() + "mg" : "/"); + repTwo.setURValue(StringUtils.isNotBlank(repTwo.getURValue()) ? repTwo.getURValue() + "mg" : "/"); + Map repTwoMap = BeanUtil.beanToMap(repTwo); + mapReplace(repTwoMap); + map.put("repTwo", repTwoMap); //偏载误差PtOne - List loadPtOneList = eTwoList.stream() - .filter(e -> "2".equals(e.getDataType()) - && OFFSET_LOAD_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtOne())) - .collect(Collectors.toList()); + List loadPtOneList = eTwoList.stream().filter(e -> "2".equals(e.getDataType()) && OFFSET_LOAD_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtOne())).collect(Collectors.toList()); //偏载误差PtTwo - List loadPtTwoList = eTwoList.stream() - .filter(e -> "2".equals(e.getDataType()) - && OFFSET_LOAD_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtTwo())) - .collect(Collectors.toList()); + List loadPtTwoList = eTwoList.stream().filter(e -> "2".equals(e.getDataType()) && OFFSET_LOAD_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtTwo())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataETwo loadOne = loadPtOneList.get(0); loadOne.setPtOne(loadOne.getPtOne() + loadOne.getPtOneUnit()); - map.put("loadOne", loadOne); + loadOne.setSValue(StringUtils.isNotBlank(loadOne.getSValue()) ? loadOne.getSValue() + "mg" : "/"); + loadOne.setURValue(StringUtils.isNotBlank(loadOne.getURValue()) ? loadOne.getURValue() + "mg" : "/"); + Map loadOneMap = BeanUtil.beanToMap(loadOne); + mapReplace(loadOneMap); + map.put("loadOne", loadOneMap); BizBusinessDeviceMeasureDataETwo loadTwo = loadPtTwoList.get(0); loadTwo.setPtTwo(loadTwo.getPtTwo() + loadTwo.getPtTwoUnit()); - map.put("loadTwo", loadTwo); + loadTwo.setSValue(StringUtils.isNotBlank(loadTwo.getSValue()) ? loadTwo.getSValue() + "mg" : "/"); + loadTwo.setURValue(StringUtils.isNotBlank(loadTwo.getURValue()) ? loadTwo.getURValue() + "mg" : "/"); + Map loadTwoMap = BeanUtil.beanToMap(loadTwo); + mapReplace(loadTwoMap); + map.put("loadTwo", loadTwoMap); //局部示值误差PtOne - List errorPtOneList = eTwoList.stream() - .filter(e -> "3".equals(e.getDataType()) - && LOCAL_INDICATION_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtOne())) - .collect(Collectors.toList()); + List errorPtOneList = eTwoList.stream().filter(e -> "3".equals(e.getDataType()) && LOCAL_INDICATION_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtOne())).collect(Collectors.toList()); //局部示值误差PtTwo - List errorPtTwoList = eTwoList.stream() - .filter(e -> "3".equals(e.getDataType()) - && LOCAL_INDICATION_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtTwo())) - .collect(Collectors.toList()); + List errorPtTwoList = eTwoList.stream().filter(e -> "3".equals(e.getDataType()) && LOCAL_INDICATION_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtTwo())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataETwo errorOne = errorPtOneList.get(0); errorOne.setPtOne(errorOne.getPtOne() + errorOne.getPtOneUnit()); - map.put("errorOne", errorOne); + errorOne.setSValue(StringUtils.isNotBlank(errorOne.getSValue()) ? errorOne.getSValue() + "mg" : "/"); + errorOne.setURValue(StringUtils.isNotBlank(errorOne.getURValue()) ? errorOne.getURValue() + "mg" : "/"); + Map errorOneMap = BeanUtil.beanToMap(errorOne); + mapReplace(errorOneMap); + map.put("errorOne", errorOneMap); BizBusinessDeviceMeasureDataETwo errorTwo = errorPtTwoList.get(0); errorTwo.setPtTwo(errorTwo.getPtTwo() + errorTwo.getPtTwoUnit()); - map.put("errorTwo", errorTwo); + errorTwo.setSValue(StringUtils.isNotBlank(errorTwo.getSValue()) ? errorTwo.getSValue() + "mg" : "/"); + errorTwo.setURValue(StringUtils.isNotBlank(errorTwo.getURValue()) ? errorTwo.getURValue() + "mg" : "/"); + Map errorTwoMap = BeanUtil.beanToMap(errorTwo); + mapReplace(errorTwoMap); + map.put("errorTwo", errorTwoMap); } /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 7422613..889a4e6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -15,6 +15,20 @@ public class StandardEquipmentSupport implements MeasureCategoryEnum { /** + * 替换map集合中的空值为斜杠/ + * @param map + */ + protected void mapReplace(Map map) { + List excludedKeys = Arrays.asList("approvalStatus", "processId", "createUserId", "createUserName", + "checkUserName", "approvalStatusName", "taskId", "decisionItem", "staffName","lessThan"); + map.forEach((k, v) -> { + if (!excludedKeys.contains(k) && org.springframework.util.ObjectUtils.isEmpty(v)) { + map.put(k, "/"); + } + }); + } + + /** * 填充固定的信息参数 */ protected void prepareCoverParams(Map map, String labCode) { 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 afc322a..bdd83db 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 @@ -16,6 +16,7 @@ import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo; import com.casic.missiles.model.equipment.BizEquipmentInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataDcPower; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataElectricalSafety; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentSupport; @@ -43,8 +44,6 @@ @Slf4j public class DcPowerSupplyHandler extends StandardEquipmentSupport implements PrintFileModuleNameEnum, StandardEquipmentPrint { - private final BizBusinessDeviceMeasureInfoMapper bizBusinessDeviceMeasureInfoMapper; - private final PrintFileRegister printFileRegister; private final BizBusinessDeviceMeasureEquipmentMapper bizBusinessDeviceMeasureEquipmentMapper; @@ -62,104 +61,9 @@ return null; } Map map = BeanUtil.beanToMap(request); - //划分为直流电压，电源效应和负载效应Power and load effects，直流电流（直接测量）Direct current (direct measurement)，直流电流（间接测量）Direct current (indirect measurement)，纹波电压Ripple Voltage - String[] pointStr = {DC_VOLTAGE, POWER_AND_LOAD_EFFECTS, DC_CURRENT_DIRECT_MEASUREMENT, DC_CURRENT_INDIRECT_MEASUREMENT}; - //稳定性、重复性 - final String[] checkTypes = {REPEATABILITY, STABILITY}; - List pointList = Arrays.asList(pointStr); + mapReplace(map); - for (int i = 0; i < pointList.size(); i++) { - String points = pointList.get(i); - //重复性 - List repList = request.getCheckDataDcPowerList() - .stream().filter(e -> points.equals(e.getCheckParam()) - && checkTypes[0].equals(e.getCheckType()) - && StringUtils.isEmpty(e.getTestValueFiveDate())).collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(repList)) { - List repMapList = new ArrayList<>(); - for (BizEquipmentStandardCheckDataDcPower rep : repList) { - Map repMap = BeanUtil.beanToMap(rep); - repMapList.add(repMap); - } - map.put(REPEAT_PREFIX + (i + 1), repMapList); - } - //稳定性 - List staList = request.getCheckDataDcPowerList() - .stream().filter(e -> points.equals(e.getCheckParam()) - && checkTypes[1].equals(e.getCheckType()) - && (StringUtils.isNotEmpty(e.getTestValueOneDate()) - || StringUtils.isNotEmpty(e.getTestValueTwoDate()) - || StringUtils.isNotEmpty(e.getTestValueThreeDate()) - || StringUtils.isNotEmpty(e.getTestValueFourDate()) - || StringUtils.isNotEmpty(e.getTestValueFiveDate()) - || StringUtils.isNotEmpty(e.getTestValueSixDate())) - ).collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(staList)) { - statisticalDate(staList, STA_PREFIX + (i + 1), map); - List repMapList = new ArrayList<>(); - for (BizEquipmentStandardCheckDataDcPower sta : staList) { - Map repMap = BeanUtil.beanToMap(sta); - if (sta.getLessThan() != null) { - repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); - }else { - repMap.put("lessThan",""); - } - repMapList.add(repMap); - } - map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF0A3"); - map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF0A3"); - if (1 == staList.get(0).getQualified()) { - map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF052"); - } else { - map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF052"); - } - map.put(STA_PREFIX + (i + 1), repMapList); - } - } - - List repList = request.getCheckDataDcPowerList().stream() - .filter(d -> RIPPLE_VOLTAGE.equals(d.getCheckParam()) - && checkTypes[0].equals(d.getCheckType())) - .collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(repList)) { - List repMapList = new ArrayList<>(); - for (BizEquipmentStandardCheckDataDcPower rep : repList) { - Map repMap = BeanUtil.beanToMap(rep); - repMapList.add(repMap); - } - map.put(REPEAT_PREFIX + 5, repMapList); - } - - List staList = request.getCheckDataDcPowerList().stream() - .filter(d -> RIPPLE_VOLTAGE.equals(d.getCheckParam()) - && checkTypes[1].equals(d.getCheckType()) - && (StringUtils.isNotEmpty(d.getTestValueOneDate()) - || StringUtils.isNotEmpty(d.getTestValueTwoDate()) - || StringUtils.isNotEmpty(d.getTestValueThreeDate()) - || StringUtils.isNotEmpty(d.getTestValueFourDate()) - || StringUtils.isNotEmpty(d.getTestValueFiveDate()) - || StringUtils.isNotEmpty(d.getTestValueSixDate()))).collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(staList)) { - statisticalDate(staList, STA_PREFIX + 5, map); - List repMapList = new ArrayList<>(); - for (BizEquipmentStandardCheckDataDcPower sta : staList) { - Map repMap = BeanUtil.beanToMap(sta); - if (sta.getLessThan() != null) { - repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); - }else { - repMap.put("lessThan",""); - } - repMapList.add(repMap); - } - map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF0A3"); - map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF0A3"); - if (1 == staList.get(0).getQualified()) { - map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF052"); - } else { - map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF052"); - } - map.put(STA_PREFIX + 5, repMapList); - } + prepareCheckParams(request, map); //除了选用的模板不一致，模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY_CHECK_DATA, "数据打印", null, map, false, null, null); @@ -177,6 +81,148 @@ } } + private void prepareCheckParams(BizEquipmentStandardCheckRecordApproval request, Map map) { + //划分为直流电压，电源效应和负载效应Power and load effects，直流电流（直接测量）Direct current (direct measurement)，直流电流（间接测量）Direct current (indirect measurement)，纹波电压Ripple Voltage + String[] pointStr = {DC_VOLTAGE, POWER_AND_LOAD_EFFECTS, DC_CURRENT_DIRECT_MEASUREMENT, DC_CURRENT_INDIRECT_MEASUREMENT}; + //稳定性、重复性 + final String[] checkTypes = {REPEATABILITY, STABILITY}; + List pointList = Arrays.asList(pointStr); + + Map numMap = new HashMap<>(); + numMap.put(1, 3); + numMap.put(2, 7); + numMap.put(3, 3); + numMap.put(4, 4); + numMap.put(5, 6); + + for (int i = 0; i < pointList.size(); i++) { + String points = pointList.get(i); + //重复性 + List repList = request.getCheckDataDcPowerList() + .stream().filter(e -> points.equals(e.getCheckParam()) + && checkTypes[0].equals(e.getCheckType()) + && StringUtils.isEmpty(e.getTestValueFiveDate())).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(repList)) { + List repMapList = new ArrayList<>(); + for (BizEquipmentStandardCheckDataDcPower rep : repList) { + Map repMap = BeanUtil.beanToMap(rep); + mapReplace(repMap); + repMapList.add(repMap); + } + int size = numMap.get(i + 1) - repMapList.size(); + for (int j = 0; j < size; j++) { + BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); + Map powerMap = BeanUtil.beanToMap(dcPower); + mapReplace(powerMap); + repMapList.add(powerMap); + } + map.put(REPEAT_PREFIX + (i + 1), repMapList); + } + //稳定性 + List staList = request.getCheckDataDcPowerList() + .stream().filter(e -> points.equals(e.getCheckParam()) + && checkTypes[1].equals(e.getCheckType()) + && (StringUtils.isNotEmpty(e.getTestValueOneDate()) + || StringUtils.isNotEmpty(e.getTestValueTwoDate()) + || StringUtils.isNotEmpty(e.getTestValueThreeDate()) + || StringUtils.isNotEmpty(e.getTestValueFourDate()) + || StringUtils.isNotEmpty(e.getTestValueFiveDate()) + || StringUtils.isNotEmpty(e.getTestValueSixDate())) + ).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(staList)) { + statisticalDate(staList, STA_PREFIX + (i + 1), map); + List repMapList = new ArrayList<>(); + for (BizEquipmentStandardCheckDataDcPower sta : staList) { + Map repMap = BeanUtil.beanToMap(sta); + mapReplace(repMap); + if (sta.getLessThan() != null) { + repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); + } else { + repMap.put("lessThan", ""); + } + repMapList.add(repMap); + } + int size = numMap.get(i + 1) - repMapList.size(); + for (int j = 0; j < size; j++) { + BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); + Map powerMap = BeanUtil.beanToMap(dcPower); + mapReplace(powerMap); + powerMap.put("lessThan", ""); + repMapList.add(powerMap); + } + map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF0A3"); + map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF0A3"); + if (1 == staList.get(0).getQualified()) { + map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF052"); + } else { + map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF052"); + } + map.put(STA_PREFIX + (i + 1), repMapList); + } + } + + List repList = request.getCheckDataDcPowerList().stream() + .filter(d -> RIPPLE_VOLTAGE.equals(d.getCheckParam()) + && checkTypes[0].equals(d.getCheckType())) + .collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(repList)) { + List repMapList = new ArrayList<>(); + for (BizEquipmentStandardCheckDataDcPower rep : repList) { + Map repMap = BeanUtil.beanToMap(rep); + mapReplace(repMap); + repMapList.add(repMap); + } + int size = numMap.get(5) - repMapList.size(); + for (int j = 0; j < size; j++) { + BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); + Map powerMap = BeanUtil.beanToMap(dcPower); + mapReplace(powerMap); + repMapList.add(powerMap); + } + map.put(REPEAT_PREFIX + 5, repMapList); + } + + List staList = request.getCheckDataDcPowerList().stream() + .filter(d -> RIPPLE_VOLTAGE.equals(d.getCheckParam()) + && checkTypes[1].equals(d.getCheckType()) + && (StringUtils.isNotEmpty(d.getTestValueOneDate()) + || StringUtils.isNotEmpty(d.getTestValueTwoDate()) + || StringUtils.isNotEmpty(d.getTestValueThreeDate()) + || StringUtils.isNotEmpty(d.getTestValueFourDate()) + || StringUtils.isNotEmpty(d.getTestValueFiveDate()) + || StringUtils.isNotEmpty(d.getTestValueSixDate()))).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(staList)) { + statisticalDate(staList, STA_PREFIX + 5, map); + List repMapList = new ArrayList<>(); + for (BizEquipmentStandardCheckDataDcPower sta : staList) { + Map repMap = BeanUtil.beanToMap(sta); + mapReplace(repMap); + if (sta.getLessThan() != null) { + repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); + } else { + repMap.put("lessThan", ""); + } + repMapList.add(repMap); + } + int size = numMap.get(5) - repMapList.size(); + for (int j = 0; j < size; j++) { + BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); + Map powerMap = BeanUtil.beanToMap(dcPower); + mapReplace(powerMap); + powerMap.put("lessThan", ""); + repMapList.add(powerMap); + } + map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF0A3"); + map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF0A3"); + if (1 == staList.get(0).getQualified()) { + map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF052"); + } else { + map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF052"); + } + map.put(STA_PREFIX + 5, repMapList); + } + } + /** * 组装参数 * @@ -186,16 +232,16 @@ */ private void statisticalDate(List sta, String strListParam, Map map) { //再次健壮性判断，防止其他方法调用，或者已经存在直接退出 - if (com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(sta) || map.containsKey(strListParam + DATE_PREFIX + 1)) { + if (CollectionUtils.isEmpty(sta) || map.containsKey(strListParam + DATE_PREFIX + 1)) { return; } BizEquipmentStandardCheckDataDcPower dataCalibrator = sta.get(0); - map.put(strListParam + DATE_PREFIX + 1, dataCalibrator.getTestValueOneDate()); - map.put(strListParam + DATE_PREFIX + 2, dataCalibrator.getTestValueTwoDate()); - map.put(strListParam + DATE_PREFIX + 3, dataCalibrator.getTestValueThreeDate()); - map.put(strListParam + DATE_PREFIX + 4, dataCalibrator.getTestValueFourDate()); - map.put(strListParam + DATE_PREFIX + 5, dataCalibrator.getTestValueFiveDate()); - map.put(strListParam + DATE_PREFIX + 6, dataCalibrator.getTestValueSixDate()); + map.put(strListParam + DATE_PREFIX + 1, StringUtils.isNotBlank(dataCalibrator.getTestValueOneDate()) ? dataCalibrator.getTestValueOneDate() : "/"); + map.put(strListParam + DATE_PREFIX + 2, StringUtils.isNotBlank(dataCalibrator.getTestValueTwoDate()) ? dataCalibrator.getTestValueTwoDate() : "/"); + map.put(strListParam + DATE_PREFIX + 3, StringUtils.isNotBlank(dataCalibrator.getTestValueThreeDate()) ? dataCalibrator.getTestValueThreeDate() : "/"); + map.put(strListParam + DATE_PREFIX + 4, StringUtils.isNotBlank(dataCalibrator.getTestValueFourDate()) ? dataCalibrator.getTestValueFourDate() : "/"); + map.put(strListParam + DATE_PREFIX + 5, StringUtils.isNotBlank(dataCalibrator.getTestValueFiveDate()) ? dataCalibrator.getTestValueFiveDate() : "/"); + map.put(strListParam + DATE_PREFIX + 6, StringUtils.isNotBlank(dataCalibrator.getTestValueSixDate()) ? dataCalibrator.getTestValueSixDate() : "/"); } @Override @@ -208,10 +254,9 @@ List list = Collections.emptyList(); request.setMeasureDataDcPowerList(list); } - BizBusinessDeviceMeasureInfo measureInfo = bizBusinessDeviceMeasureInfoMapper.selectDetailById(request.getDataId()); DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - map.put("dataNo", measureInfo.getDataNo()); + mapReplace(map); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); if (CollectionUtils.isEmpty(equipmentList)) { @@ -224,66 +269,7 @@ List dcPowerList = request.getMeasureDataDcPowerList(); - //电源电压调整率 - List powerSupplyVoltageAdjustmentList = dcPowerList.stream() - .filter(dcPower -> "1".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); - dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); - return dcPower; - }).collect(Collectors.toList()); - - //负载调整率 - List loadRegulationList = dcPowerList.stream() - .filter(dcPower -> "2".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); - dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); - return dcPower; - }).collect(Collectors.toList()); - - //电压示值误差 - List voltageRepresentationErrorList = dcPowerList.stream() - .filter(dcPower -> "3".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); - return dcPower; - }).collect(Collectors.toList()); - - //电流表示值误差（直接测量） - List directMeasurementList = dcPowerList.stream() - .filter(dcPower -> "4".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); - return dcPower; - }).collect(Collectors.toList()); - - //电流表示值误差（间接测量） - List indirectMeasurementList = dcPowerList.stream() - .filter(dcPower -> "5".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); - return dcPower; - }).collect(Collectors.toList()); - - //波纹电压 - List rippleList = dcPowerList.stream() - .filter(dcPower -> "6".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); - dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "mV"); - return dcPower; - }).collect(Collectors.toList()); - - //输出电压短期稳定性 - List shortRepList = dcPowerList.stream() - .filter(dcPower -> "7".equals(dcPower.getDataType())) - .peek(dcPower -> { - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); - dcPower.setShortTermStability(dcPower.getShortTermStability() + "%"); - }).collect(Collectors.toList()); - - map.put("shortRepList", shortRepList); - map.put("powerSupplyVoltageAdjustmentList", powerSupplyVoltageAdjustmentList); - map.put("loadRegulationList", loadRegulationList); - map.put("voltageRepresentationErrorList", voltageRepresentationErrorList); - map.put("directMeasurementList", directMeasurementList); - map.put("indirectMeasurementList", indirectMeasurementList); - map.put("rippleList", rippleList); + prepareParams(dcPowerList, map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "1", request.getItemCategoryName())); @@ -307,6 +293,102 @@ } /** + * 准备原始记录填充参数 + * + * @param dcPowerList + * @param map + */ + private void prepareParams(List dcPowerList, Map map) { + //电源电压调整率 + List> powerSupplyVoltageAdjustmentList = dcPowerList.stream() + .filter(dcPower -> "1".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //负载调整率 + List> loadRegulationList = dcPowerList.stream() + .filter(dcPower -> "2".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电压示值误差 + List> voltageRepresentationErrorList = dcPowerList.stream() + .filter(dcPower -> "3".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电流表示值误差（直接测量） + List> directMeasurementList = dcPowerList.stream() + .filter(dcPower -> "4".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电流表示值误差（间接测量） + List> indirectMeasurementList = dcPowerList.stream() + .filter(dcPower -> "5".equals(dcPower.getDataType())) + .map(dcPower -> { + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //波纹电压 + List> rippleList = dcPowerList.stream() + .filter(dcPower -> "6".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "mV"); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //输出电压短期稳定性 + List> shortRepList = dcPowerList.stream() + .filter(dcPower -> "7".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setShortTermStability(dcPower.getShortTermStability() + "%"); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + map.put("powerSupplyVoltageAdjustmentList", powerSupplyVoltageAdjustmentList); + map.put("loadRegulationList", loadRegulationList); + map.put("voltageRepresentationErrorList", voltageRepresentationErrorList); + map.put("directMeasurementList", directMeasurementList); + map.put("indirectMeasurementList", indirectMeasurementList); + map.put("rippleList", rippleList); + map.put("shortRepList", shortRepList); + } + + /** * 封面基本信息的定制化参数 * * @param map @@ -356,13 +438,12 @@ list.add(new BizBusinessDeviceMeasureDataDcPower()); request.setMeasureDataDcPowerList(list); } - Long dataId = request.getDataId(); - BizBusinessDeviceMeasureInfo measureInfo = bizBusinessDeviceMeasureInfoMapper.selectDetailById(dataId); DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - map.put("dataNo", measureInfo.getDataNo()); + mapReplace(map); + Long dataId = request.getDataId(); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(dataId); if (CollectionUtils.isEmpty(equipmentList)) { equipmentList = new ArrayList<>(); @@ -371,42 +452,9 @@ map.put("equipmentList", equipmentList); List dcPowerList = request.getMeasureDataDcPowerList(); - //电源电压调整率 - List powerSupplyVoltageAdjustmentList = dcPowerList.stream() - .filter(dcPower -> "1".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //负载调整率 - List loadRegulationList = dcPowerList.stream() - .filter(dcPower -> "2".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //电压示值误差 - List voltageRepresentationErrorList = dcPowerList.stream() - .filter(dcPower -> "3".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //电流表示值误差（直接测量） - List directMeasurementList = dcPowerList.stream() - .filter(dcPower -> "4".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //电流表示值误差（间接测量） - List indirectMeasurementList = dcPowerList.stream() - .filter(dcPower -> "5".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //波纹电压 - List rippleList = dcPowerList.stream() - .filter(dcPower -> "6".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //输出电压短期稳定性 - List shortRepList = dcPowerList.stream() - .filter(dcPower -> "7".equals(dcPower.getDataType())).collect(Collectors.toList()); - - map.put("powerSupplyVoltageAdjustmentList", powerSupplyVoltageAdjustmentList); - map.put("loadRegulationList", loadRegulationList); - map.put("voltageRepresentationErrorList", voltageRepresentationErrorList); - map.put("directMeasurementList", directMeasurementList); - map.put("indirectMeasurementList", indirectMeasurementList); - map.put("rippleList", rippleList); - map.put("shortRepList", shortRepList); - + //准备填充参数 + prepareCertificateParams(dcPowerList, map); + //准备封面参数 prepareCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); @@ -433,6 +481,92 @@ } /** + * 准备检定证书参数 + * + * @param dcPowerList + * @param map + */ + private void prepareCertificateParams(List dcPowerList, Map map) { + //电源电压调整率 + List> powerSupplyVoltageAdjustmentList = dcPowerList.stream() + .filter(dcPower -> "1".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //负载调整率 + List> loadRegulationList = dcPowerList.stream() + .filter(dcPower -> "2".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电压示值误差 + List> voltageRepresentationErrorList = dcPowerList.stream() + .filter(dcPower -> "3".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电流表示值误差（直接测量） + List> directMeasurementList = dcPowerList.stream() + .filter(dcPower -> "4".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电流表示值误差（间接测量） + List> indirectMeasurementList = dcPowerList.stream() + .filter(dcPower -> "5".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //波纹电压 + List> rippleList = dcPowerList.stream() + .filter(dcPower -> "6".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //输出电压短期稳定性 + List> shortRepList = dcPowerList.stream() + .filter(dcPower -> "7".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + map.put("powerSupplyVoltageAdjustmentList", powerSupplyVoltageAdjustmentList); + map.put("loadRegulationList", loadRegulationList); + map.put("voltageRepresentationErrorList", voltageRepresentationErrorList); + map.put("directMeasurementList", directMeasurementList); + map.put("indirectMeasurementList", indirectMeasurementList); + map.put("rippleList", rippleList); + map.put("shortRepList", shortRepList); + } + + /** * 检查是否能生成证书 */ private Boolean checkOutUnablePrint(BizBusinessDeviceMeasureApproval measureItemInfo) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ETwoWeightHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ETwoWeightHandler.java index c5ac4e4..2ab844e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ETwoWeightHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ETwoWeightHandler.java @@ -102,154 +102,143 @@ /** * 核查填充参数 + * * @param eTwoList * @param map */ private void prepareCheckParams(List eTwoList, Map map) { - List checkPointList = eTwoList.stream() - .map(BizEquipmentStandardCheckDataETwo::getCheckPoint) - .distinct() - .collect(Collectors.toList()); - List> repList = new ArrayList<>(); + List checkPointList = eTwoList.stream().map(BizEquipmentStandardCheckDataETwo::getCheckPoint).distinct().collect(Collectors.toList()); + List> repList = new ArrayList<>(); for (String s : checkPointList) { //A1 - List> aOneList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map aOneMap = new HashMap<>(); - aOneMap.put("checkPoint", s); - aOneMap.put("project", "A1(" + "Ιᵣ₁ᵢ)"); - aOneMap.put("unit", e.getUnit()); - aOneMap.put("oneValue", e.getAOneValueOne()); - aOneMap.put("twoValue", e.getAOneValueTwo()); - aOneMap.put("threeValue", e.getAOneValueThree()); - aOneMap.put("fourValue", e.getAOneValueFour()); - aOneMap.put("fiveValue", e.getAOneValueFive()); - aOneMap.put("sixValue", e.getAOneValueSix()); - return aOneMap; - }) - .collect(Collectors.toList()); + List> aOneList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map aOneMap = new HashMap<>(); + aOneMap.put("checkPoint", s); + aOneMap.put("project", "A1(" + "Ιᵣ₁ᵢ)"); + aOneMap.put("unit", e.getUnit()); + aOneMap.put("oneValue", e.getAOneValueOne()); + aOneMap.put("twoValue", e.getAOneValueTwo()); + aOneMap.put("threeValue", e.getAOneValueThree()); + aOneMap.put("fourValue", e.getAOneValueFour()); + aOneMap.put("fiveValue", e.getAOneValueFive()); + aOneMap.put("sixValue", e.getAOneValueSix()); + mapReplace(aOneMap); + return aOneMap; + }).collect(Collectors.toList()); repList.add(aOneList.get(0)); //B1 - List> bOneList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map bOneMap = new HashMap<>(); - bOneMap.put("checkPoint", s); - bOneMap.put("project", "B1(" + "Ιᵣ₁ᵢ)"); - bOneMap.put("unit", e.getUnit()); - bOneMap.put("oneValue", e.getBOneValueOne()); - bOneMap.put("twoValue", e.getBOneValueTwo()); - bOneMap.put("threeValue", e.getBOneValueThree()); - bOneMap.put("fourValue", e.getBOneValueFour()); - bOneMap.put("fiveValue", e.getBOneValueFive()); - bOneMap.put("sixValue", e.getBOneValueSix()); - return bOneMap; - }).collect(Collectors.toList()); + List> bOneList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map bOneMap = new HashMap<>(); + bOneMap.put("checkPoint", s); + bOneMap.put("project", "B1(" + "Ιᵣ₁ᵢ)"); + bOneMap.put("unit", e.getUnit()); + bOneMap.put("oneValue", e.getBOneValueOne()); + bOneMap.put("twoValue", e.getBOneValueTwo()); + bOneMap.put("threeValue", e.getBOneValueThree()); + bOneMap.put("fourValue", e.getBOneValueFour()); + bOneMap.put("fiveValue", e.getBOneValueFive()); + bOneMap.put("sixValue", e.getBOneValueSix()); + mapReplace(bOneMap); + return bOneMap; + }).collect(Collectors.toList()); repList.add(bOneList.get(0)); //B2 - List> bTwoList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map bTwoMap = new HashMap<>(); - bTwoMap.put("checkPoint", s); - bTwoMap.put("project", "B2(" + "Ιᵣ₂ᵢ)"); - bTwoMap.put("unit", e.getUnit()); - bTwoMap.put("oneValue", e.getBTwoValueOne()); - bTwoMap.put("twoValue", e.getBTwoValueTwo()); - bTwoMap.put("threeValue", e.getBTwoValueThree()); - bTwoMap.put("fourValue", e.getBTwoValueFour()); - bTwoMap.put("fiveValue", e.getBTwoValueFive()); - bTwoMap.put("sixValue", e.getBTwoValueSix()); - return bTwoMap; - }).collect(Collectors.toList()); + List> bTwoList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map bTwoMap = new HashMap<>(); + bTwoMap.put("checkPoint", s); + bTwoMap.put("project", "B2(" + "Ιᵣ₂ᵢ)"); + bTwoMap.put("unit", e.getUnit()); + bTwoMap.put("oneValue", e.getBTwoValueOne()); + bTwoMap.put("twoValue", e.getBTwoValueTwo()); + bTwoMap.put("threeValue", e.getBTwoValueThree()); + bTwoMap.put("fourValue", e.getBTwoValueFour()); + bTwoMap.put("fiveValue", e.getBTwoValueFive()); + bTwoMap.put("sixValue", e.getBTwoValueSix()); + mapReplace(bTwoMap); + return bTwoMap; + }).collect(Collectors.toList()); repList.add(bTwoList.get(0)); //A2 - List> aTwoList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map aTwoMap = new HashMap<>(); - aTwoMap.put("checkPoint", s); - aTwoMap.put("project", "A2(" + "Ιᵣ₂ᵢ)"); - aTwoMap.put("unit", e.getUnit()); - aTwoMap.put("oneValue", e.getATwoValueOne()); - aTwoMap.put("twoValue", e.getATwoValueTwo()); - aTwoMap.put("threeValue", e.getATwoValueThree()); - aTwoMap.put("fourValue", e.getATwoValueFour()); - aTwoMap.put("fiveValue", e.getATwoValueFive()); - aTwoMap.put("sixValue", e.getATwoValueSix()); - return aTwoMap; - }).collect(Collectors.toList()); + List> aTwoList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map aTwoMap = new HashMap<>(); + aTwoMap.put("checkPoint", s); + aTwoMap.put("project", "A2(" + "Ιᵣ₂ᵢ)"); + aTwoMap.put("unit", e.getUnit()); + aTwoMap.put("oneValue", e.getATwoValueOne()); + aTwoMap.put("twoValue", e.getATwoValueTwo()); + aTwoMap.put("threeValue", e.getATwoValueThree()); + aTwoMap.put("fourValue", e.getATwoValueFour()); + aTwoMap.put("fiveValue", e.getATwoValueFive()); + aTwoMap.put("sixValue", e.getATwoValueSix()); + mapReplace(aTwoMap); + return aTwoMap; + }).collect(Collectors.toList()); repList.add(aTwoList.get(0)); //Δi - List> deltaIotaList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map deltaIotaMap = new HashMap<>(); - deltaIotaMap.put("checkPoint", s); - deltaIotaMap.put("project", "Δ" + "Ιᵢ"); - deltaIotaMap.put("unit", e.getUnit()); - deltaIotaMap.put("oneValue", e.getAverageValueOne()); - deltaIotaMap.put("twoValue", e.getAverageValueTwo()); - deltaIotaMap.put("threeValue", e.getAverageValueThree()); - deltaIotaMap.put("fourValue", e.getAverageValueFour()); - deltaIotaMap.put("fiveValue", e.getAverageValueFive()); - deltaIotaMap.put("sixValue", e.getAverageValueSix()); - return deltaIotaMap; - }).collect(Collectors.toList()); + List> deltaIotaList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map deltaIotaMap = new HashMap<>(); + deltaIotaMap.put("checkPoint", s); + deltaIotaMap.put("project", "Δ" + "Ιᵢ"); + deltaIotaMap.put("unit", e.getUnit()); + deltaIotaMap.put("oneValue", e.getAverageValueOne()); + deltaIotaMap.put("twoValue", e.getAverageValueTwo()); + deltaIotaMap.put("threeValue", e.getAverageValueThree()); + deltaIotaMap.put("fourValue", e.getAverageValueFour()); + deltaIotaMap.put("fiveValue", e.getAverageValueFive()); + deltaIotaMap.put("sixValue", e.getAverageValueSix()); + mapReplace(deltaIotaMap); + ; + return deltaIotaMap; + }).collect(Collectors.toList()); repList.add(deltaIotaList.get(0)); // Δj - List> deltajList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map deltajMap = new HashMap<>(); - deltajMap.put("checkPoint", s); - deltajMap.put("project", "Δ" + "Ιʲ"); - deltajMap.put("unit", e.getUnit()); - deltajMap.put("oneValue", e.getAverageValue()); - deltajMap.put("twoValue", e.getAverageValue()); - deltajMap.put("threeValue", e.getAverageValue()); - deltajMap.put("fourValue", e.getAverageValue()); - deltajMap.put("fiveValue", e.getAverageValue()); - deltajMap.put("sixValue", e.getAverageValue()); - return deltajMap; - }).collect(Collectors.toList()); + List> deltajList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map deltajMap = new HashMap<>(); + deltajMap.put("checkPoint", s); + deltajMap.put("project", "Δ" + "Ιʲ"); + deltajMap.put("unit", e.getUnit()); + deltajMap.put("oneValue", e.getAverageValue()); + deltajMap.put("twoValue", e.getAverageValue()); + deltajMap.put("threeValue", e.getAverageValue()); + deltajMap.put("fourValue", e.getAverageValue()); + deltajMap.put("fiveValue", e.getAverageValue()); + deltajMap.put("sixValue", e.getAverageValue()); + mapReplace(deltajMap); + ; + return deltajMap; + }).collect(Collectors.toList()); repList.add(deltajList.get(0)); //Sn - List> snList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map snMap = new HashMap<>(); - snMap.put("checkPoint", s); - snMap.put("project", "Sn"); - snMap.put("unit", e.getUnit()); - snMap.put("oneValue", e.getAverageValue()); - snMap.put("twoValue", e.getAverageValue()); - snMap.put("threeValue", e.getAverageValue()); - snMap.put("fourValue", e.getAverageValue()); - snMap.put("fiveValue", e.getAverageValue()); - snMap.put("sixValue", e.getAverageValue()); - return snMap; - }).collect(Collectors.toList()); + List> snList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map snMap = new HashMap<>(); + snMap.put("checkPoint", s); + snMap.put("project", "Sn"); + snMap.put("unit", e.getUnit()); + snMap.put("oneValue", e.getAverageValue()); + snMap.put("twoValue", e.getAverageValue()); + snMap.put("threeValue", e.getAverageValue()); + snMap.put("fourValue", e.getAverageValue()); + snMap.put("fiveValue", e.getAverageValue()); + snMap.put("sixValue", e.getAverageValue()); + mapReplace(snMap); + return snMap; + }).collect(Collectors.toList()); repList.add(snList.get(0)); map.put("repList", repList); } - List staList = eTwoList - .stream().filter(e -> STABILITY.equals(e.getCheckType()) - && (StringUtils.isNotEmpty(e.getTestValueOneDate()) - || StringUtils.isNotEmpty(e.getTestValueTwoDate()) - || StringUtils.isNotEmpty(e.getTestValueThreeDate()) - || StringUtils.isNotEmpty(e.getTestValueFourDate()) - || StringUtils.isNotEmpty(e.getTestValueFiveDate()) - || StringUtils.isNotEmpty(e.getTestValueSixDate())) - ).collect(Collectors.toList()); + List staList = eTwoList.stream().filter(e -> STABILITY.equals(e.getCheckType()) && (StringUtils.isNotEmpty(e.getTestValueOneDate()) || StringUtils.isNotEmpty(e.getTestValueTwoDate()) || StringUtils.isNotEmpty(e.getTestValueThreeDate()) || StringUtils.isNotEmpty(e.getTestValueFourDate()) || StringUtils.isNotEmpty(e.getTestValueFiveDate()) || StringUtils.isNotEmpty(e.getTestValueSixDate()))).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(staList)) { statisticalDate(staList, STA_PREFIX, map); List repMapList = new ArrayList<>(); for (BizEquipmentStandardCheckDataETwo sta : staList) { Map repMap = BeanUtil.beanToMap(sta); - repMap.put("lessThan", ObjectUtils.isEmpty(sta.getLessThan()) || 0 == sta.getLessThan() ? "否" : "是"); + mapReplace(repMap); + if (sta.getLessThan() != null) { + repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); + } else { + repMap.put("lessThan", ""); + } repMapList.add(repMap); } map.put("staList", repMapList); @@ -269,17 +258,14 @@ return; } BizEquipmentStandardCheckDataETwo dataCalibrator = sta.get(0); - map.put(strListParam + DATE_PREFIX + 1, dataCalibrator.getTestValueOneDate()); - map.put(strListParam + DATE_PREFIX + 2, dataCalibrator.getTestValueTwoDate()); - map.put(strListParam + DATE_PREFIX + 3, dataCalibrator.getTestValueThreeDate()); - map.put(strListParam + DATE_PREFIX + 4, dataCalibrator.getTestValueFourDate()); - map.put(strListParam + DATE_PREFIX + 5, dataCalibrator.getTestValueFiveDate()); - map.put(strListParam + DATE_PREFIX + 6, dataCalibrator.getTestValueSixDate()); + map.put(strListParam + DATE_PREFIX + 1, StringUtils.isNotBlank(dataCalibrator.getTestValueOneDate()) ? dataCalibrator.getTestValueOneDate() : "/"); + map.put(strListParam + DATE_PREFIX + 2, StringUtils.isNotBlank(dataCalibrator.getTestValueTwoDate()) ? dataCalibrator.getTestValueTwoDate() : "/"); + map.put(strListParam + DATE_PREFIX + 3, StringUtils.isNotBlank(dataCalibrator.getTestValueThreeDate()) ? dataCalibrator.getTestValueThreeDate() : "/"); + map.put(strListParam + DATE_PREFIX + 4, StringUtils.isNotBlank(dataCalibrator.getTestValueFourDate()) ? dataCalibrator.getTestValueFourDate() : "/"); + map.put(strListParam + DATE_PREFIX + 5, StringUtils.isNotBlank(dataCalibrator.getTestValueFiveDate()) ? dataCalibrator.getTestValueFiveDate() : "/"); + map.put(strListParam + DATE_PREFIX + 6, StringUtils.isNotBlank(dataCalibrator.getTestValueSixDate()) ? dataCalibrator.getTestValueSixDate() : "/"); } -// private List> convertToListMap(String checkPoint, List eTwoList) { -// -// } @Override public List doCreateOriginalFile(BizBusinessDeviceMeasureApproval request) { @@ -301,7 +287,7 @@ equipmentList = new ArrayList<>(); equipmentList.add(new MeasureEquipmentInfoDTO()); } - map.put("actualDivisionValue", request.getActualDivisionValue()); + map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); //准备填充参数 prepareParams(map, request.getMeasureDataETwoList()); @@ -338,81 +324,95 @@ //重复性 List repPtOneList = eTwoList.stream() - .filter(e -> "1".equals(e.getDataType()) - && REPEATABILITY.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtOne())) + .filter(e -> "1".equals(e.getDataType()) && REPEATABILITY.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtOne())) .collect(Collectors.toList()); + getEquipment(equipmentList, repPtOneList); List repPtTwoList = eTwoList.stream() - .filter(e -> "1".equals(e.getDataType()) - && REPEATABILITY.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtTwo())) + .filter(e -> "1".equals(e.getDataType()) && REPEATABILITY.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtTwo())) .collect(Collectors.toList()); getEquipment(equipmentList, repPtTwoList); - map.put("repPtOneList", repPtOneList); + List> repOneMapList = repPtOneList.stream().map(e -> { + Map objectMap = BeanUtil.beanToMap(e); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("repPtOneList", repOneMapList); map.put("repPtOne", repPtOneList.get(0).getPtOne()); map.put("repPtOneaManufactureNo", repPtOneList.get(0).getAManufactureNo()); map.put("repPtOnebManufactureNo", repPtOneList.get(0).getBManufactureNo()); - map.put("repPtTwoList", repPtTwoList); + List> repTwoMapList = repPtTwoList.stream().map(e -> { + Map objectMap = BeanUtil.beanToMap(e); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("repPtTwoList", repTwoMapList); map.put("repPtTwo", repPtTwoList.get(0).getPtTwo()); map.put("repPtTwoaManufactureNo", repPtTwoList.get(0).getAManufactureNo()); map.put("repPtTwobManufactureNo", repPtTwoList.get(0).getBManufactureNo()); //偏载误差 - List loadPtOneList = eTwoList.stream() - .filter(e -> "2".equals(e.getDataType()) - && OFFSET_LOAD_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtOne())) - .collect(Collectors.toList()); + List loadPtOneList = eTwoList.stream().filter(e -> "2".equals(e.getDataType()) && OFFSET_LOAD_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtOne())).collect(Collectors.toList()); getEquipment(equipmentList, loadPtOneList); - List loadPtTwoList = eTwoList.stream() - .filter(e -> "2".equals(e.getDataType()) - && OFFSET_LOAD_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtTwo())) - .collect(Collectors.toList()); + List loadPtTwoList = eTwoList.stream().filter(e -> "2".equals(e.getDataType()) && OFFSET_LOAD_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtTwo())).collect(Collectors.toList()); getEquipment(equipmentList, loadPtTwoList); - map.put("loadPtOneList", loadPtOneList); + List> loadOneMapList = loadPtOneList.stream().map(e -> { + Map objectMap = BeanUtil.beanToMap(e); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("loadPtOneList", loadOneMapList); map.put("loadPtOne", loadPtOneList.get(0).getPtOne()); map.put("loadPtOneaManufactureNo", loadPtOneList.get(0).getAManufactureNo()); map.put("loadPtOnebManufactureNo", loadPtOneList.get(0).getBManufactureNo()); - map.put("loadPtTwoList", loadPtTwoList); + List> loadTwoMapList = loadPtTwoList.stream().map(e -> { + Map objectMap = BeanUtil.beanToMap(e); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("loadPtTwoList", loadTwoMapList); map.put("loadPtTwo", loadPtTwoList.get(0).getPtTwo()); map.put("loadPtTwoaManufactureNo", loadPtTwoList.get(0).getAManufactureNo()); map.put("loadPtTwobManufactureNo", loadPtTwoList.get(0).getBManufactureNo()); //局部示值误差 - List errorPtOneList = eTwoList.stream() - .filter(e -> "3".equals(e.getDataType()) - && LOCAL_INDICATION_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtOne())) - .collect(Collectors.toList()); + List errorPtOneList = eTwoList.stream().filter(e -> "3".equals(e.getDataType()) && LOCAL_INDICATION_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtOne())).collect(Collectors.toList()); getEquipment(equipmentList, errorPtOneList); - List errorPtTwoList = eTwoList.stream() - .filter(e -> "3".equals(e.getDataType()) - && LOCAL_INDICATION_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtTwo())) - .collect(Collectors.toList()); + List errorPtTwoList = eTwoList.stream().filter(e -> "3".equals(e.getDataType()) && LOCAL_INDICATION_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtTwo())).collect(Collectors.toList()); getEquipment(equipmentList, errorPtTwoList); - map.put("errorPtOneList", errorPtOneList); + + List> errorOneMapList = errorPtOneList.stream().map(e -> { + Map objectMap = BeanUtil.beanToMap(e); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("errorPtOneList", errorOneMapList); map.put("errorPtOne", errorPtOneList.get(0).getPtOne()); map.put("errorPtOneaManufactureNo", errorPtOneList.get(0).getAManufactureNo()); - map.put("errorPtOnemSValue", errorPtOneList.get(0).getMSValue()); - map.put("errorPtOnempesValue", errorPtOneList.get(0).getMpesValue()); - map.put("errorPtTwoList", errorPtTwoList); + map.put("errorPtOnemSValue", StringUtils.isNotBlank(errorPtOneList.get(0).getMSValue()) ? errorPtOneList.get(0).getMSValue() + "mg" : "/"); + map.put("errorPtOnempesValue", StringUtils.isNotBlank(errorPtOneList.get(0).getMpesValue()) ? errorPtOneList.get(0).getMpesValue() + "mg" : "/"); + + List> errorTwoMapList = errorPtTwoList.stream().map(e -> { + Map objectMap = BeanUtil.beanToMap(e); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("errorPtTwoList", errorTwoMapList); map.put("errorPtTwo", errorPtTwoList.get(0).getPtTwo()); map.put("errorPtTwoaManufactureNo", errorPtTwoList.get(0).getAManufactureNo()); - map.put("errorPtTwomSValue", errorPtTwoList.get(0).getMSValue()); - map.put("errorPtTwompesValue", errorPtTwoList.get(0).getMpesValue()); + map.put("errorPtTwomSValue", StringUtils.isNotBlank(errorPtTwoList.get(0).getMSValue()) ? errorPtTwoList.get(0).getMSValue() + "mg" : "/"); + map.put("errorPtTwompesValue", StringUtils.isNotBlank(errorPtTwoList.get(0).getMpesValue()) ? errorPtTwoList.get(0).getMpesValue() + "mg" : "/"); map.put("equipmentList", equipmentList); + mapReplace(map); } private void getEquipment(List> equipmentList, List list) throws Exception { @@ -432,9 +432,9 @@ aMap.put("uncertainty", aTarget.getUncertainty()); } aMap.put("equipmentType", "标准砝码"); - aMap.put("deviceNumber", list.get(0).getADeviceNumber()); - aMap.put("nominalQualityValue", list.get(0).getANominalQualityValue() + "g"); - aMap.put("convertQualityCorrectValue", list.get(0).getAConvertQualityCorrectValue() + "mg"); + aMap.put("deviceNumber", StringUtils.isNotBlank(list.get(0).getADeviceNumber()) ? list.get(0).getADeviceNumber() : "/"); + aMap.put("nominalQualityValue", StringUtils.isNotBlank(list.get(0).getANominalQualityValue()) ? list.get(0).getANominalQualityValue() + "g" : "/"); + aMap.put("convertQualityCorrectValue", StringUtils.isNotBlank(list.get(0).getAConvertQualityCorrectValue()) ? list.get(0).getAConvertQualityCorrectValue() + "mg" : "/"); aMap.put("remark", "/"); Map bMap = new HashMap<>(); @@ -449,9 +449,9 @@ aMap.put("uncertainty", bTarget.getUncertainty()); } bMap.put("equipmentType", "标准砝码"); - bMap.put("deviceNumber", list.get(0).getBDeviceNumber()); - bMap.put("nominalQualityValue", list.get(0).getBNominalQualityValue() + "g"); - bMap.put("convertQualityCorrectValue", list.get(0).getBConvertQualityCorrectValue() + "mg"); + bMap.put("deviceNumber", StringUtils.isNotBlank(list.get(0).getBDeviceNumber()) ? list.get(0).getBDeviceNumber() : "/"); + bMap.put("nominalQualityValue", StringUtils.isNotBlank(list.get(0).getBNominalQualityValue()) ? list.get(0).getBNominalQualityValue() + "g" : "/"); + bMap.put("convertQualityCorrectValue", StringUtils.isNotBlank(list.get(0).getBConvertQualityCorrectValue()) ? list.get(0).getBConvertQualityCorrectValue() + "mg" : "/"); bMap.put("remark", "/"); equipmentList.add(aMap); @@ -469,9 +469,9 @@ aMap.put("uncertainty", aTarget.getUncertainty()); } aMap.put("equipmentType", "标准砝码"); - aMap.put("deviceNumber", list.get(0).getADeviceNumber()); - aMap.put("nominalQualityValue", list.get(0).getANominalQualityValue() + "g"); - aMap.put("convertQualityCorrectValue", list.get(0).getAConvertQualityCorrectValue() + "mg"); + aMap.put("deviceNumber", StringUtils.isNotBlank(list.get(0).getADeviceNumber()) ? list.get(0).getADeviceNumber() : "/"); + aMap.put("nominalQualityValue", StringUtils.isNotBlank(list.get(0).getANominalQualityValue()) ? list.get(0).getANominalQualityValue() + "g" : "/"); + aMap.put("convertQualityCorrectValue", StringUtils.isNotBlank(list.get(0).getAConvertQualityCorrectValue()) ? list.get(0).getAConvertQualityCorrectValue() + "mg" : "/"); aMap.put("remark", "/"); equipmentList.add(aMap); } @@ -495,6 +495,7 @@ DictCodeUtils.convertDictCodeToName(request); request.setActualDivisionValue(request.getActualDivisionValue() + request.getActualDivisionValueUnit()); Map map = BeanUtil.beanToMap(request); + mapReplace(map); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); if (CollectionUtils.isEmpty(equipmentList)) { @@ -504,7 +505,7 @@ map.put("equipmentList", equipmentList); prepareCertificateParams(map, request.getMeasureDataETwoList()); - prepareParams(map, request.getMeasureDataETwoList()); +// prepareParams(map, request.getMeasureDataETwoList()); prepareCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); @@ -532,64 +533,64 @@ private void prepareCertificateParams(Map map, List eTwoList) { //重复性PtOne - List repPtOneList = eTwoList.stream() - .filter(e -> "1".equals(e.getDataType()) - && REPEATABILITY.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtOne())) - .collect(Collectors.toList()); + List repPtOneList = eTwoList.stream().filter(e -> "1".equals(e.getDataType()) && REPEATABILITY.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtOne())).collect(Collectors.toList()); //重复性PtTwo - List repPtTwoList = eTwoList.stream() - .filter(e -> "1".equals(e.getDataType()) - && REPEATABILITY.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtTwo())) - .collect(Collectors.toList()); + List repPtTwoList = eTwoList.stream().filter(e -> "1".equals(e.getDataType()) && REPEATABILITY.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtTwo())).collect(Collectors.toList()); + BizBusinessDeviceMeasureDataETwo repOne = repPtOneList.get(0); repOne.setPtOne(repOne.getPtOne() + repOne.getPtOneUnit()); + repOne.setSValue(StringUtils.isNotBlank(repOne.getSValue()) ? repOne.getSValue() + "mg" : "/"); + repOne.setURValue(StringUtils.isNotBlank(repOne.getURValue()) ? repOne.getURValue() + "mg" : "/"); + Map repOneMap = BeanUtil.beanToMap(repOne); + mapReplace(repOneMap); + map.put("repOne", repOneMap); - map.put("repOne", repOne); BizBusinessDeviceMeasureDataETwo repTwo = repPtTwoList.get(0); repTwo.setPtTwo(repTwo.getPtTwo() + repTwo.getPtTwoUnit()); - - map.put("repTwo", repTwo); + repTwo.setSValue(StringUtils.isNotBlank(repTwo.getSValue()) ? repTwo.getSValue() + "mg" : "/"); + repTwo.setURValue(StringUtils.isNotBlank(repTwo.getURValue()) ? repTwo.getURValue() + "mg" : "/"); + Map repTwoMap = BeanUtil.beanToMap(repTwo); + mapReplace(repTwoMap); + map.put("repTwo", repTwoMap); //偏载误差PtOne - List loadPtOneList = eTwoList.stream() - .filter(e -> "2".equals(e.getDataType()) - && OFFSET_LOAD_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtOne())) - .collect(Collectors.toList()); + List loadPtOneList = eTwoList.stream().filter(e -> "2".equals(e.getDataType()) && OFFSET_LOAD_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtOne())).collect(Collectors.toList()); //偏载误差PtTwo - List loadPtTwoList = eTwoList.stream() - .filter(e -> "2".equals(e.getDataType()) - && OFFSET_LOAD_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtTwo())) - .collect(Collectors.toList()); + List loadPtTwoList = eTwoList.stream().filter(e -> "2".equals(e.getDataType()) && OFFSET_LOAD_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtTwo())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataETwo loadOne = loadPtOneList.get(0); loadOne.setPtOne(loadOne.getPtOne() + loadOne.getPtOneUnit()); - map.put("loadOne", loadOne); + loadOne.setSValue(StringUtils.isNotBlank(loadOne.getSValue()) ? loadOne.getSValue() + "mg" : "/"); + loadOne.setURValue(StringUtils.isNotBlank(loadOne.getURValue()) ? loadOne.getURValue() + "mg" : "/"); + Map loadOneMap = BeanUtil.beanToMap(loadOne); + mapReplace(loadOneMap); + map.put("loadOne", loadOneMap); BizBusinessDeviceMeasureDataETwo loadTwo = loadPtTwoList.get(0); loadTwo.setPtTwo(loadTwo.getPtTwo() + loadTwo.getPtTwoUnit()); - map.put("loadTwo", loadTwo); + loadTwo.setSValue(StringUtils.isNotBlank(loadTwo.getSValue()) ? loadTwo.getSValue() + "mg" : "/"); + loadTwo.setURValue(StringUtils.isNotBlank(loadTwo.getURValue()) ? loadTwo.getURValue() + "mg" : "/"); + Map loadTwoMap = BeanUtil.beanToMap(loadTwo); + mapReplace(loadTwoMap); + map.put("loadTwo", loadTwoMap); //局部示值误差PtOne - List errorPtOneList = eTwoList.stream() - .filter(e -> "3".equals(e.getDataType()) - && LOCAL_INDICATION_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtOne())) - .collect(Collectors.toList()); + List errorPtOneList = eTwoList.stream().filter(e -> "3".equals(e.getDataType()) && LOCAL_INDICATION_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtOne())).collect(Collectors.toList()); //局部示值误差PtTwo - List errorPtTwoList = eTwoList.stream() - .filter(e -> "3".equals(e.getDataType()) - && LOCAL_INDICATION_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtTwo())) - .collect(Collectors.toList()); + List errorPtTwoList = eTwoList.stream().filter(e -> "3".equals(e.getDataType()) && LOCAL_INDICATION_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtTwo())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataETwo errorOne = errorPtOneList.get(0); errorOne.setPtOne(errorOne.getPtOne() + errorOne.getPtOneUnit()); - map.put("errorOne", errorOne); + errorOne.setSValue(StringUtils.isNotBlank(errorOne.getSValue()) ? errorOne.getSValue() + "mg" : "/"); + errorOne.setURValue(StringUtils.isNotBlank(errorOne.getURValue()) ? errorOne.getURValue() + "mg" : "/"); + Map errorOneMap = BeanUtil.beanToMap(errorOne); + mapReplace(errorOneMap); + map.put("errorOne", errorOneMap); BizBusinessDeviceMeasureDataETwo errorTwo = errorPtTwoList.get(0); errorTwo.setPtTwo(errorTwo.getPtTwo() + errorTwo.getPtTwoUnit()); - map.put("errorTwo", errorTwo); + errorTwo.setSValue(StringUtils.isNotBlank(errorTwo.getSValue()) ? errorTwo.getSValue() + "mg" : "/"); + errorTwo.setURValue(StringUtils.isNotBlank(errorTwo.getURValue()) ? errorTwo.getURValue() + "mg" : "/"); + Map errorTwoMap = BeanUtil.beanToMap(errorTwo); + mapReplace(errorTwoMap); + map.put("errorTwo", errorTwoMap); } /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java index e106828..fb70360 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java @@ -28,6 +28,7 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; +import reactor.core.publisher.Mono; import java.text.SimpleDateFormat; import java.util.*; @@ -56,6 +57,7 @@ return null; } Map map = BeanUtil.beanToMap(request); + mapReplace(map); String[] pointStr = {DC_VOLTAGE, RESISTANCE_MEASUREMENT}; //重复性、稳定性 final String[] checkTypes = {REPEATABILITY, STABILITY}; @@ -70,6 +72,7 @@ List repMapList = new ArrayList<>(); for (BizEquipmentStandardCheckDataElectricalSafety rep : repList) { Map repMap = BeanUtil.beanToMap(rep); + mapReplace(repMap); repMapList.add(repMap); } map.put(REPEAT_PREFIX + (i + 1), repMapList); @@ -90,12 +93,13 @@ List repMapList = new ArrayList<>(); for (BizEquipmentStandardCheckDataElectricalSafety sta : staList) { Map repMap = BeanUtil.beanToMap(sta); + mapReplace(repMap); repMap.put("lessThan", ObjectUtils.isEmpty(sta.getLessThan()) || 0 == sta.getLessThan() ? "否" : "是"); repMapList.add(repMap); } map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF0A3"); map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF0A3"); - if (1==staList.get(0).getQualified()) { + if (1 == staList.get(0).getQualified()) { map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF052"); } else { map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF052"); @@ -114,7 +118,7 @@ urlList.add((String) map.get("pdfUrl")); } return urlList; - }catch (Exception ex){ + } catch (Exception ex) { log.info("-----package data is exception， this is {}", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } @@ -133,16 +137,16 @@ return; } BizEquipmentStandardCheckDataElectricalSafety dataCalibrator = sta.get(0); - map.put(strListParam + DATE_PREFIX + 1, dataCalibrator.getTestValueOneDate()); - map.put(strListParam + DATE_PREFIX + 2, dataCalibrator.getTestValueTwoDate()); - map.put(strListParam + DATE_PREFIX + 3, dataCalibrator.getTestValueThreeDate()); - map.put(strListParam + DATE_PREFIX + 4, dataCalibrator.getTestValueFourDate()); - map.put(strListParam + DATE_PREFIX + 5, dataCalibrator.getTestValueFiveDate()); - map.put(strListParam + DATE_PREFIX + 6, dataCalibrator.getTestValueSixDate()); + map.put(strListParam + DATE_PREFIX + 1, StringUtils.isNotBlank(dataCalibrator.getTestValueOneDate()) ? dataCalibrator.getTestValueOneDate() : "/"); + map.put(strListParam + DATE_PREFIX + 2, StringUtils.isNotBlank(dataCalibrator.getTestValueTwoDate()) ? dataCalibrator.getTestValueTwoDate() : "/"); + map.put(strListParam + DATE_PREFIX + 3, StringUtils.isNotBlank(dataCalibrator.getTestValueThreeDate()) ? dataCalibrator.getTestValueThreeDate() : "/"); + map.put(strListParam + DATE_PREFIX + 4, StringUtils.isNotBlank(dataCalibrator.getTestValueFourDate()) ? dataCalibrator.getTestValueFourDate() : "/"); + map.put(strListParam + DATE_PREFIX + 5, StringUtils.isNotBlank(dataCalibrator.getTestValueFiveDate()) ? dataCalibrator.getTestValueFiveDate() : "/"); + map.put(strListParam + DATE_PREFIX + 6, StringUtils.isNotBlank(dataCalibrator.getTestValueSixDate()) ? dataCalibrator.getTestValueSixDate() : "/"); } @Override - public List doCreateOriginalFile(BizBusinessDeviceMeasureApproval request) { + public List doCreateOriginalFile(BizBusinessDeviceMeasureApproval request) { try { if (ObjectUtils.isEmpty(request)) { return null; @@ -154,7 +158,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - + mapReplace(map); BizBusinessDeviceMeasureEquipmentMapper equipmentMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureEquipmentMapper.class); List equipmentList = equipmentMapper.selectEquipmentListByDataId(request.getDataId()); if (CollectionUtils.isEmpty(equipmentList)) { @@ -194,15 +198,24 @@ } } + + private void prepareParams(List electricalSafetyList, Map map) { - List voltageList = electricalSafetyList.stream() - .filter(e -> "1".equals(e.getDataType())).collect(Collectors.toList()); + List> voltageList = electricalSafetyList.stream() + .filter(e -> "1".equals(e.getDataType())).map(BeanUtil::beanToMap).collect(Collectors.toList()); List indicationErrorList = electricalSafetyList.stream() .filter(e -> "2".equals(e.getDataType())).collect(Collectors.toList()); doCustomParam(indicationErrorList); + List> errorList = indicationErrorList.stream().map(BeanUtil::beanToMap).collect(Collectors.toList()); + for (Map stringObjectMap : errorList) { + mapReplace(stringObjectMap); + } + for (Map stringObjectMap : voltageList) { + mapReplace(stringObjectMap); + } map.put("voltageList", voltageList); - map.put("errorList", indicationErrorList); + map.put("errorList", errorList); } /** @@ -257,13 +270,6 @@ log.debug("该报告没有证书报告"); return null; } - if (CollectionUtils.isEmpty(request.getMeasureDataElectricalSafetyList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataElectricalSafety()); - request.setMeasureDataElectricalSafetyList(list); - } - - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); @@ -274,17 +280,15 @@ equipmentList.add(new MeasureEquipmentInfoDTO()); } map.put("equipmentList", equipmentList); - prepareCustomCoverParams(map, request.getMeasureDataElectricalSafetyList()); - List electricalSafetyList = request.getMeasureDataElectricalSafetyList(); - List voltageList = electricalSafetyList.stream() - .filter(e -> "1".equals(e.getDataType())).collect(Collectors.toList()); - List indicationErrorList = electricalSafetyList.stream() - .filter(e -> "2".equals(e.getDataType())).collect(Collectors.toList()); - map.put("voltageList", voltageList); - map.put("errorList", indicationErrorList); + prepareCustomCoverParams(map, request.getMeasureDataElectricalSafetyList()); + + List electricalSafetyList = request.getMeasureDataElectricalSafetyList(); + //填充参数 + prepareParams(electricalSafetyList, map); //准备封面参数 prepareCoverParams(map, request.getLabCode()); + List customTemplateUrls = new ArrayList<>(); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); log.debug("--------get Certificate template is ...."); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 7422613..889a4e6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -15,6 +15,20 @@ public class StandardEquipmentSupport implements MeasureCategoryEnum { /** + * 替换map集合中的空值为斜杠/ + * @param map + */ + protected void mapReplace(Map map) { + List excludedKeys = Arrays.asList("approvalStatus", "processId", "createUserId", "createUserName", + "checkUserName", "approvalStatusName", "taskId", "decisionItem", "staffName","lessThan"); + map.forEach((k, v) -> { + if (!excludedKeys.contains(k) && org.springframework.util.ObjectUtils.isEmpty(v)) { + map.put(k, "/"); + } + }); + } + + /** * 填充固定的信息参数 */ protected void prepareCoverParams(Map map, String labCode) { 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 afc322a..bdd83db 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 @@ -16,6 +16,7 @@ import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo; import com.casic.missiles.model.equipment.BizEquipmentInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataDcPower; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataElectricalSafety; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentSupport; @@ -43,8 +44,6 @@ @Slf4j public class DcPowerSupplyHandler extends StandardEquipmentSupport implements PrintFileModuleNameEnum, StandardEquipmentPrint { - private final BizBusinessDeviceMeasureInfoMapper bizBusinessDeviceMeasureInfoMapper; - private final PrintFileRegister printFileRegister; private final BizBusinessDeviceMeasureEquipmentMapper bizBusinessDeviceMeasureEquipmentMapper; @@ -62,104 +61,9 @@ return null; } Map map = BeanUtil.beanToMap(request); - //划分为直流电压，电源效应和负载效应Power and load effects，直流电流（直接测量）Direct current (direct measurement)，直流电流（间接测量）Direct current (indirect measurement)，纹波电压Ripple Voltage - String[] pointStr = {DC_VOLTAGE, POWER_AND_LOAD_EFFECTS, DC_CURRENT_DIRECT_MEASUREMENT, DC_CURRENT_INDIRECT_MEASUREMENT}; - //稳定性、重复性 - final String[] checkTypes = {REPEATABILITY, STABILITY}; - List pointList = Arrays.asList(pointStr); + mapReplace(map); - for (int i = 0; i < pointList.size(); i++) { - String points = pointList.get(i); - //重复性 - List repList = request.getCheckDataDcPowerList() - .stream().filter(e -> points.equals(e.getCheckParam()) - && checkTypes[0].equals(e.getCheckType()) - && StringUtils.isEmpty(e.getTestValueFiveDate())).collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(repList)) { - List repMapList = new ArrayList<>(); - for (BizEquipmentStandardCheckDataDcPower rep : repList) { - Map repMap = BeanUtil.beanToMap(rep); - repMapList.add(repMap); - } - map.put(REPEAT_PREFIX + (i + 1), repMapList); - } - //稳定性 - List staList = request.getCheckDataDcPowerList() - .stream().filter(e -> points.equals(e.getCheckParam()) - && checkTypes[1].equals(e.getCheckType()) - && (StringUtils.isNotEmpty(e.getTestValueOneDate()) - || StringUtils.isNotEmpty(e.getTestValueTwoDate()) - || StringUtils.isNotEmpty(e.getTestValueThreeDate()) - || StringUtils.isNotEmpty(e.getTestValueFourDate()) - || StringUtils.isNotEmpty(e.getTestValueFiveDate()) - || StringUtils.isNotEmpty(e.getTestValueSixDate())) - ).collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(staList)) { - statisticalDate(staList, STA_PREFIX + (i + 1), map); - List repMapList = new ArrayList<>(); - for (BizEquipmentStandardCheckDataDcPower sta : staList) { - Map repMap = BeanUtil.beanToMap(sta); - if (sta.getLessThan() != null) { - repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); - }else { - repMap.put("lessThan",""); - } - repMapList.add(repMap); - } - map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF0A3"); - map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF0A3"); - if (1 == staList.get(0).getQualified()) { - map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF052"); - } else { - map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF052"); - } - map.put(STA_PREFIX + (i + 1), repMapList); - } - } - - List repList = request.getCheckDataDcPowerList().stream() - .filter(d -> RIPPLE_VOLTAGE.equals(d.getCheckParam()) - && checkTypes[0].equals(d.getCheckType())) - .collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(repList)) { - List repMapList = new ArrayList<>(); - for (BizEquipmentStandardCheckDataDcPower rep : repList) { - Map repMap = BeanUtil.beanToMap(rep); - repMapList.add(repMap); - } - map.put(REPEAT_PREFIX + 5, repMapList); - } - - List staList = request.getCheckDataDcPowerList().stream() - .filter(d -> RIPPLE_VOLTAGE.equals(d.getCheckParam()) - && checkTypes[1].equals(d.getCheckType()) - && (StringUtils.isNotEmpty(d.getTestValueOneDate()) - || StringUtils.isNotEmpty(d.getTestValueTwoDate()) - || StringUtils.isNotEmpty(d.getTestValueThreeDate()) - || StringUtils.isNotEmpty(d.getTestValueFourDate()) - || StringUtils.isNotEmpty(d.getTestValueFiveDate()) - || StringUtils.isNotEmpty(d.getTestValueSixDate()))).collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(staList)) { - statisticalDate(staList, STA_PREFIX + 5, map); - List repMapList = new ArrayList<>(); - for (BizEquipmentStandardCheckDataDcPower sta : staList) { - Map repMap = BeanUtil.beanToMap(sta); - if (sta.getLessThan() != null) { - repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); - }else { - repMap.put("lessThan",""); - } - repMapList.add(repMap); - } - map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF0A3"); - map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF0A3"); - if (1 == staList.get(0).getQualified()) { - map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF052"); - } else { - map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF052"); - } - map.put(STA_PREFIX + 5, repMapList); - } + prepareCheckParams(request, map); //除了选用的模板不一致，模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY_CHECK_DATA, "数据打印", null, map, false, null, null); @@ -177,6 +81,148 @@ } } + private void prepareCheckParams(BizEquipmentStandardCheckRecordApproval request, Map map) { + //划分为直流电压，电源效应和负载效应Power and load effects，直流电流（直接测量）Direct current (direct measurement)，直流电流（间接测量）Direct current (indirect measurement)，纹波电压Ripple Voltage + String[] pointStr = {DC_VOLTAGE, POWER_AND_LOAD_EFFECTS, DC_CURRENT_DIRECT_MEASUREMENT, DC_CURRENT_INDIRECT_MEASUREMENT}; + //稳定性、重复性 + final String[] checkTypes = {REPEATABILITY, STABILITY}; + List pointList = Arrays.asList(pointStr); + + Map numMap = new HashMap<>(); + numMap.put(1, 3); + numMap.put(2, 7); + numMap.put(3, 3); + numMap.put(4, 4); + numMap.put(5, 6); + + for (int i = 0; i < pointList.size(); i++) { + String points = pointList.get(i); + //重复性 + List repList = request.getCheckDataDcPowerList() + .stream().filter(e -> points.equals(e.getCheckParam()) + && checkTypes[0].equals(e.getCheckType()) + && StringUtils.isEmpty(e.getTestValueFiveDate())).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(repList)) { + List repMapList = new ArrayList<>(); + for (BizEquipmentStandardCheckDataDcPower rep : repList) { + Map repMap = BeanUtil.beanToMap(rep); + mapReplace(repMap); + repMapList.add(repMap); + } + int size = numMap.get(i + 1) - repMapList.size(); + for (int j = 0; j < size; j++) { + BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); + Map powerMap = BeanUtil.beanToMap(dcPower); + mapReplace(powerMap); + repMapList.add(powerMap); + } + map.put(REPEAT_PREFIX + (i + 1), repMapList); + } + //稳定性 + List staList = request.getCheckDataDcPowerList() + .stream().filter(e -> points.equals(e.getCheckParam()) + && checkTypes[1].equals(e.getCheckType()) + && (StringUtils.isNotEmpty(e.getTestValueOneDate()) + || StringUtils.isNotEmpty(e.getTestValueTwoDate()) + || StringUtils.isNotEmpty(e.getTestValueThreeDate()) + || StringUtils.isNotEmpty(e.getTestValueFourDate()) + || StringUtils.isNotEmpty(e.getTestValueFiveDate()) + || StringUtils.isNotEmpty(e.getTestValueSixDate())) + ).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(staList)) { + statisticalDate(staList, STA_PREFIX + (i + 1), map); + List repMapList = new ArrayList<>(); + for (BizEquipmentStandardCheckDataDcPower sta : staList) { + Map repMap = BeanUtil.beanToMap(sta); + mapReplace(repMap); + if (sta.getLessThan() != null) { + repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); + } else { + repMap.put("lessThan", ""); + } + repMapList.add(repMap); + } + int size = numMap.get(i + 1) - repMapList.size(); + for (int j = 0; j < size; j++) { + BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); + Map powerMap = BeanUtil.beanToMap(dcPower); + mapReplace(powerMap); + powerMap.put("lessThan", ""); + repMapList.add(powerMap); + } + map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF0A3"); + map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF0A3"); + if (1 == staList.get(0).getQualified()) { + map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF052"); + } else { + map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF052"); + } + map.put(STA_PREFIX + (i + 1), repMapList); + } + } + + List repList = request.getCheckDataDcPowerList().stream() + .filter(d -> RIPPLE_VOLTAGE.equals(d.getCheckParam()) + && checkTypes[0].equals(d.getCheckType())) + .collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(repList)) { + List repMapList = new ArrayList<>(); + for (BizEquipmentStandardCheckDataDcPower rep : repList) { + Map repMap = BeanUtil.beanToMap(rep); + mapReplace(repMap); + repMapList.add(repMap); + } + int size = numMap.get(5) - repMapList.size(); + for (int j = 0; j < size; j++) { + BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); + Map powerMap = BeanUtil.beanToMap(dcPower); + mapReplace(powerMap); + repMapList.add(powerMap); + } + map.put(REPEAT_PREFIX + 5, repMapList); + } + + List staList = request.getCheckDataDcPowerList().stream() + .filter(d -> RIPPLE_VOLTAGE.equals(d.getCheckParam()) + && checkTypes[1].equals(d.getCheckType()) + && (StringUtils.isNotEmpty(d.getTestValueOneDate()) + || StringUtils.isNotEmpty(d.getTestValueTwoDate()) + || StringUtils.isNotEmpty(d.getTestValueThreeDate()) + || StringUtils.isNotEmpty(d.getTestValueFourDate()) + || StringUtils.isNotEmpty(d.getTestValueFiveDate()) + || StringUtils.isNotEmpty(d.getTestValueSixDate()))).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(staList)) { + statisticalDate(staList, STA_PREFIX + 5, map); + List repMapList = new ArrayList<>(); + for (BizEquipmentStandardCheckDataDcPower sta : staList) { + Map repMap = BeanUtil.beanToMap(sta); + mapReplace(repMap); + if (sta.getLessThan() != null) { + repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); + } else { + repMap.put("lessThan", ""); + } + repMapList.add(repMap); + } + int size = numMap.get(5) - repMapList.size(); + for (int j = 0; j < size; j++) { + BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); + Map powerMap = BeanUtil.beanToMap(dcPower); + mapReplace(powerMap); + powerMap.put("lessThan", ""); + repMapList.add(powerMap); + } + map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF0A3"); + map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF0A3"); + if (1 == staList.get(0).getQualified()) { + map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF052"); + } else { + map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF052"); + } + map.put(STA_PREFIX + 5, repMapList); + } + } + /** * 组装参数 * @@ -186,16 +232,16 @@ */ private void statisticalDate(List sta, String strListParam, Map map) { //再次健壮性判断，防止其他方法调用，或者已经存在直接退出 - if (com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(sta) || map.containsKey(strListParam + DATE_PREFIX + 1)) { + if (CollectionUtils.isEmpty(sta) || map.containsKey(strListParam + DATE_PREFIX + 1)) { return; } BizEquipmentStandardCheckDataDcPower dataCalibrator = sta.get(0); - map.put(strListParam + DATE_PREFIX + 1, dataCalibrator.getTestValueOneDate()); - map.put(strListParam + DATE_PREFIX + 2, dataCalibrator.getTestValueTwoDate()); - map.put(strListParam + DATE_PREFIX + 3, dataCalibrator.getTestValueThreeDate()); - map.put(strListParam + DATE_PREFIX + 4, dataCalibrator.getTestValueFourDate()); - map.put(strListParam + DATE_PREFIX + 5, dataCalibrator.getTestValueFiveDate()); - map.put(strListParam + DATE_PREFIX + 6, dataCalibrator.getTestValueSixDate()); + map.put(strListParam + DATE_PREFIX + 1, StringUtils.isNotBlank(dataCalibrator.getTestValueOneDate()) ? dataCalibrator.getTestValueOneDate() : "/"); + map.put(strListParam + DATE_PREFIX + 2, StringUtils.isNotBlank(dataCalibrator.getTestValueTwoDate()) ? dataCalibrator.getTestValueTwoDate() : "/"); + map.put(strListParam + DATE_PREFIX + 3, StringUtils.isNotBlank(dataCalibrator.getTestValueThreeDate()) ? dataCalibrator.getTestValueThreeDate() : "/"); + map.put(strListParam + DATE_PREFIX + 4, StringUtils.isNotBlank(dataCalibrator.getTestValueFourDate()) ? dataCalibrator.getTestValueFourDate() : "/"); + map.put(strListParam + DATE_PREFIX + 5, StringUtils.isNotBlank(dataCalibrator.getTestValueFiveDate()) ? dataCalibrator.getTestValueFiveDate() : "/"); + map.put(strListParam + DATE_PREFIX + 6, StringUtils.isNotBlank(dataCalibrator.getTestValueSixDate()) ? dataCalibrator.getTestValueSixDate() : "/"); } @Override @@ -208,10 +254,9 @@ List list = Collections.emptyList(); request.setMeasureDataDcPowerList(list); } - BizBusinessDeviceMeasureInfo measureInfo = bizBusinessDeviceMeasureInfoMapper.selectDetailById(request.getDataId()); DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - map.put("dataNo", measureInfo.getDataNo()); + mapReplace(map); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); if (CollectionUtils.isEmpty(equipmentList)) { @@ -224,66 +269,7 @@ List dcPowerList = request.getMeasureDataDcPowerList(); - //电源电压调整率 - List powerSupplyVoltageAdjustmentList = dcPowerList.stream() - .filter(dcPower -> "1".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); - dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); - return dcPower; - }).collect(Collectors.toList()); - - //负载调整率 - List loadRegulationList = dcPowerList.stream() - .filter(dcPower -> "2".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); - dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); - return dcPower; - }).collect(Collectors.toList()); - - //电压示值误差 - List voltageRepresentationErrorList = dcPowerList.stream() - .filter(dcPower -> "3".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); - return dcPower; - }).collect(Collectors.toList()); - - //电流表示值误差（直接测量） - List directMeasurementList = dcPowerList.stream() - .filter(dcPower -> "4".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); - return dcPower; - }).collect(Collectors.toList()); - - //电流表示值误差（间接测量） - List indirectMeasurementList = dcPowerList.stream() - .filter(dcPower -> "5".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); - return dcPower; - }).collect(Collectors.toList()); - - //波纹电压 - List rippleList = dcPowerList.stream() - .filter(dcPower -> "6".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); - dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "mV"); - return dcPower; - }).collect(Collectors.toList()); - - //输出电压短期稳定性 - List shortRepList = dcPowerList.stream() - .filter(dcPower -> "7".equals(dcPower.getDataType())) - .peek(dcPower -> { - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); - dcPower.setShortTermStability(dcPower.getShortTermStability() + "%"); - }).collect(Collectors.toList()); - - map.put("shortRepList", shortRepList); - map.put("powerSupplyVoltageAdjustmentList", powerSupplyVoltageAdjustmentList); - map.put("loadRegulationList", loadRegulationList); - map.put("voltageRepresentationErrorList", voltageRepresentationErrorList); - map.put("directMeasurementList", directMeasurementList); - map.put("indirectMeasurementList", indirectMeasurementList); - map.put("rippleList", rippleList); + prepareParams(dcPowerList, map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "1", request.getItemCategoryName())); @@ -307,6 +293,102 @@ } /** + * 准备原始记录填充参数 + * + * @param dcPowerList + * @param map + */ + private void prepareParams(List dcPowerList, Map map) { + //电源电压调整率 + List> powerSupplyVoltageAdjustmentList = dcPowerList.stream() + .filter(dcPower -> "1".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //负载调整率 + List> loadRegulationList = dcPowerList.stream() + .filter(dcPower -> "2".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电压示值误差 + List> voltageRepresentationErrorList = dcPowerList.stream() + .filter(dcPower -> "3".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电流表示值误差（直接测量） + List> directMeasurementList = dcPowerList.stream() + .filter(dcPower -> "4".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电流表示值误差（间接测量） + List> indirectMeasurementList = dcPowerList.stream() + .filter(dcPower -> "5".equals(dcPower.getDataType())) + .map(dcPower -> { + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //波纹电压 + List> rippleList = dcPowerList.stream() + .filter(dcPower -> "6".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "mV"); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //输出电压短期稳定性 + List> shortRepList = dcPowerList.stream() + .filter(dcPower -> "7".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setShortTermStability(dcPower.getShortTermStability() + "%"); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + map.put("powerSupplyVoltageAdjustmentList", powerSupplyVoltageAdjustmentList); + map.put("loadRegulationList", loadRegulationList); + map.put("voltageRepresentationErrorList", voltageRepresentationErrorList); + map.put("directMeasurementList", directMeasurementList); + map.put("indirectMeasurementList", indirectMeasurementList); + map.put("rippleList", rippleList); + map.put("shortRepList", shortRepList); + } + + /** * 封面基本信息的定制化参数 * * @param map @@ -356,13 +438,12 @@ list.add(new BizBusinessDeviceMeasureDataDcPower()); request.setMeasureDataDcPowerList(list); } - Long dataId = request.getDataId(); - BizBusinessDeviceMeasureInfo measureInfo = bizBusinessDeviceMeasureInfoMapper.selectDetailById(dataId); DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - map.put("dataNo", measureInfo.getDataNo()); + mapReplace(map); + Long dataId = request.getDataId(); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(dataId); if (CollectionUtils.isEmpty(equipmentList)) { equipmentList = new ArrayList<>(); @@ -371,42 +452,9 @@ map.put("equipmentList", equipmentList); List dcPowerList = request.getMeasureDataDcPowerList(); - //电源电压调整率 - List powerSupplyVoltageAdjustmentList = dcPowerList.stream() - .filter(dcPower -> "1".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //负载调整率 - List loadRegulationList = dcPowerList.stream() - .filter(dcPower -> "2".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //电压示值误差 - List voltageRepresentationErrorList = dcPowerList.stream() - .filter(dcPower -> "3".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //电流表示值误差（直接测量） - List directMeasurementList = dcPowerList.stream() - .filter(dcPower -> "4".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //电流表示值误差（间接测量） - List indirectMeasurementList = dcPowerList.stream() - .filter(dcPower -> "5".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //波纹电压 - List rippleList = dcPowerList.stream() - .filter(dcPower -> "6".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //输出电压短期稳定性 - List shortRepList = dcPowerList.stream() - .filter(dcPower -> "7".equals(dcPower.getDataType())).collect(Collectors.toList()); - - map.put("powerSupplyVoltageAdjustmentList", powerSupplyVoltageAdjustmentList); - map.put("loadRegulationList", loadRegulationList); - map.put("voltageRepresentationErrorList", voltageRepresentationErrorList); - map.put("directMeasurementList", directMeasurementList); - map.put("indirectMeasurementList", indirectMeasurementList); - map.put("rippleList", rippleList); - map.put("shortRepList", shortRepList); - + //准备填充参数 + prepareCertificateParams(dcPowerList, map); + //准备封面参数 prepareCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); @@ -433,6 +481,92 @@ } /** + * 准备检定证书参数 + * + * @param dcPowerList + * @param map + */ + private void prepareCertificateParams(List dcPowerList, Map map) { + //电源电压调整率 + List> powerSupplyVoltageAdjustmentList = dcPowerList.stream() + .filter(dcPower -> "1".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //负载调整率 + List> loadRegulationList = dcPowerList.stream() + .filter(dcPower -> "2".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电压示值误差 + List> voltageRepresentationErrorList = dcPowerList.stream() + .filter(dcPower -> "3".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电流表示值误差（直接测量） + List> directMeasurementList = dcPowerList.stream() + .filter(dcPower -> "4".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电流表示值误差（间接测量） + List> indirectMeasurementList = dcPowerList.stream() + .filter(dcPower -> "5".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //波纹电压 + List> rippleList = dcPowerList.stream() + .filter(dcPower -> "6".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //输出电压短期稳定性 + List> shortRepList = dcPowerList.stream() + .filter(dcPower -> "7".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + map.put("powerSupplyVoltageAdjustmentList", powerSupplyVoltageAdjustmentList); + map.put("loadRegulationList", loadRegulationList); + map.put("voltageRepresentationErrorList", voltageRepresentationErrorList); + map.put("directMeasurementList", directMeasurementList); + map.put("indirectMeasurementList", indirectMeasurementList); + map.put("rippleList", rippleList); + map.put("shortRepList", shortRepList); + } + + /** * 检查是否能生成证书 */ private Boolean checkOutUnablePrint(BizBusinessDeviceMeasureApproval measureItemInfo) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ETwoWeightHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ETwoWeightHandler.java index c5ac4e4..2ab844e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ETwoWeightHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ETwoWeightHandler.java @@ -102,154 +102,143 @@ /** * 核查填充参数 + * * @param eTwoList * @param map */ private void prepareCheckParams(List eTwoList, Map map) { - List checkPointList = eTwoList.stream() - .map(BizEquipmentStandardCheckDataETwo::getCheckPoint) - .distinct() - .collect(Collectors.toList()); - List> repList = new ArrayList<>(); + List checkPointList = eTwoList.stream().map(BizEquipmentStandardCheckDataETwo::getCheckPoint).distinct().collect(Collectors.toList()); + List> repList = new ArrayList<>(); for (String s : checkPointList) { //A1 - List> aOneList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map aOneMap = new HashMap<>(); - aOneMap.put("checkPoint", s); - aOneMap.put("project", "A1(" + "Ιᵣ₁ᵢ)"); - aOneMap.put("unit", e.getUnit()); - aOneMap.put("oneValue", e.getAOneValueOne()); - aOneMap.put("twoValue", e.getAOneValueTwo()); - aOneMap.put("threeValue", e.getAOneValueThree()); - aOneMap.put("fourValue", e.getAOneValueFour()); - aOneMap.put("fiveValue", e.getAOneValueFive()); - aOneMap.put("sixValue", e.getAOneValueSix()); - return aOneMap; - }) - .collect(Collectors.toList()); + List> aOneList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map aOneMap = new HashMap<>(); + aOneMap.put("checkPoint", s); + aOneMap.put("project", "A1(" + "Ιᵣ₁ᵢ)"); + aOneMap.put("unit", e.getUnit()); + aOneMap.put("oneValue", e.getAOneValueOne()); + aOneMap.put("twoValue", e.getAOneValueTwo()); + aOneMap.put("threeValue", e.getAOneValueThree()); + aOneMap.put("fourValue", e.getAOneValueFour()); + aOneMap.put("fiveValue", e.getAOneValueFive()); + aOneMap.put("sixValue", e.getAOneValueSix()); + mapReplace(aOneMap); + return aOneMap; + }).collect(Collectors.toList()); repList.add(aOneList.get(0)); //B1 - List> bOneList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map bOneMap = new HashMap<>(); - bOneMap.put("checkPoint", s); - bOneMap.put("project", "B1(" + "Ιᵣ₁ᵢ)"); - bOneMap.put("unit", e.getUnit()); - bOneMap.put("oneValue", e.getBOneValueOne()); - bOneMap.put("twoValue", e.getBOneValueTwo()); - bOneMap.put("threeValue", e.getBOneValueThree()); - bOneMap.put("fourValue", e.getBOneValueFour()); - bOneMap.put("fiveValue", e.getBOneValueFive()); - bOneMap.put("sixValue", e.getBOneValueSix()); - return bOneMap; - }).collect(Collectors.toList()); + List> bOneList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map bOneMap = new HashMap<>(); + bOneMap.put("checkPoint", s); + bOneMap.put("project", "B1(" + "Ιᵣ₁ᵢ)"); + bOneMap.put("unit", e.getUnit()); + bOneMap.put("oneValue", e.getBOneValueOne()); + bOneMap.put("twoValue", e.getBOneValueTwo()); + bOneMap.put("threeValue", e.getBOneValueThree()); + bOneMap.put("fourValue", e.getBOneValueFour()); + bOneMap.put("fiveValue", e.getBOneValueFive()); + bOneMap.put("sixValue", e.getBOneValueSix()); + mapReplace(bOneMap); + return bOneMap; + }).collect(Collectors.toList()); repList.add(bOneList.get(0)); //B2 - List> bTwoList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map bTwoMap = new HashMap<>(); - bTwoMap.put("checkPoint", s); - bTwoMap.put("project", "B2(" + "Ιᵣ₂ᵢ)"); - bTwoMap.put("unit", e.getUnit()); - bTwoMap.put("oneValue", e.getBTwoValueOne()); - bTwoMap.put("twoValue", e.getBTwoValueTwo()); - bTwoMap.put("threeValue", e.getBTwoValueThree()); - bTwoMap.put("fourValue", e.getBTwoValueFour()); - bTwoMap.put("fiveValue", e.getBTwoValueFive()); - bTwoMap.put("sixValue", e.getBTwoValueSix()); - return bTwoMap; - }).collect(Collectors.toList()); + List> bTwoList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map bTwoMap = new HashMap<>(); + bTwoMap.put("checkPoint", s); + bTwoMap.put("project", "B2(" + "Ιᵣ₂ᵢ)"); + bTwoMap.put("unit", e.getUnit()); + bTwoMap.put("oneValue", e.getBTwoValueOne()); + bTwoMap.put("twoValue", e.getBTwoValueTwo()); + bTwoMap.put("threeValue", e.getBTwoValueThree()); + bTwoMap.put("fourValue", e.getBTwoValueFour()); + bTwoMap.put("fiveValue", e.getBTwoValueFive()); + bTwoMap.put("sixValue", e.getBTwoValueSix()); + mapReplace(bTwoMap); + return bTwoMap; + }).collect(Collectors.toList()); repList.add(bTwoList.get(0)); //A2 - List> aTwoList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map aTwoMap = new HashMap<>(); - aTwoMap.put("checkPoint", s); - aTwoMap.put("project", "A2(" + "Ιᵣ₂ᵢ)"); - aTwoMap.put("unit", e.getUnit()); - aTwoMap.put("oneValue", e.getATwoValueOne()); - aTwoMap.put("twoValue", e.getATwoValueTwo()); - aTwoMap.put("threeValue", e.getATwoValueThree()); - aTwoMap.put("fourValue", e.getATwoValueFour()); - aTwoMap.put("fiveValue", e.getATwoValueFive()); - aTwoMap.put("sixValue", e.getATwoValueSix()); - return aTwoMap; - }).collect(Collectors.toList()); + List> aTwoList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map aTwoMap = new HashMap<>(); + aTwoMap.put("checkPoint", s); + aTwoMap.put("project", "A2(" + "Ιᵣ₂ᵢ)"); + aTwoMap.put("unit", e.getUnit()); + aTwoMap.put("oneValue", e.getATwoValueOne()); + aTwoMap.put("twoValue", e.getATwoValueTwo()); + aTwoMap.put("threeValue", e.getATwoValueThree()); + aTwoMap.put("fourValue", e.getATwoValueFour()); + aTwoMap.put("fiveValue", e.getATwoValueFive()); + aTwoMap.put("sixValue", e.getATwoValueSix()); + mapReplace(aTwoMap); + return aTwoMap; + }).collect(Collectors.toList()); repList.add(aTwoList.get(0)); //Δi - List> deltaIotaList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map deltaIotaMap = new HashMap<>(); - deltaIotaMap.put("checkPoint", s); - deltaIotaMap.put("project", "Δ" + "Ιᵢ"); - deltaIotaMap.put("unit", e.getUnit()); - deltaIotaMap.put("oneValue", e.getAverageValueOne()); - deltaIotaMap.put("twoValue", e.getAverageValueTwo()); - deltaIotaMap.put("threeValue", e.getAverageValueThree()); - deltaIotaMap.put("fourValue", e.getAverageValueFour()); - deltaIotaMap.put("fiveValue", e.getAverageValueFive()); - deltaIotaMap.put("sixValue", e.getAverageValueSix()); - return deltaIotaMap; - }).collect(Collectors.toList()); + List> deltaIotaList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map deltaIotaMap = new HashMap<>(); + deltaIotaMap.put("checkPoint", s); + deltaIotaMap.put("project", "Δ" + "Ιᵢ"); + deltaIotaMap.put("unit", e.getUnit()); + deltaIotaMap.put("oneValue", e.getAverageValueOne()); + deltaIotaMap.put("twoValue", e.getAverageValueTwo()); + deltaIotaMap.put("threeValue", e.getAverageValueThree()); + deltaIotaMap.put("fourValue", e.getAverageValueFour()); + deltaIotaMap.put("fiveValue", e.getAverageValueFive()); + deltaIotaMap.put("sixValue", e.getAverageValueSix()); + mapReplace(deltaIotaMap); + ; + return deltaIotaMap; + }).collect(Collectors.toList()); repList.add(deltaIotaList.get(0)); // Δj - List> deltajList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map deltajMap = new HashMap<>(); - deltajMap.put("checkPoint", s); - deltajMap.put("project", "Δ" + "Ιʲ"); - deltajMap.put("unit", e.getUnit()); - deltajMap.put("oneValue", e.getAverageValue()); - deltajMap.put("twoValue", e.getAverageValue()); - deltajMap.put("threeValue", e.getAverageValue()); - deltajMap.put("fourValue", e.getAverageValue()); - deltajMap.put("fiveValue", e.getAverageValue()); - deltajMap.put("sixValue", e.getAverageValue()); - return deltajMap; - }).collect(Collectors.toList()); + List> deltajList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map deltajMap = new HashMap<>(); + deltajMap.put("checkPoint", s); + deltajMap.put("project", "Δ" + "Ιʲ"); + deltajMap.put("unit", e.getUnit()); + deltajMap.put("oneValue", e.getAverageValue()); + deltajMap.put("twoValue", e.getAverageValue()); + deltajMap.put("threeValue", e.getAverageValue()); + deltajMap.put("fourValue", e.getAverageValue()); + deltajMap.put("fiveValue", e.getAverageValue()); + deltajMap.put("sixValue", e.getAverageValue()); + mapReplace(deltajMap); + ; + return deltajMap; + }).collect(Collectors.toList()); repList.add(deltajList.get(0)); //Sn - List> snList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map snMap = new HashMap<>(); - snMap.put("checkPoint", s); - snMap.put("project", "Sn"); - snMap.put("unit", e.getUnit()); - snMap.put("oneValue", e.getAverageValue()); - snMap.put("twoValue", e.getAverageValue()); - snMap.put("threeValue", e.getAverageValue()); - snMap.put("fourValue", e.getAverageValue()); - snMap.put("fiveValue", e.getAverageValue()); - snMap.put("sixValue", e.getAverageValue()); - return snMap; - }).collect(Collectors.toList()); + List> snList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map snMap = new HashMap<>(); + snMap.put("checkPoint", s); + snMap.put("project", "Sn"); + snMap.put("unit", e.getUnit()); + snMap.put("oneValue", e.getAverageValue()); + snMap.put("twoValue", e.getAverageValue()); + snMap.put("threeValue", e.getAverageValue()); + snMap.put("fourValue", e.getAverageValue()); + snMap.put("fiveValue", e.getAverageValue()); + snMap.put("sixValue", e.getAverageValue()); + mapReplace(snMap); + return snMap; + }).collect(Collectors.toList()); repList.add(snList.get(0)); map.put("repList", repList); } - List staList = eTwoList - .stream().filter(e -> STABILITY.equals(e.getCheckType()) - && (StringUtils.isNotEmpty(e.getTestValueOneDate()) - || StringUtils.isNotEmpty(e.getTestValueTwoDate()) - || StringUtils.isNotEmpty(e.getTestValueThreeDate()) - || StringUtils.isNotEmpty(e.getTestValueFourDate()) - || StringUtils.isNotEmpty(e.getTestValueFiveDate()) - || StringUtils.isNotEmpty(e.getTestValueSixDate())) - ).collect(Collectors.toList()); + List staList = eTwoList.stream().filter(e -> STABILITY.equals(e.getCheckType()) && (StringUtils.isNotEmpty(e.getTestValueOneDate()) || StringUtils.isNotEmpty(e.getTestValueTwoDate()) || StringUtils.isNotEmpty(e.getTestValueThreeDate()) || StringUtils.isNotEmpty(e.getTestValueFourDate()) || StringUtils.isNotEmpty(e.getTestValueFiveDate()) || StringUtils.isNotEmpty(e.getTestValueSixDate()))).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(staList)) { statisticalDate(staList, STA_PREFIX, map); List repMapList = new ArrayList<>(); for (BizEquipmentStandardCheckDataETwo sta : staList) { Map repMap = BeanUtil.beanToMap(sta); - repMap.put("lessThan", ObjectUtils.isEmpty(sta.getLessThan()) || 0 == sta.getLessThan() ? "否" : "是"); + mapReplace(repMap); + if (sta.getLessThan() != null) { + repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); + } else { + repMap.put("lessThan", ""); + } repMapList.add(repMap); } map.put("staList", repMapList); @@ -269,17 +258,14 @@ return; } BizEquipmentStandardCheckDataETwo dataCalibrator = sta.get(0); - map.put(strListParam + DATE_PREFIX + 1, dataCalibrator.getTestValueOneDate()); - map.put(strListParam + DATE_PREFIX + 2, dataCalibrator.getTestValueTwoDate()); - map.put(strListParam + DATE_PREFIX + 3, dataCalibrator.getTestValueThreeDate()); - map.put(strListParam + DATE_PREFIX + 4, dataCalibrator.getTestValueFourDate()); - map.put(strListParam + DATE_PREFIX + 5, dataCalibrator.getTestValueFiveDate()); - map.put(strListParam + DATE_PREFIX + 6, dataCalibrator.getTestValueSixDate()); + map.put(strListParam + DATE_PREFIX + 1, StringUtils.isNotBlank(dataCalibrator.getTestValueOneDate()) ? dataCalibrator.getTestValueOneDate() : "/"); + map.put(strListParam + DATE_PREFIX + 2, StringUtils.isNotBlank(dataCalibrator.getTestValueTwoDate()) ? dataCalibrator.getTestValueTwoDate() : "/"); + map.put(strListParam + DATE_PREFIX + 3, StringUtils.isNotBlank(dataCalibrator.getTestValueThreeDate()) ? dataCalibrator.getTestValueThreeDate() : "/"); + map.put(strListParam + DATE_PREFIX + 4, StringUtils.isNotBlank(dataCalibrator.getTestValueFourDate()) ? dataCalibrator.getTestValueFourDate() : "/"); + map.put(strListParam + DATE_PREFIX + 5, StringUtils.isNotBlank(dataCalibrator.getTestValueFiveDate()) ? dataCalibrator.getTestValueFiveDate() : "/"); + map.put(strListParam + DATE_PREFIX + 6, StringUtils.isNotBlank(dataCalibrator.getTestValueSixDate()) ? dataCalibrator.getTestValueSixDate() : "/"); } -// private List> convertToListMap(String checkPoint, List eTwoList) { -// -// } @Override public List doCreateOriginalFile(BizBusinessDeviceMeasureApproval request) { @@ -301,7 +287,7 @@ equipmentList = new ArrayList<>(); equipmentList.add(new MeasureEquipmentInfoDTO()); } - map.put("actualDivisionValue", request.getActualDivisionValue()); + map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); //准备填充参数 prepareParams(map, request.getMeasureDataETwoList()); @@ -338,81 +324,95 @@ //重复性 List repPtOneList = eTwoList.stream() - .filter(e -> "1".equals(e.getDataType()) - && REPEATABILITY.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtOne())) + .filter(e -> "1".equals(e.getDataType()) && REPEATABILITY.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtOne())) .collect(Collectors.toList()); + getEquipment(equipmentList, repPtOneList); List repPtTwoList = eTwoList.stream() - .filter(e -> "1".equals(e.getDataType()) - && REPEATABILITY.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtTwo())) + .filter(e -> "1".equals(e.getDataType()) && REPEATABILITY.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtTwo())) .collect(Collectors.toList()); getEquipment(equipmentList, repPtTwoList); - map.put("repPtOneList", repPtOneList); + List> repOneMapList = repPtOneList.stream().map(e -> { + Map objectMap = BeanUtil.beanToMap(e); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("repPtOneList", repOneMapList); map.put("repPtOne", repPtOneList.get(0).getPtOne()); map.put("repPtOneaManufactureNo", repPtOneList.get(0).getAManufactureNo()); map.put("repPtOnebManufactureNo", repPtOneList.get(0).getBManufactureNo()); - map.put("repPtTwoList", repPtTwoList); + List> repTwoMapList = repPtTwoList.stream().map(e -> { + Map objectMap = BeanUtil.beanToMap(e); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("repPtTwoList", repTwoMapList); map.put("repPtTwo", repPtTwoList.get(0).getPtTwo()); map.put("repPtTwoaManufactureNo", repPtTwoList.get(0).getAManufactureNo()); map.put("repPtTwobManufactureNo", repPtTwoList.get(0).getBManufactureNo()); //偏载误差 - List loadPtOneList = eTwoList.stream() - .filter(e -> "2".equals(e.getDataType()) - && OFFSET_LOAD_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtOne())) - .collect(Collectors.toList()); + List loadPtOneList = eTwoList.stream().filter(e -> "2".equals(e.getDataType()) && OFFSET_LOAD_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtOne())).collect(Collectors.toList()); getEquipment(equipmentList, loadPtOneList); - List loadPtTwoList = eTwoList.stream() - .filter(e -> "2".equals(e.getDataType()) - && OFFSET_LOAD_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtTwo())) - .collect(Collectors.toList()); + List loadPtTwoList = eTwoList.stream().filter(e -> "2".equals(e.getDataType()) && OFFSET_LOAD_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtTwo())).collect(Collectors.toList()); getEquipment(equipmentList, loadPtTwoList); - map.put("loadPtOneList", loadPtOneList); + List> loadOneMapList = loadPtOneList.stream().map(e -> { + Map objectMap = BeanUtil.beanToMap(e); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("loadPtOneList", loadOneMapList); map.put("loadPtOne", loadPtOneList.get(0).getPtOne()); map.put("loadPtOneaManufactureNo", loadPtOneList.get(0).getAManufactureNo()); map.put("loadPtOnebManufactureNo", loadPtOneList.get(0).getBManufactureNo()); - map.put("loadPtTwoList", loadPtTwoList); + List> loadTwoMapList = loadPtTwoList.stream().map(e -> { + Map objectMap = BeanUtil.beanToMap(e); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("loadPtTwoList", loadTwoMapList); map.put("loadPtTwo", loadPtTwoList.get(0).getPtTwo()); map.put("loadPtTwoaManufactureNo", loadPtTwoList.get(0).getAManufactureNo()); map.put("loadPtTwobManufactureNo", loadPtTwoList.get(0).getBManufactureNo()); //局部示值误差 - List errorPtOneList = eTwoList.stream() - .filter(e -> "3".equals(e.getDataType()) - && LOCAL_INDICATION_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtOne())) - .collect(Collectors.toList()); + List errorPtOneList = eTwoList.stream().filter(e -> "3".equals(e.getDataType()) && LOCAL_INDICATION_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtOne())).collect(Collectors.toList()); getEquipment(equipmentList, errorPtOneList); - List errorPtTwoList = eTwoList.stream() - .filter(e -> "3".equals(e.getDataType()) - && LOCAL_INDICATION_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtTwo())) - .collect(Collectors.toList()); + List errorPtTwoList = eTwoList.stream().filter(e -> "3".equals(e.getDataType()) && LOCAL_INDICATION_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtTwo())).collect(Collectors.toList()); getEquipment(equipmentList, errorPtTwoList); - map.put("errorPtOneList", errorPtOneList); + + List> errorOneMapList = errorPtOneList.stream().map(e -> { + Map objectMap = BeanUtil.beanToMap(e); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("errorPtOneList", errorOneMapList); map.put("errorPtOne", errorPtOneList.get(0).getPtOne()); map.put("errorPtOneaManufactureNo", errorPtOneList.get(0).getAManufactureNo()); - map.put("errorPtOnemSValue", errorPtOneList.get(0).getMSValue()); - map.put("errorPtOnempesValue", errorPtOneList.get(0).getMpesValue()); - map.put("errorPtTwoList", errorPtTwoList); + map.put("errorPtOnemSValue", StringUtils.isNotBlank(errorPtOneList.get(0).getMSValue()) ? errorPtOneList.get(0).getMSValue() + "mg" : "/"); + map.put("errorPtOnempesValue", StringUtils.isNotBlank(errorPtOneList.get(0).getMpesValue()) ? errorPtOneList.get(0).getMpesValue() + "mg" : "/"); + + List> errorTwoMapList = errorPtTwoList.stream().map(e -> { + Map objectMap = BeanUtil.beanToMap(e); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("errorPtTwoList", errorTwoMapList); map.put("errorPtTwo", errorPtTwoList.get(0).getPtTwo()); map.put("errorPtTwoaManufactureNo", errorPtTwoList.get(0).getAManufactureNo()); - map.put("errorPtTwomSValue", errorPtTwoList.get(0).getMSValue()); - map.put("errorPtTwompesValue", errorPtTwoList.get(0).getMpesValue()); + map.put("errorPtTwomSValue", StringUtils.isNotBlank(errorPtTwoList.get(0).getMSValue()) ? errorPtTwoList.get(0).getMSValue() + "mg" : "/"); + map.put("errorPtTwompesValue", StringUtils.isNotBlank(errorPtTwoList.get(0).getMpesValue()) ? errorPtTwoList.get(0).getMpesValue() + "mg" : "/"); map.put("equipmentList", equipmentList); + mapReplace(map); } private void getEquipment(List> equipmentList, List list) throws Exception { @@ -432,9 +432,9 @@ aMap.put("uncertainty", aTarget.getUncertainty()); } aMap.put("equipmentType", "标准砝码"); - aMap.put("deviceNumber", list.get(0).getADeviceNumber()); - aMap.put("nominalQualityValue", list.get(0).getANominalQualityValue() + "g"); - aMap.put("convertQualityCorrectValue", list.get(0).getAConvertQualityCorrectValue() + "mg"); + aMap.put("deviceNumber", StringUtils.isNotBlank(list.get(0).getADeviceNumber()) ? list.get(0).getADeviceNumber() : "/"); + aMap.put("nominalQualityValue", StringUtils.isNotBlank(list.get(0).getANominalQualityValue()) ? list.get(0).getANominalQualityValue() + "g" : "/"); + aMap.put("convertQualityCorrectValue", StringUtils.isNotBlank(list.get(0).getAConvertQualityCorrectValue()) ? list.get(0).getAConvertQualityCorrectValue() + "mg" : "/"); aMap.put("remark", "/"); Map bMap = new HashMap<>(); @@ -449,9 +449,9 @@ aMap.put("uncertainty", bTarget.getUncertainty()); } bMap.put("equipmentType", "标准砝码"); - bMap.put("deviceNumber", list.get(0).getBDeviceNumber()); - bMap.put("nominalQualityValue", list.get(0).getBNominalQualityValue() + "g"); - bMap.put("convertQualityCorrectValue", list.get(0).getBConvertQualityCorrectValue() + "mg"); + bMap.put("deviceNumber", StringUtils.isNotBlank(list.get(0).getBDeviceNumber()) ? list.get(0).getBDeviceNumber() : "/"); + bMap.put("nominalQualityValue", StringUtils.isNotBlank(list.get(0).getBNominalQualityValue()) ? list.get(0).getBNominalQualityValue() + "g" : "/"); + bMap.put("convertQualityCorrectValue", StringUtils.isNotBlank(list.get(0).getBConvertQualityCorrectValue()) ? list.get(0).getBConvertQualityCorrectValue() + "mg" : "/"); bMap.put("remark", "/"); equipmentList.add(aMap); @@ -469,9 +469,9 @@ aMap.put("uncertainty", aTarget.getUncertainty()); } aMap.put("equipmentType", "标准砝码"); - aMap.put("deviceNumber", list.get(0).getADeviceNumber()); - aMap.put("nominalQualityValue", list.get(0).getANominalQualityValue() + "g"); - aMap.put("convertQualityCorrectValue", list.get(0).getAConvertQualityCorrectValue() + "mg"); + aMap.put("deviceNumber", StringUtils.isNotBlank(list.get(0).getADeviceNumber()) ? list.get(0).getADeviceNumber() : "/"); + aMap.put("nominalQualityValue", StringUtils.isNotBlank(list.get(0).getANominalQualityValue()) ? list.get(0).getANominalQualityValue() + "g" : "/"); + aMap.put("convertQualityCorrectValue", StringUtils.isNotBlank(list.get(0).getAConvertQualityCorrectValue()) ? list.get(0).getAConvertQualityCorrectValue() + "mg" : "/"); aMap.put("remark", "/"); equipmentList.add(aMap); } @@ -495,6 +495,7 @@ DictCodeUtils.convertDictCodeToName(request); request.setActualDivisionValue(request.getActualDivisionValue() + request.getActualDivisionValueUnit()); Map map = BeanUtil.beanToMap(request); + mapReplace(map); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); if (CollectionUtils.isEmpty(equipmentList)) { @@ -504,7 +505,7 @@ map.put("equipmentList", equipmentList); prepareCertificateParams(map, request.getMeasureDataETwoList()); - prepareParams(map, request.getMeasureDataETwoList()); +// prepareParams(map, request.getMeasureDataETwoList()); prepareCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); @@ -532,64 +533,64 @@ private void prepareCertificateParams(Map map, List eTwoList) { //重复性PtOne - List repPtOneList = eTwoList.stream() - .filter(e -> "1".equals(e.getDataType()) - && REPEATABILITY.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtOne())) - .collect(Collectors.toList()); + List repPtOneList = eTwoList.stream().filter(e -> "1".equals(e.getDataType()) && REPEATABILITY.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtOne())).collect(Collectors.toList()); //重复性PtTwo - List repPtTwoList = eTwoList.stream() - .filter(e -> "1".equals(e.getDataType()) - && REPEATABILITY.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtTwo())) - .collect(Collectors.toList()); + List repPtTwoList = eTwoList.stream().filter(e -> "1".equals(e.getDataType()) && REPEATABILITY.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtTwo())).collect(Collectors.toList()); + BizBusinessDeviceMeasureDataETwo repOne = repPtOneList.get(0); repOne.setPtOne(repOne.getPtOne() + repOne.getPtOneUnit()); + repOne.setSValue(StringUtils.isNotBlank(repOne.getSValue()) ? repOne.getSValue() + "mg" : "/"); + repOne.setURValue(StringUtils.isNotBlank(repOne.getURValue()) ? repOne.getURValue() + "mg" : "/"); + Map repOneMap = BeanUtil.beanToMap(repOne); + mapReplace(repOneMap); + map.put("repOne", repOneMap); - map.put("repOne", repOne); BizBusinessDeviceMeasureDataETwo repTwo = repPtTwoList.get(0); repTwo.setPtTwo(repTwo.getPtTwo() + repTwo.getPtTwoUnit()); - - map.put("repTwo", repTwo); + repTwo.setSValue(StringUtils.isNotBlank(repTwo.getSValue()) ? repTwo.getSValue() + "mg" : "/"); + repTwo.setURValue(StringUtils.isNotBlank(repTwo.getURValue()) ? repTwo.getURValue() + "mg" : "/"); + Map repTwoMap = BeanUtil.beanToMap(repTwo); + mapReplace(repTwoMap); + map.put("repTwo", repTwoMap); //偏载误差PtOne - List loadPtOneList = eTwoList.stream() - .filter(e -> "2".equals(e.getDataType()) - && OFFSET_LOAD_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtOne())) - .collect(Collectors.toList()); + List loadPtOneList = eTwoList.stream().filter(e -> "2".equals(e.getDataType()) && OFFSET_LOAD_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtOne())).collect(Collectors.toList()); //偏载误差PtTwo - List loadPtTwoList = eTwoList.stream() - .filter(e -> "2".equals(e.getDataType()) - && OFFSET_LOAD_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtTwo())) - .collect(Collectors.toList()); + List loadPtTwoList = eTwoList.stream().filter(e -> "2".equals(e.getDataType()) && OFFSET_LOAD_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtTwo())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataETwo loadOne = loadPtOneList.get(0); loadOne.setPtOne(loadOne.getPtOne() + loadOne.getPtOneUnit()); - map.put("loadOne", loadOne); + loadOne.setSValue(StringUtils.isNotBlank(loadOne.getSValue()) ? loadOne.getSValue() + "mg" : "/"); + loadOne.setURValue(StringUtils.isNotBlank(loadOne.getURValue()) ? loadOne.getURValue() + "mg" : "/"); + Map loadOneMap = BeanUtil.beanToMap(loadOne); + mapReplace(loadOneMap); + map.put("loadOne", loadOneMap); BizBusinessDeviceMeasureDataETwo loadTwo = loadPtTwoList.get(0); loadTwo.setPtTwo(loadTwo.getPtTwo() + loadTwo.getPtTwoUnit()); - map.put("loadTwo", loadTwo); + loadTwo.setSValue(StringUtils.isNotBlank(loadTwo.getSValue()) ? loadTwo.getSValue() + "mg" : "/"); + loadTwo.setURValue(StringUtils.isNotBlank(loadTwo.getURValue()) ? loadTwo.getURValue() + "mg" : "/"); + Map loadTwoMap = BeanUtil.beanToMap(loadTwo); + mapReplace(loadTwoMap); + map.put("loadTwo", loadTwoMap); //局部示值误差PtOne - List errorPtOneList = eTwoList.stream() - .filter(e -> "3".equals(e.getDataType()) - && LOCAL_INDICATION_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtOne())) - .collect(Collectors.toList()); + List errorPtOneList = eTwoList.stream().filter(e -> "3".equals(e.getDataType()) && LOCAL_INDICATION_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtOne())).collect(Collectors.toList()); //局部示值误差PtTwo - List errorPtTwoList = eTwoList.stream() - .filter(e -> "3".equals(e.getDataType()) - && LOCAL_INDICATION_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtTwo())) - .collect(Collectors.toList()); + List errorPtTwoList = eTwoList.stream().filter(e -> "3".equals(e.getDataType()) && LOCAL_INDICATION_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtTwo())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataETwo errorOne = errorPtOneList.get(0); errorOne.setPtOne(errorOne.getPtOne() + errorOne.getPtOneUnit()); - map.put("errorOne", errorOne); + errorOne.setSValue(StringUtils.isNotBlank(errorOne.getSValue()) ? errorOne.getSValue() + "mg" : "/"); + errorOne.setURValue(StringUtils.isNotBlank(errorOne.getURValue()) ? errorOne.getURValue() + "mg" : "/"); + Map errorOneMap = BeanUtil.beanToMap(errorOne); + mapReplace(errorOneMap); + map.put("errorOne", errorOneMap); BizBusinessDeviceMeasureDataETwo errorTwo = errorPtTwoList.get(0); errorTwo.setPtTwo(errorTwo.getPtTwo() + errorTwo.getPtTwoUnit()); - map.put("errorTwo", errorTwo); + errorTwo.setSValue(StringUtils.isNotBlank(errorTwo.getSValue()) ? errorTwo.getSValue() + "mg" : "/"); + errorTwo.setURValue(StringUtils.isNotBlank(errorTwo.getURValue()) ? errorTwo.getURValue() + "mg" : "/"); + Map errorTwoMap = BeanUtil.beanToMap(errorTwo); + mapReplace(errorTwoMap); + map.put("errorTwo", errorTwoMap); } /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java index e106828..fb70360 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java @@ -28,6 +28,7 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; +import reactor.core.publisher.Mono; import java.text.SimpleDateFormat; import java.util.*; @@ -56,6 +57,7 @@ return null; } Map map = BeanUtil.beanToMap(request); + mapReplace(map); String[] pointStr = {DC_VOLTAGE, RESISTANCE_MEASUREMENT}; //重复性、稳定性 final String[] checkTypes = {REPEATABILITY, STABILITY}; @@ -70,6 +72,7 @@ List repMapList = new ArrayList<>(); for (BizEquipmentStandardCheckDataElectricalSafety rep : repList) { Map repMap = BeanUtil.beanToMap(rep); + mapReplace(repMap); repMapList.add(repMap); } map.put(REPEAT_PREFIX + (i + 1), repMapList); @@ -90,12 +93,13 @@ List repMapList = new ArrayList<>(); for (BizEquipmentStandardCheckDataElectricalSafety sta : staList) { Map repMap = BeanUtil.beanToMap(sta); + mapReplace(repMap); repMap.put("lessThan", ObjectUtils.isEmpty(sta.getLessThan()) || 0 == sta.getLessThan() ? "否" : "是"); repMapList.add(repMap); } map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF0A3"); map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF0A3"); - if (1==staList.get(0).getQualified()) { + if (1 == staList.get(0).getQualified()) { map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF052"); } else { map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF052"); @@ -114,7 +118,7 @@ urlList.add((String) map.get("pdfUrl")); } return urlList; - }catch (Exception ex){ + } catch (Exception ex) { log.info("-----package data is exception， this is {}", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } @@ -133,16 +137,16 @@ return; } BizEquipmentStandardCheckDataElectricalSafety dataCalibrator = sta.get(0); - map.put(strListParam + DATE_PREFIX + 1, dataCalibrator.getTestValueOneDate()); - map.put(strListParam + DATE_PREFIX + 2, dataCalibrator.getTestValueTwoDate()); - map.put(strListParam + DATE_PREFIX + 3, dataCalibrator.getTestValueThreeDate()); - map.put(strListParam + DATE_PREFIX + 4, dataCalibrator.getTestValueFourDate()); - map.put(strListParam + DATE_PREFIX + 5, dataCalibrator.getTestValueFiveDate()); - map.put(strListParam + DATE_PREFIX + 6, dataCalibrator.getTestValueSixDate()); + map.put(strListParam + DATE_PREFIX + 1, StringUtils.isNotBlank(dataCalibrator.getTestValueOneDate()) ? dataCalibrator.getTestValueOneDate() : "/"); + map.put(strListParam + DATE_PREFIX + 2, StringUtils.isNotBlank(dataCalibrator.getTestValueTwoDate()) ? dataCalibrator.getTestValueTwoDate() : "/"); + map.put(strListParam + DATE_PREFIX + 3, StringUtils.isNotBlank(dataCalibrator.getTestValueThreeDate()) ? dataCalibrator.getTestValueThreeDate() : "/"); + map.put(strListParam + DATE_PREFIX + 4, StringUtils.isNotBlank(dataCalibrator.getTestValueFourDate()) ? dataCalibrator.getTestValueFourDate() : "/"); + map.put(strListParam + DATE_PREFIX + 5, StringUtils.isNotBlank(dataCalibrator.getTestValueFiveDate()) ? dataCalibrator.getTestValueFiveDate() : "/"); + map.put(strListParam + DATE_PREFIX + 6, StringUtils.isNotBlank(dataCalibrator.getTestValueSixDate()) ? dataCalibrator.getTestValueSixDate() : "/"); } @Override - public List doCreateOriginalFile(BizBusinessDeviceMeasureApproval request) { + public List doCreateOriginalFile(BizBusinessDeviceMeasureApproval request) { try { if (ObjectUtils.isEmpty(request)) { return null; @@ -154,7 +158,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - + mapReplace(map); BizBusinessDeviceMeasureEquipmentMapper equipmentMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureEquipmentMapper.class); List equipmentList = equipmentMapper.selectEquipmentListByDataId(request.getDataId()); if (CollectionUtils.isEmpty(equipmentList)) { @@ -194,15 +198,24 @@ } } + + private void prepareParams(List electricalSafetyList, Map map) { - List voltageList = electricalSafetyList.stream() - .filter(e -> "1".equals(e.getDataType())).collect(Collectors.toList()); + List> voltageList = electricalSafetyList.stream() + .filter(e -> "1".equals(e.getDataType())).map(BeanUtil::beanToMap).collect(Collectors.toList()); List indicationErrorList = electricalSafetyList.stream() .filter(e -> "2".equals(e.getDataType())).collect(Collectors.toList()); doCustomParam(indicationErrorList); + List> errorList = indicationErrorList.stream().map(BeanUtil::beanToMap).collect(Collectors.toList()); + for (Map stringObjectMap : errorList) { + mapReplace(stringObjectMap); + } + for (Map stringObjectMap : voltageList) { + mapReplace(stringObjectMap); + } map.put("voltageList", voltageList); - map.put("errorList", indicationErrorList); + map.put("errorList", errorList); } /** @@ -257,13 +270,6 @@ log.debug("该报告没有证书报告"); return null; } - if (CollectionUtils.isEmpty(request.getMeasureDataElectricalSafetyList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataElectricalSafety()); - request.setMeasureDataElectricalSafetyList(list); - } - - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); @@ -274,17 +280,15 @@ equipmentList.add(new MeasureEquipmentInfoDTO()); } map.put("equipmentList", equipmentList); - prepareCustomCoverParams(map, request.getMeasureDataElectricalSafetyList()); - List electricalSafetyList = request.getMeasureDataElectricalSafetyList(); - List voltageList = electricalSafetyList.stream() - .filter(e -> "1".equals(e.getDataType())).collect(Collectors.toList()); - List indicationErrorList = electricalSafetyList.stream() - .filter(e -> "2".equals(e.getDataType())).collect(Collectors.toList()); - map.put("voltageList", voltageList); - map.put("errorList", indicationErrorList); + prepareCustomCoverParams(map, request.getMeasureDataElectricalSafetyList()); + + List electricalSafetyList = request.getMeasureDataElectricalSafetyList(); + //填充参数 + prepareParams(electricalSafetyList, map); //准备封面参数 prepareCoverParams(map, request.getLabCode()); + List customTemplateUrls = new ArrayList<>(); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); log.debug("--------get Certificate template is ...."); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ResistanceThermometerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ResistanceThermometerHandler.java index 65486a6..577caf3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ResistanceThermometerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ResistanceThermometerHandler.java @@ -61,7 +61,10 @@ DictCodeUtils.convertDictCodeToName(bizEquipmentInfo); } Map map = BeanUtil.beanToMap(request); - + if (ObjectUtil.isEmpty(map.get("technologyFile"))){ + map.put("technologyFile","无"); + } + mapReplace(map); List thermometerList = request.getCheckDataResistanceThermometerList(); if (CollectionUtils.isEmpty(thermometerList)) { return null; @@ -69,13 +72,19 @@ //最低和最高温度点重复性 TreeMap> repTreeMap = thermometerList.stream() - .filter(t -> TEMPERATURE.equals(t.getParams()) && REPEATABILITY.equals(t.getCheckType())) - .collect(Collectors.groupingBy(BizEquipmentStandardCheckDataResistanceThermometer::getCheckPoint, + .filter(t -> TEMPERATURE.equals(t.getParams()) + && REPEATABILITY.equals(t.getCheckType())) + .collect(Collectors.groupingBy( + BizEquipmentStandardCheckDataResistanceThermometer::getCheckPoint, () -> new TreeMap<>(getComparator()), Collectors.toList())); - map.put("lowerRep", repTreeMap.get(repTreeMap.firstKey()).get(0)); - map.put("upperRep", repTreeMap.get(repTreeMap.lastKey()).get(0)); + Map lowerRepMap = BeanUtil.beanToMap(repTreeMap.get(repTreeMap.firstKey()).get(0)); + mapReplace(lowerRepMap); + map.put("lowerRep", lowerRepMap); + Map upperRepMap = BeanUtil.beanToMap(repTreeMap.get(repTreeMap.lastKey()).get(0)); + mapReplace(upperRepMap); + map.put("upperRep", upperRepMap); //最低和最高温度点稳定性 TreeMap> staTreeMap = thermometerList.stream() .filter(t -> TEMPERATURE.equals(t.getParams()) && STABILITY.equals(t.getCheckType())) @@ -85,35 +94,48 @@ List lowerStaList = staTreeMap.get(staTreeMap.firstKey()); BizEquipmentStandardCheckDataResistanceThermometer lowerSta = lowerStaList.get(0); + Map lowerStaMap = BeanUtil.beanToMap(lowerSta); + mapReplace(lowerStaMap); if (lowerSta.getLessThan() == null) { - lowerSta.setConclusion(""); + lowerStaMap.put("conclusion", ""); } else { - lowerSta.setConclusion(lowerSta.getLessThan() == 0 ? "否" : "是"); + lowerStaMap.put("conclusion", lowerSta.getLessThan() == 0 ? "否" : "是"); } - map.put("lowerSta", lowerSta); + map.put("lowerSta", lowerStaMap); List upperStaList = staTreeMap.get(staTreeMap.lastKey()); BizEquipmentStandardCheckDataResistanceThermometer upperSta = upperStaList.get(0); + Map upperStaMap = BeanUtil.beanToMap(upperSta); + mapReplace(upperStaMap); if (upperSta.getLessThan() == null) { - upperSta.setConclusion(""); + upperStaMap.put("conclusion", ""); } else { - upperSta.setConclusion(upperSta.getLessThan() == 0 ? "否" : "是"); + upperStaMap.put("conclusion", lowerSta.getLessThan() == 0 ? "否" : "是"); } - map.put("upperSta", upperSta); + map.put("upperSta", upperStaMap); //RTP值重复性 List rtpRepList = thermometerList.stream() .filter(t -> RTP.equals(t.getParams()) && REPEATABILITY.equals(t.getCheckType())) .collect(Collectors.toList()); - map.put("RTPRep", rtpRepList.get(0)); + Map rtpRepMap = BeanUtil.beanToMap(rtpRepList.get(0)); + mapReplace(rtpRepMap); + map.put("RTPRep", rtpRepMap); //RTP值稳定性 List rtpStaList = thermometerList.stream() .filter(t -> RTP.equals(t.getParams()) && STABILITY.equals(t.getCheckType())) .collect(Collectors.toList()); - map.put("RTPSta", rtpStaList.get(0)); + Map rtpStaMap = BeanUtil.beanToMap(rtpStaList.get(0)); + mapReplace(rtpStaMap); + map.put("RTPSta", rtpStaMap); //绝缘电阻表校准 - List resistanceList = thermometerList.stream() + List> resistanceList = thermometerList.stream() .filter(t -> INSULATION_RESISTANCE_METER_CALIBRATION.equals(t.getParams())) + .map(t -> { + Map objectMap = BeanUtil.beanToMap(t); + mapReplace(objectMap); + return objectMap; + }) .collect(Collectors.toList()); map.put("resistanceList", resistanceList); @@ -156,7 +178,7 @@ } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - + mapReplace(map); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); if (CollectionUtils.isEmpty(equipmentList)) { equipmentList = new ArrayList<>(); @@ -213,10 +235,13 @@ * @param map */ private void assembleBimetalThermometerParams(List resistanceThermometerList, Map map) { - resistanceThermometerList.forEach(r -> { - r.setStandardizerNo("/"); - }); - map.put("bimetalList", resistanceThermometerList); + List> bimetalList = resistanceThermometerList.stream().map(t -> { + Map objectMap = BeanUtil.beanToMap(t); + mapReplace(objectMap); + return objectMap; + }) + .collect(Collectors.toList()); + map.put("bimetalList", bimetalList); } /** @@ -233,6 +258,7 @@ List volMapList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataResistanceThermometer thermometer : volLowerList) { Map volMap = BeanUtil.beanToMap(thermometer); + mapReplace(volMap); volMapList.add(volMap); } @@ -241,12 +267,16 @@ List volUpperMapList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataResistanceThermometer thermometer : volUpperList) { Map volMap = BeanUtil.beanToMap(thermometer); + mapReplace(volMap); volUpperMapList.add(volMap); } - - map.put("volLower", volLowerList.get(0)); + Map volLower = BeanUtil.beanToMap(volLowerList.get(0)); + mapReplace(volLower); + map.put("volLower", volLower); map.put("volLowerList", volMapList); - map.put("volUpper", volUpperList.get(0)); + Map volUpper = BeanUtil.beanToMap(volUpperList.get(0)); + mapReplace(volUpper); + map.put("volUpper", volUpper); map.put("volUpperList", volUpperMapList); //最大波动性 @@ -261,33 +291,48 @@ } map.put("maxVolatility", maxVolatility); + //均匀性测试 TreeMap> uniformityTreeMap = resistanceThermometerList.stream().filter(t -> "2".equals(t.getDataType())).collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataResistanceThermometer::getUpperLowerPoint, TreeMap::new, Collectors.toList())); String uniFirstKey = uniformityTreeMap.firstKey(); List lowerList = uniformityTreeMap.get(uniFirstKey); - List uniLowerList = lowerList.stream().sorted(Comparator.comparing(BizBusinessDeviceMeasureDataResistanceThermometer::getLocation)).collect(Collectors.toList()); + + List uniLowerList = lowerList.stream() + .sorted(Comparator.comparing(BizBusinessDeviceMeasureDataResistanceThermometer::getLocation)) + .collect(Collectors.toList()); + List uniLowerMapList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataResistanceThermometer thermometer : uniLowerList) { Map uniMap = BeanUtil.beanToMap(thermometer); + mapReplace(uniMap); uniLowerMapList.add(uniMap); } String uniLastKey = uniformityTreeMap.lastKey(); List upperList = uniformityTreeMap.get(uniLastKey); - List uniUpperList = upperList.stream().sorted(Comparator.comparing(BizBusinessDeviceMeasureDataResistanceThermometer::getLocation)).collect(Collectors.toList()); + List uniUpperList = upperList.stream() + .sorted(Comparator.comparing(BizBusinessDeviceMeasureDataResistanceThermometer::getLocation)) + .collect(Collectors.toList()); + List uniUpperMapList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataResistanceThermometer thermometer : uniUpperList) { Map uniMap = BeanUtil.beanToMap(thermometer); + mapReplace(uniMap); uniUpperMapList.add(uniMap); } - map.put("uniLower", uniLowerList.get(0)); + Map uniLower = BeanUtil.beanToMap(uniLowerList.get(0)); + mapReplace(uniLower); + map.put("uniLower", uniLower); map.put("uniLowerList", uniLowerMapList); - map.put("uniUpper", uniUpperList.get(0)); + Map uniUpper = BeanUtil.beanToMap(uniUpperList.get(0)); + mapReplace(uniUpper); + map.put("uniUpper", uniUpper); map.put("uniUpperList", uniUpperMapList); List maxDifferentList = resistanceThermometerList.stream() .filter(t -> "2".equals(t.getDataType())) .map(BizBusinessDeviceMeasureDataResistanceThermometer::getMaxWorkTemperatureDifferent) .collect(Collectors.toList()); + String maxWorkTemperatureDifferent = null; if (!CollectionUtils.isEmpty(maxDifferentList)) { maxWorkTemperatureDifferent = maxDifferentList.get(0); @@ -304,25 +349,62 @@ * @param map */ private void assembleThermalTesistanceParams(List resistanceThermometerList, Map map) { - List toleranceLevelZeroList = resistanceThermometerList.stream().filter(t -> "1".equals(t.getDataCategory()) && NOMINAL_TEMPERATURE_ZERO.equals(t.getNominalTemperature())).collect(Collectors.toList()); + List toleranceLevelZeroList = resistanceThermometerList.stream() + .filter(t -> "1".equals(t.getDataCategory()) && NOMINAL_TEMPERATURE_ZERO.equals(t.getNominalTemperature())) + .collect(Collectors.toList()); - List toleranceLevelHundredList = resistanceThermometerList.stream().filter(t -> "1".equals(t.getDataCategory()) && NOMINAL_TEMPERATURE_HUNDRED.equals(t.getNominalTemperature())).collect(Collectors.toList()); + List toleranceLevelHundredList = resistanceThermometerList.stream() + .filter(t -> "1".equals(t.getDataCategory()) && NOMINAL_TEMPERATURE_HUNDRED.equals(t.getNominalTemperature())) + .collect(Collectors.toList()); - List rtZeroList = resistanceThermometerList.stream().filter(t -> "2".equals(t.getDataCategory()) && RT_ZERO.equals(t.getItem())).collect(Collectors.toList()); - List rtHundredList = resistanceThermometerList.stream().filter(t -> "2".equals(t.getDataCategory()) && RT_HUNDRED.equals(t.getItem())).collect(Collectors.toList()); - List alphaList = resistanceThermometerList.stream().filter(t -> "2".equals(t.getDataCategory()) && ALPHA.equals(t.getItem())).collect(Collectors.toList()); - List deltaZeroList = resistanceThermometerList.stream().filter(t -> "2".equals(t.getDataCategory()) && DELTA_ZERO.equals(t.getItem())).collect(Collectors.toList()); - List deltaHundredList = resistanceThermometerList.stream().filter(t -> "2".equals(t.getDataCategory()) && DELTA_HUNDRED.equals(t.getItem())).collect(Collectors.toList()); - List deltaAlphaList = resistanceThermometerList.stream().filter(t -> "2".equals(t.getDataCategory()) && DELTA_ALPHA.equals(t.getItem())).collect(Collectors.toList()); + List rtZeroList = resistanceThermometerList.stream() + .filter(t -> "2".equals(t.getDataCategory()) && RT_ZERO.equals(t.getItem())) + .collect(Collectors.toList()); - map.put("toleranceLevelZero", toleranceLevelZeroList.get(0)); - map.put("toleranceLevelHundred", toleranceLevelHundredList.get(0)); - map.put("rtZero", rtZeroList.get(0)); - map.put("rtHundred", rtHundredList.get(0)); - map.put("alpha", alphaList.get(0)); - map.put("deltaZero", deltaZeroList.get(0)); - map.put("deltaHundred", deltaHundredList.get(0)); - map.put("deltaAlpha", deltaAlphaList.get(0)); + List rtHundredList = resistanceThermometerList.stream() + .filter(t -> "2".equals(t.getDataCategory()) && RT_HUNDRED.equals(t.getItem())) + .collect(Collectors.toList()); + + List alphaList = resistanceThermometerList.stream() + .filter(t -> "2".equals(t.getDataCategory()) && ALPHA.equals(t.getItem())) + .collect(Collectors.toList()); + + List deltaZeroList = resistanceThermometerList.stream() + .filter(t -> "2".equals(t.getDataCategory()) && DELTA_ZERO.equals(t.getItem())) + .collect(Collectors.toList()); + + List deltaHundredList = resistanceThermometerList.stream() + .filter(t -> "2".equals(t.getDataCategory()) && DELTA_HUNDRED.equals(t.getItem())) + .collect(Collectors.toList()); + + List deltaAlphaList = resistanceThermometerList.stream() + .filter(t -> "2".equals(t.getDataCategory()) && DELTA_ALPHA.equals(t.getItem())) + .collect(Collectors.toList()); + + Map toleranceLevelZero = BeanUtil.beanToMap(toleranceLevelZeroList.get(0)); + mapReplace(toleranceLevelZero); + map.put("toleranceLevelZero", toleranceLevelZero); + Map toleranceLevelHundred = BeanUtil.beanToMap(toleranceLevelHundredList.get(0)); + mapReplace(toleranceLevelHundred); + map.put("toleranceLevelHundred", toleranceLevelHundred); + Map rtZero = BeanUtil.beanToMap(rtZeroList.get(0)); + mapReplace(rtZero); + map.put("rtZero", rtZero); + Map rtHundred = BeanUtil.beanToMap(rtHundredList.get(0)); + mapReplace(rtHundred); + map.put("rtHundred", rtHundred); + Map alpha = BeanUtil.beanToMap(alphaList.get(0)); + mapReplace(alpha); + map.put("alpha", alpha); + Map deltaZero = BeanUtil.beanToMap(deltaZeroList.get(0)); + mapReplace(deltaZero); + map.put("deltaZero", deltaZero); + Map deltaHundred = BeanUtil.beanToMap(deltaHundredList.get(0)); + mapReplace(deltaHundred); + map.put("deltaHundred", deltaHundred); + Map deltaAlpha = BeanUtil.beanToMap(deltaAlphaList.get(0)); + mapReplace(deltaAlpha); + map.put("deltaAlpha", deltaAlpha); } /** @@ -432,7 +514,12 @@ * @param map */ private void assembleBimetalThermometerCertificateParams(List thermometerList, Map map) { - map.put("bimtalResList", thermometerList); + List> bimtalResList = thermometerList.stream().map(t -> { + Map objectMap = BeanUtil.beanToMap(t); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("bimtalResList", bimtalResList); } /** @@ -442,21 +529,41 @@ * @param map */ private void assembleThermostaticBathCertificateParams(List thermometerList, Map map) { - List pointList = thermometerList.stream().map(BizBusinessDeviceMeasureDataResistanceThermometer::getUpperLowerPoint).sorted().distinct().collect(Collectors.toList()); - map.put("lowerPoint", pointList.get(0)); - map.put("upperPoint", pointList.get(1)); + List pointList = thermometerList.stream() + .map(BizBusinessDeviceMeasureDataResistanceThermometer::getUpperLowerPoint) + .sorted().distinct().collect(Collectors.toList()); + map.put("lowerPoint", StringUtils.isNotBlank(pointList.get(0)) ? pointList.get(0) : "/"); + map.put("upperPoint", StringUtils.isNotBlank(pointList.get(1)) ? pointList.get(1) : "/"); - List lowerVolatility = thermometerList.stream().filter(t -> pointList.get(0).equals(t.getUpperLowerPoint())).map(BizBusinessDeviceMeasureDataResistanceThermometer::getVolatility).sorted(Comparator.reverseOrder()).collect(Collectors.toList()); + List lowerVolatility = thermometerList.stream() + .filter(t -> pointList.get(0).equals(t.getUpperLowerPoint())) + .map(BizBusinessDeviceMeasureDataResistanceThermometer::getVolatility) + .sorted(Comparator.reverseOrder()) + .collect(Collectors.toList()); - List upperVolatility = thermometerList.stream().filter(t -> pointList.get(1).equals(t.getUpperLowerPoint())).map(BizBusinessDeviceMeasureDataResistanceThermometer::getVolatility).sorted(Comparator.reverseOrder()).collect(Collectors.toList()); + List upperVolatility = thermometerList.stream() + .filter(t -> pointList.get(1).equals(t.getUpperLowerPoint())) + .map(BizBusinessDeviceMeasureDataResistanceThermometer::getVolatility) + .sorted(Comparator.reverseOrder()).collect(Collectors.toList()); - map.put("lowerVolatility", lowerVolatility.get(0)); - map.put("upperVolatility", upperVolatility.get(0)); - List lowerMaxWork = thermometerList.stream().filter(t -> pointList.get(0).equals(t.getUpperLowerPoint())).map(BizBusinessDeviceMeasureDataResistanceThermometer::getMaxWorkTemperatureDifferent).sorted(Comparator.reverseOrder()).collect(Collectors.toList()); - List upperMaxWork = thermometerList.stream().filter(t -> pointList.get(1).equals(t.getUpperLowerPoint())).map(BizBusinessDeviceMeasureDataResistanceThermometer::getMaxWorkTemperatureDifferent).sorted(Comparator.reverseOrder()).collect(Collectors.toList()); - map.put("lowerMaxWork", lowerMaxWork.get(0)); - map.put("upperMaxWork", upperMaxWork.get(0)); + map.put("lowerVolatility", StringUtils.isNotBlank(lowerVolatility.get(0)) ? lowerVolatility.get(0) : "/"); + map.put("upperVolatility", StringUtils.isNotBlank(upperVolatility.get(0)) ? upperVolatility.get(0) : "/"); + + List lowerMaxWork = thermometerList.stream() + .filter(t -> pointList.get(0).equals(t.getUpperLowerPoint())) + .map(BizBusinessDeviceMeasureDataResistanceThermometer::getMaxWorkTemperatureDifferent) + .sorted(Comparator.reverseOrder()) + .collect(Collectors.toList()); + + List upperMaxWork = thermometerList.stream() + .filter(t -> pointList.get(1).equals(t.getUpperLowerPoint())) + .map(BizBusinessDeviceMeasureDataResistanceThermometer::getMaxWorkTemperatureDifferent) + .sorted(Comparator.reverseOrder()) + .collect(Collectors.toList()); + + map.put("lowerMaxWork", StringUtils.isNotBlank(lowerMaxWork.get(0)) ? lowerMaxWork.get(0) : "/"); + map.put("upperMaxWork", StringUtils.isNotBlank(upperMaxWork.get(0)) ? upperMaxWork.get(0) : "/"); } /** @@ -466,7 +573,14 @@ * @param map */ private void assembleThermalTesistanceCertificateParams(List thermometerList, Map map) { - List resultList = thermometerList.stream().filter(t -> "2".equals(t.getDataCategory())).collect(Collectors.toList()); + List> resultList = thermometerList.stream() + .filter(t -> "2".equals(t.getDataCategory())) + .map(t -> { + Map objectMap = BeanUtil.beanToMap(t); + mapReplace(objectMap); + return objectMap; + }) + .collect(Collectors.toList()); map.put("thermometerList", resultList); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 7422613..889a4e6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -15,6 +15,20 @@ public class StandardEquipmentSupport implements MeasureCategoryEnum { /** + * 替换map集合中的空值为斜杠/ + * @param map + */ + protected void mapReplace(Map map) { + List excludedKeys = Arrays.asList("approvalStatus", "processId", "createUserId", "createUserName", + "checkUserName", "approvalStatusName", "taskId", "decisionItem", "staffName","lessThan"); + map.forEach((k, v) -> { + if (!excludedKeys.contains(k) && org.springframework.util.ObjectUtils.isEmpty(v)) { + map.put(k, "/"); + } + }); + } + + /** * 填充固定的信息参数 */ protected void prepareCoverParams(Map map, String labCode) { 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 afc322a..bdd83db 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 @@ -16,6 +16,7 @@ import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo; import com.casic.missiles.model.equipment.BizEquipmentInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataDcPower; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataElectricalSafety; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentSupport; @@ -43,8 +44,6 @@ @Slf4j public class DcPowerSupplyHandler extends StandardEquipmentSupport implements PrintFileModuleNameEnum, StandardEquipmentPrint { - private final BizBusinessDeviceMeasureInfoMapper bizBusinessDeviceMeasureInfoMapper; - private final PrintFileRegister printFileRegister; private final BizBusinessDeviceMeasureEquipmentMapper bizBusinessDeviceMeasureEquipmentMapper; @@ -62,104 +61,9 @@ return null; } Map map = BeanUtil.beanToMap(request); - //划分为直流电压，电源效应和负载效应Power and load effects，直流电流（直接测量）Direct current (direct measurement)，直流电流（间接测量）Direct current (indirect measurement)，纹波电压Ripple Voltage - String[] pointStr = {DC_VOLTAGE, POWER_AND_LOAD_EFFECTS, DC_CURRENT_DIRECT_MEASUREMENT, DC_CURRENT_INDIRECT_MEASUREMENT}; - //稳定性、重复性 - final String[] checkTypes = {REPEATABILITY, STABILITY}; - List pointList = Arrays.asList(pointStr); + mapReplace(map); - for (int i = 0; i < pointList.size(); i++) { - String points = pointList.get(i); - //重复性 - List repList = request.getCheckDataDcPowerList() - .stream().filter(e -> points.equals(e.getCheckParam()) - && checkTypes[0].equals(e.getCheckType()) - && StringUtils.isEmpty(e.getTestValueFiveDate())).collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(repList)) { - List repMapList = new ArrayList<>(); - for (BizEquipmentStandardCheckDataDcPower rep : repList) { - Map repMap = BeanUtil.beanToMap(rep); - repMapList.add(repMap); - } - map.put(REPEAT_PREFIX + (i + 1), repMapList); - } - //稳定性 - List staList = request.getCheckDataDcPowerList() - .stream().filter(e -> points.equals(e.getCheckParam()) - && checkTypes[1].equals(e.getCheckType()) - && (StringUtils.isNotEmpty(e.getTestValueOneDate()) - || StringUtils.isNotEmpty(e.getTestValueTwoDate()) - || StringUtils.isNotEmpty(e.getTestValueThreeDate()) - || StringUtils.isNotEmpty(e.getTestValueFourDate()) - || StringUtils.isNotEmpty(e.getTestValueFiveDate()) - || StringUtils.isNotEmpty(e.getTestValueSixDate())) - ).collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(staList)) { - statisticalDate(staList, STA_PREFIX + (i + 1), map); - List repMapList = new ArrayList<>(); - for (BizEquipmentStandardCheckDataDcPower sta : staList) { - Map repMap = BeanUtil.beanToMap(sta); - if (sta.getLessThan() != null) { - repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); - }else { - repMap.put("lessThan",""); - } - repMapList.add(repMap); - } - map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF0A3"); - map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF0A3"); - if (1 == staList.get(0).getQualified()) { - map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF052"); - } else { - map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF052"); - } - map.put(STA_PREFIX + (i + 1), repMapList); - } - } - - List repList = request.getCheckDataDcPowerList().stream() - .filter(d -> RIPPLE_VOLTAGE.equals(d.getCheckParam()) - && checkTypes[0].equals(d.getCheckType())) - .collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(repList)) { - List repMapList = new ArrayList<>(); - for (BizEquipmentStandardCheckDataDcPower rep : repList) { - Map repMap = BeanUtil.beanToMap(rep); - repMapList.add(repMap); - } - map.put(REPEAT_PREFIX + 5, repMapList); - } - - List staList = request.getCheckDataDcPowerList().stream() - .filter(d -> RIPPLE_VOLTAGE.equals(d.getCheckParam()) - && checkTypes[1].equals(d.getCheckType()) - && (StringUtils.isNotEmpty(d.getTestValueOneDate()) - || StringUtils.isNotEmpty(d.getTestValueTwoDate()) - || StringUtils.isNotEmpty(d.getTestValueThreeDate()) - || StringUtils.isNotEmpty(d.getTestValueFourDate()) - || StringUtils.isNotEmpty(d.getTestValueFiveDate()) - || StringUtils.isNotEmpty(d.getTestValueSixDate()))).collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(staList)) { - statisticalDate(staList, STA_PREFIX + 5, map); - List repMapList = new ArrayList<>(); - for (BizEquipmentStandardCheckDataDcPower sta : staList) { - Map repMap = BeanUtil.beanToMap(sta); - if (sta.getLessThan() != null) { - repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); - }else { - repMap.put("lessThan",""); - } - repMapList.add(repMap); - } - map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF0A3"); - map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF0A3"); - if (1 == staList.get(0).getQualified()) { - map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF052"); - } else { - map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF052"); - } - map.put(STA_PREFIX + 5, repMapList); - } + prepareCheckParams(request, map); //除了选用的模板不一致，模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY_CHECK_DATA, "数据打印", null, map, false, null, null); @@ -177,6 +81,148 @@ } } + private void prepareCheckParams(BizEquipmentStandardCheckRecordApproval request, Map map) { + //划分为直流电压，电源效应和负载效应Power and load effects，直流电流（直接测量）Direct current (direct measurement)，直流电流（间接测量）Direct current (indirect measurement)，纹波电压Ripple Voltage + String[] pointStr = {DC_VOLTAGE, POWER_AND_LOAD_EFFECTS, DC_CURRENT_DIRECT_MEASUREMENT, DC_CURRENT_INDIRECT_MEASUREMENT}; + //稳定性、重复性 + final String[] checkTypes = {REPEATABILITY, STABILITY}; + List pointList = Arrays.asList(pointStr); + + Map numMap = new HashMap<>(); + numMap.put(1, 3); + numMap.put(2, 7); + numMap.put(3, 3); + numMap.put(4, 4); + numMap.put(5, 6); + + for (int i = 0; i < pointList.size(); i++) { + String points = pointList.get(i); + //重复性 + List repList = request.getCheckDataDcPowerList() + .stream().filter(e -> points.equals(e.getCheckParam()) + && checkTypes[0].equals(e.getCheckType()) + && StringUtils.isEmpty(e.getTestValueFiveDate())).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(repList)) { + List repMapList = new ArrayList<>(); + for (BizEquipmentStandardCheckDataDcPower rep : repList) { + Map repMap = BeanUtil.beanToMap(rep); + mapReplace(repMap); + repMapList.add(repMap); + } + int size = numMap.get(i + 1) - repMapList.size(); + for (int j = 0; j < size; j++) { + BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); + Map powerMap = BeanUtil.beanToMap(dcPower); + mapReplace(powerMap); + repMapList.add(powerMap); + } + map.put(REPEAT_PREFIX + (i + 1), repMapList); + } + //稳定性 + List staList = request.getCheckDataDcPowerList() + .stream().filter(e -> points.equals(e.getCheckParam()) + && checkTypes[1].equals(e.getCheckType()) + && (StringUtils.isNotEmpty(e.getTestValueOneDate()) + || StringUtils.isNotEmpty(e.getTestValueTwoDate()) + || StringUtils.isNotEmpty(e.getTestValueThreeDate()) + || StringUtils.isNotEmpty(e.getTestValueFourDate()) + || StringUtils.isNotEmpty(e.getTestValueFiveDate()) + || StringUtils.isNotEmpty(e.getTestValueSixDate())) + ).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(staList)) { + statisticalDate(staList, STA_PREFIX + (i + 1), map); + List repMapList = new ArrayList<>(); + for (BizEquipmentStandardCheckDataDcPower sta : staList) { + Map repMap = BeanUtil.beanToMap(sta); + mapReplace(repMap); + if (sta.getLessThan() != null) { + repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); + } else { + repMap.put("lessThan", ""); + } + repMapList.add(repMap); + } + int size = numMap.get(i + 1) - repMapList.size(); + for (int j = 0; j < size; j++) { + BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); + Map powerMap = BeanUtil.beanToMap(dcPower); + mapReplace(powerMap); + powerMap.put("lessThan", ""); + repMapList.add(powerMap); + } + map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF0A3"); + map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF0A3"); + if (1 == staList.get(0).getQualified()) { + map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF052"); + } else { + map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF052"); + } + map.put(STA_PREFIX + (i + 1), repMapList); + } + } + + List repList = request.getCheckDataDcPowerList().stream() + .filter(d -> RIPPLE_VOLTAGE.equals(d.getCheckParam()) + && checkTypes[0].equals(d.getCheckType())) + .collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(repList)) { + List repMapList = new ArrayList<>(); + for (BizEquipmentStandardCheckDataDcPower rep : repList) { + Map repMap = BeanUtil.beanToMap(rep); + mapReplace(repMap); + repMapList.add(repMap); + } + int size = numMap.get(5) - repMapList.size(); + for (int j = 0; j < size; j++) { + BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); + Map powerMap = BeanUtil.beanToMap(dcPower); + mapReplace(powerMap); + repMapList.add(powerMap); + } + map.put(REPEAT_PREFIX + 5, repMapList); + } + + List staList = request.getCheckDataDcPowerList().stream() + .filter(d -> RIPPLE_VOLTAGE.equals(d.getCheckParam()) + && checkTypes[1].equals(d.getCheckType()) + && (StringUtils.isNotEmpty(d.getTestValueOneDate()) + || StringUtils.isNotEmpty(d.getTestValueTwoDate()) + || StringUtils.isNotEmpty(d.getTestValueThreeDate()) + || StringUtils.isNotEmpty(d.getTestValueFourDate()) + || StringUtils.isNotEmpty(d.getTestValueFiveDate()) + || StringUtils.isNotEmpty(d.getTestValueSixDate()))).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(staList)) { + statisticalDate(staList, STA_PREFIX + 5, map); + List repMapList = new ArrayList<>(); + for (BizEquipmentStandardCheckDataDcPower sta : staList) { + Map repMap = BeanUtil.beanToMap(sta); + mapReplace(repMap); + if (sta.getLessThan() != null) { + repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); + } else { + repMap.put("lessThan", ""); + } + repMapList.add(repMap); + } + int size = numMap.get(5) - repMapList.size(); + for (int j = 0; j < size; j++) { + BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); + Map powerMap = BeanUtil.beanToMap(dcPower); + mapReplace(powerMap); + powerMap.put("lessThan", ""); + repMapList.add(powerMap); + } + map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF0A3"); + map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF0A3"); + if (1 == staList.get(0).getQualified()) { + map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF052"); + } else { + map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF052"); + } + map.put(STA_PREFIX + 5, repMapList); + } + } + /** * 组装参数 * @@ -186,16 +232,16 @@ */ private void statisticalDate(List sta, String strListParam, Map map) { //再次健壮性判断，防止其他方法调用，或者已经存在直接退出 - if (com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(sta) || map.containsKey(strListParam + DATE_PREFIX + 1)) { + if (CollectionUtils.isEmpty(sta) || map.containsKey(strListParam + DATE_PREFIX + 1)) { return; } BizEquipmentStandardCheckDataDcPower dataCalibrator = sta.get(0); - map.put(strListParam + DATE_PREFIX + 1, dataCalibrator.getTestValueOneDate()); - map.put(strListParam + DATE_PREFIX + 2, dataCalibrator.getTestValueTwoDate()); - map.put(strListParam + DATE_PREFIX + 3, dataCalibrator.getTestValueThreeDate()); - map.put(strListParam + DATE_PREFIX + 4, dataCalibrator.getTestValueFourDate()); - map.put(strListParam + DATE_PREFIX + 5, dataCalibrator.getTestValueFiveDate()); - map.put(strListParam + DATE_PREFIX + 6, dataCalibrator.getTestValueSixDate()); + map.put(strListParam + DATE_PREFIX + 1, StringUtils.isNotBlank(dataCalibrator.getTestValueOneDate()) ? dataCalibrator.getTestValueOneDate() : "/"); + map.put(strListParam + DATE_PREFIX + 2, StringUtils.isNotBlank(dataCalibrator.getTestValueTwoDate()) ? dataCalibrator.getTestValueTwoDate() : "/"); + map.put(strListParam + DATE_PREFIX + 3, StringUtils.isNotBlank(dataCalibrator.getTestValueThreeDate()) ? dataCalibrator.getTestValueThreeDate() : "/"); + map.put(strListParam + DATE_PREFIX + 4, StringUtils.isNotBlank(dataCalibrator.getTestValueFourDate()) ? dataCalibrator.getTestValueFourDate() : "/"); + map.put(strListParam + DATE_PREFIX + 5, StringUtils.isNotBlank(dataCalibrator.getTestValueFiveDate()) ? dataCalibrator.getTestValueFiveDate() : "/"); + map.put(strListParam + DATE_PREFIX + 6, StringUtils.isNotBlank(dataCalibrator.getTestValueSixDate()) ? dataCalibrator.getTestValueSixDate() : "/"); } @Override @@ -208,10 +254,9 @@ List list = Collections.emptyList(); request.setMeasureDataDcPowerList(list); } - BizBusinessDeviceMeasureInfo measureInfo = bizBusinessDeviceMeasureInfoMapper.selectDetailById(request.getDataId()); DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - map.put("dataNo", measureInfo.getDataNo()); + mapReplace(map); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); if (CollectionUtils.isEmpty(equipmentList)) { @@ -224,66 +269,7 @@ List dcPowerList = request.getMeasureDataDcPowerList(); - //电源电压调整率 - List powerSupplyVoltageAdjustmentList = dcPowerList.stream() - .filter(dcPower -> "1".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); - dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); - return dcPower; - }).collect(Collectors.toList()); - - //负载调整率 - List loadRegulationList = dcPowerList.stream() - .filter(dcPower -> "2".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); - dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); - return dcPower; - }).collect(Collectors.toList()); - - //电压示值误差 - List voltageRepresentationErrorList = dcPowerList.stream() - .filter(dcPower -> "3".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); - return dcPower; - }).collect(Collectors.toList()); - - //电流表示值误差（直接测量） - List directMeasurementList = dcPowerList.stream() - .filter(dcPower -> "4".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); - return dcPower; - }).collect(Collectors.toList()); - - //电流表示值误差（间接测量） - List indirectMeasurementList = dcPowerList.stream() - .filter(dcPower -> "5".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); - return dcPower; - }).collect(Collectors.toList()); - - //波纹电压 - List rippleList = dcPowerList.stream() - .filter(dcPower -> "6".equals(dcPower.getDataType())).map(dcPower -> { - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); - dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "mV"); - return dcPower; - }).collect(Collectors.toList()); - - //输出电压短期稳定性 - List shortRepList = dcPowerList.stream() - .filter(dcPower -> "7".equals(dcPower.getDataType())) - .peek(dcPower -> { - dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); - dcPower.setShortTermStability(dcPower.getShortTermStability() + "%"); - }).collect(Collectors.toList()); - - map.put("shortRepList", shortRepList); - map.put("powerSupplyVoltageAdjustmentList", powerSupplyVoltageAdjustmentList); - map.put("loadRegulationList", loadRegulationList); - map.put("voltageRepresentationErrorList", voltageRepresentationErrorList); - map.put("directMeasurementList", directMeasurementList); - map.put("indirectMeasurementList", indirectMeasurementList); - map.put("rippleList", rippleList); + prepareParams(dcPowerList, map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "1", request.getItemCategoryName())); @@ -307,6 +293,102 @@ } /** + * 准备原始记录填充参数 + * + * @param dcPowerList + * @param map + */ + private void prepareParams(List dcPowerList, Map map) { + //电源电压调整率 + List> powerSupplyVoltageAdjustmentList = dcPowerList.stream() + .filter(dcPower -> "1".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //负载调整率 + List> loadRegulationList = dcPowerList.stream() + .filter(dcPower -> "2".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setVoltageRegulation(dcPower.getVoltageRegulation() + "%"); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电压示值误差 + List> voltageRepresentationErrorList = dcPowerList.stream() + .filter(dcPower -> "3".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电流表示值误差（直接测量） + List> directMeasurementList = dcPowerList.stream() + .filter(dcPower -> "4".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setMaximumError(dcPower.getMaximumErrorUnit() + dcPower.getMaximumError()); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电流表示值误差（间接测量） + List> indirectMeasurementList = dcPowerList.stream() + .filter(dcPower -> "5".equals(dcPower.getDataType())) + .map(dcPower -> { + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //波纹电压 + List> rippleList = dcPowerList.stream() + .filter(dcPower -> "6".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "mV"); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //输出电压短期稳定性 + List> shortRepList = dcPowerList.stream() + .filter(dcPower -> "7".equals(dcPower.getDataType())) + .map(dcPower -> { + dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); + dcPower.setShortTermStability(dcPower.getShortTermStability() + "%"); + Map strMap = BeanUtil.beanToMap(dcPower); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + map.put("powerSupplyVoltageAdjustmentList", powerSupplyVoltageAdjustmentList); + map.put("loadRegulationList", loadRegulationList); + map.put("voltageRepresentationErrorList", voltageRepresentationErrorList); + map.put("directMeasurementList", directMeasurementList); + map.put("indirectMeasurementList", indirectMeasurementList); + map.put("rippleList", rippleList); + map.put("shortRepList", shortRepList); + } + + /** * 封面基本信息的定制化参数 * * @param map @@ -356,13 +438,12 @@ list.add(new BizBusinessDeviceMeasureDataDcPower()); request.setMeasureDataDcPowerList(list); } - Long dataId = request.getDataId(); - BizBusinessDeviceMeasureInfo measureInfo = bizBusinessDeviceMeasureInfoMapper.selectDetailById(dataId); DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - map.put("dataNo", measureInfo.getDataNo()); + mapReplace(map); + Long dataId = request.getDataId(); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(dataId); if (CollectionUtils.isEmpty(equipmentList)) { equipmentList = new ArrayList<>(); @@ -371,42 +452,9 @@ map.put("equipmentList", equipmentList); List dcPowerList = request.getMeasureDataDcPowerList(); - //电源电压调整率 - List powerSupplyVoltageAdjustmentList = dcPowerList.stream() - .filter(dcPower -> "1".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //负载调整率 - List loadRegulationList = dcPowerList.stream() - .filter(dcPower -> "2".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //电压示值误差 - List voltageRepresentationErrorList = dcPowerList.stream() - .filter(dcPower -> "3".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //电流表示值误差（直接测量） - List directMeasurementList = dcPowerList.stream() - .filter(dcPower -> "4".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //电流表示值误差（间接测量） - List indirectMeasurementList = dcPowerList.stream() - .filter(dcPower -> "5".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //波纹电压 - List rippleList = dcPowerList.stream() - .filter(dcPower -> "6".equals(dcPower.getDataType())).collect(Collectors.toList()); - - //输出电压短期稳定性 - List shortRepList = dcPowerList.stream() - .filter(dcPower -> "7".equals(dcPower.getDataType())).collect(Collectors.toList()); - - map.put("powerSupplyVoltageAdjustmentList", powerSupplyVoltageAdjustmentList); - map.put("loadRegulationList", loadRegulationList); - map.put("voltageRepresentationErrorList", voltageRepresentationErrorList); - map.put("directMeasurementList", directMeasurementList); - map.put("indirectMeasurementList", indirectMeasurementList); - map.put("rippleList", rippleList); - map.put("shortRepList", shortRepList); - + //准备填充参数 + prepareCertificateParams(dcPowerList, map); + //准备封面参数 prepareCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); @@ -433,6 +481,92 @@ } /** + * 准备检定证书参数 + * + * @param dcPowerList + * @param map + */ + private void prepareCertificateParams(List dcPowerList, Map map) { + //电源电压调整率 + List> powerSupplyVoltageAdjustmentList = dcPowerList.stream() + .filter(dcPower -> "1".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //负载调整率 + List> loadRegulationList = dcPowerList.stream() + .filter(dcPower -> "2".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电压示值误差 + List> voltageRepresentationErrorList = dcPowerList.stream() + .filter(dcPower -> "3".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电流表示值误差（直接测量） + List> directMeasurementList = dcPowerList.stream() + .filter(dcPower -> "4".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //电流表示值误差（间接测量） + List> indirectMeasurementList = dcPowerList.stream() + .filter(dcPower -> "5".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //波纹电压 + List> rippleList = dcPowerList.stream() + .filter(dcPower -> "6".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + //输出电压短期稳定性 + List> shortRepList = dcPowerList.stream() + .filter(dcPower -> "7".equals(dcPower.getDataType())) + .map(d -> { + Map strMap = BeanUtil.beanToMap(d); + mapReplace(strMap); + return strMap; + }) + .collect(Collectors.toList()); + + map.put("powerSupplyVoltageAdjustmentList", powerSupplyVoltageAdjustmentList); + map.put("loadRegulationList", loadRegulationList); + map.put("voltageRepresentationErrorList", voltageRepresentationErrorList); + map.put("directMeasurementList", directMeasurementList); + map.put("indirectMeasurementList", indirectMeasurementList); + map.put("rippleList", rippleList); + map.put("shortRepList", shortRepList); + } + + /** * 检查是否能生成证书 */ private Boolean checkOutUnablePrint(BizBusinessDeviceMeasureApproval measureItemInfo) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ETwoWeightHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ETwoWeightHandler.java index c5ac4e4..2ab844e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ETwoWeightHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ETwoWeightHandler.java @@ -102,154 +102,143 @@ /** * 核查填充参数 + * * @param eTwoList * @param map */ private void prepareCheckParams(List eTwoList, Map map) { - List checkPointList = eTwoList.stream() - .map(BizEquipmentStandardCheckDataETwo::getCheckPoint) - .distinct() - .collect(Collectors.toList()); - List> repList = new ArrayList<>(); + List checkPointList = eTwoList.stream().map(BizEquipmentStandardCheckDataETwo::getCheckPoint).distinct().collect(Collectors.toList()); + List> repList = new ArrayList<>(); for (String s : checkPointList) { //A1 - List> aOneList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map aOneMap = new HashMap<>(); - aOneMap.put("checkPoint", s); - aOneMap.put("project", "A1(" + "Ιᵣ₁ᵢ)"); - aOneMap.put("unit", e.getUnit()); - aOneMap.put("oneValue", e.getAOneValueOne()); - aOneMap.put("twoValue", e.getAOneValueTwo()); - aOneMap.put("threeValue", e.getAOneValueThree()); - aOneMap.put("fourValue", e.getAOneValueFour()); - aOneMap.put("fiveValue", e.getAOneValueFive()); - aOneMap.put("sixValue", e.getAOneValueSix()); - return aOneMap; - }) - .collect(Collectors.toList()); + List> aOneList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map aOneMap = new HashMap<>(); + aOneMap.put("checkPoint", s); + aOneMap.put("project", "A1(" + "Ιᵣ₁ᵢ)"); + aOneMap.put("unit", e.getUnit()); + aOneMap.put("oneValue", e.getAOneValueOne()); + aOneMap.put("twoValue", e.getAOneValueTwo()); + aOneMap.put("threeValue", e.getAOneValueThree()); + aOneMap.put("fourValue", e.getAOneValueFour()); + aOneMap.put("fiveValue", e.getAOneValueFive()); + aOneMap.put("sixValue", e.getAOneValueSix()); + mapReplace(aOneMap); + return aOneMap; + }).collect(Collectors.toList()); repList.add(aOneList.get(0)); //B1 - List> bOneList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map bOneMap = new HashMap<>(); - bOneMap.put("checkPoint", s); - bOneMap.put("project", "B1(" + "Ιᵣ₁ᵢ)"); - bOneMap.put("unit", e.getUnit()); - bOneMap.put("oneValue", e.getBOneValueOne()); - bOneMap.put("twoValue", e.getBOneValueTwo()); - bOneMap.put("threeValue", e.getBOneValueThree()); - bOneMap.put("fourValue", e.getBOneValueFour()); - bOneMap.put("fiveValue", e.getBOneValueFive()); - bOneMap.put("sixValue", e.getBOneValueSix()); - return bOneMap; - }).collect(Collectors.toList()); + List> bOneList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map bOneMap = new HashMap<>(); + bOneMap.put("checkPoint", s); + bOneMap.put("project", "B1(" + "Ιᵣ₁ᵢ)"); + bOneMap.put("unit", e.getUnit()); + bOneMap.put("oneValue", e.getBOneValueOne()); + bOneMap.put("twoValue", e.getBOneValueTwo()); + bOneMap.put("threeValue", e.getBOneValueThree()); + bOneMap.put("fourValue", e.getBOneValueFour()); + bOneMap.put("fiveValue", e.getBOneValueFive()); + bOneMap.put("sixValue", e.getBOneValueSix()); + mapReplace(bOneMap); + return bOneMap; + }).collect(Collectors.toList()); repList.add(bOneList.get(0)); //B2 - List> bTwoList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map bTwoMap = new HashMap<>(); - bTwoMap.put("checkPoint", s); - bTwoMap.put("project", "B2(" + "Ιᵣ₂ᵢ)"); - bTwoMap.put("unit", e.getUnit()); - bTwoMap.put("oneValue", e.getBTwoValueOne()); - bTwoMap.put("twoValue", e.getBTwoValueTwo()); - bTwoMap.put("threeValue", e.getBTwoValueThree()); - bTwoMap.put("fourValue", e.getBTwoValueFour()); - bTwoMap.put("fiveValue", e.getBTwoValueFive()); - bTwoMap.put("sixValue", e.getBTwoValueSix()); - return bTwoMap; - }).collect(Collectors.toList()); + List> bTwoList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map bTwoMap = new HashMap<>(); + bTwoMap.put("checkPoint", s); + bTwoMap.put("project", "B2(" + "Ιᵣ₂ᵢ)"); + bTwoMap.put("unit", e.getUnit()); + bTwoMap.put("oneValue", e.getBTwoValueOne()); + bTwoMap.put("twoValue", e.getBTwoValueTwo()); + bTwoMap.put("threeValue", e.getBTwoValueThree()); + bTwoMap.put("fourValue", e.getBTwoValueFour()); + bTwoMap.put("fiveValue", e.getBTwoValueFive()); + bTwoMap.put("sixValue", e.getBTwoValueSix()); + mapReplace(bTwoMap); + return bTwoMap; + }).collect(Collectors.toList()); repList.add(bTwoList.get(0)); //A2 - List> aTwoList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map aTwoMap = new HashMap<>(); - aTwoMap.put("checkPoint", s); - aTwoMap.put("project", "A2(" + "Ιᵣ₂ᵢ)"); - aTwoMap.put("unit", e.getUnit()); - aTwoMap.put("oneValue", e.getATwoValueOne()); - aTwoMap.put("twoValue", e.getATwoValueTwo()); - aTwoMap.put("threeValue", e.getATwoValueThree()); - aTwoMap.put("fourValue", e.getATwoValueFour()); - aTwoMap.put("fiveValue", e.getATwoValueFive()); - aTwoMap.put("sixValue", e.getATwoValueSix()); - return aTwoMap; - }).collect(Collectors.toList()); + List> aTwoList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map aTwoMap = new HashMap<>(); + aTwoMap.put("checkPoint", s); + aTwoMap.put("project", "A2(" + "Ιᵣ₂ᵢ)"); + aTwoMap.put("unit", e.getUnit()); + aTwoMap.put("oneValue", e.getATwoValueOne()); + aTwoMap.put("twoValue", e.getATwoValueTwo()); + aTwoMap.put("threeValue", e.getATwoValueThree()); + aTwoMap.put("fourValue", e.getATwoValueFour()); + aTwoMap.put("fiveValue", e.getATwoValueFive()); + aTwoMap.put("sixValue", e.getATwoValueSix()); + mapReplace(aTwoMap); + return aTwoMap; + }).collect(Collectors.toList()); repList.add(aTwoList.get(0)); //Δi - List> deltaIotaList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map deltaIotaMap = new HashMap<>(); - deltaIotaMap.put("checkPoint", s); - deltaIotaMap.put("project", "Δ" + "Ιᵢ"); - deltaIotaMap.put("unit", e.getUnit()); - deltaIotaMap.put("oneValue", e.getAverageValueOne()); - deltaIotaMap.put("twoValue", e.getAverageValueTwo()); - deltaIotaMap.put("threeValue", e.getAverageValueThree()); - deltaIotaMap.put("fourValue", e.getAverageValueFour()); - deltaIotaMap.put("fiveValue", e.getAverageValueFive()); - deltaIotaMap.put("sixValue", e.getAverageValueSix()); - return deltaIotaMap; - }).collect(Collectors.toList()); + List> deltaIotaList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map deltaIotaMap = new HashMap<>(); + deltaIotaMap.put("checkPoint", s); + deltaIotaMap.put("project", "Δ" + "Ιᵢ"); + deltaIotaMap.put("unit", e.getUnit()); + deltaIotaMap.put("oneValue", e.getAverageValueOne()); + deltaIotaMap.put("twoValue", e.getAverageValueTwo()); + deltaIotaMap.put("threeValue", e.getAverageValueThree()); + deltaIotaMap.put("fourValue", e.getAverageValueFour()); + deltaIotaMap.put("fiveValue", e.getAverageValueFive()); + deltaIotaMap.put("sixValue", e.getAverageValueSix()); + mapReplace(deltaIotaMap); + ; + return deltaIotaMap; + }).collect(Collectors.toList()); repList.add(deltaIotaList.get(0)); // Δj - List> deltajList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map deltajMap = new HashMap<>(); - deltajMap.put("checkPoint", s); - deltajMap.put("project", "Δ" + "Ιʲ"); - deltajMap.put("unit", e.getUnit()); - deltajMap.put("oneValue", e.getAverageValue()); - deltajMap.put("twoValue", e.getAverageValue()); - deltajMap.put("threeValue", e.getAverageValue()); - deltajMap.put("fourValue", e.getAverageValue()); - deltajMap.put("fiveValue", e.getAverageValue()); - deltajMap.put("sixValue", e.getAverageValue()); - return deltajMap; - }).collect(Collectors.toList()); + List> deltajList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map deltajMap = new HashMap<>(); + deltajMap.put("checkPoint", s); + deltajMap.put("project", "Δ" + "Ιʲ"); + deltajMap.put("unit", e.getUnit()); + deltajMap.put("oneValue", e.getAverageValue()); + deltajMap.put("twoValue", e.getAverageValue()); + deltajMap.put("threeValue", e.getAverageValue()); + deltajMap.put("fourValue", e.getAverageValue()); + deltajMap.put("fiveValue", e.getAverageValue()); + deltajMap.put("sixValue", e.getAverageValue()); + mapReplace(deltajMap); + ; + return deltajMap; + }).collect(Collectors.toList()); repList.add(deltajList.get(0)); //Sn - List> snList = eTwoList.stream() - .filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())) - .map(e -> { - Map snMap = new HashMap<>(); - snMap.put("checkPoint", s); - snMap.put("project", "Sn"); - snMap.put("unit", e.getUnit()); - snMap.put("oneValue", e.getAverageValue()); - snMap.put("twoValue", e.getAverageValue()); - snMap.put("threeValue", e.getAverageValue()); - snMap.put("fourValue", e.getAverageValue()); - snMap.put("fiveValue", e.getAverageValue()); - snMap.put("sixValue", e.getAverageValue()); - return snMap; - }).collect(Collectors.toList()); + List> snList = eTwoList.stream().filter(e -> REPEATABILITY.equals(e.getCheckType()) && s.equals(e.getCheckPoint())).map(e -> { + Map snMap = new HashMap<>(); + snMap.put("checkPoint", s); + snMap.put("project", "Sn"); + snMap.put("unit", e.getUnit()); + snMap.put("oneValue", e.getAverageValue()); + snMap.put("twoValue", e.getAverageValue()); + snMap.put("threeValue", e.getAverageValue()); + snMap.put("fourValue", e.getAverageValue()); + snMap.put("fiveValue", e.getAverageValue()); + snMap.put("sixValue", e.getAverageValue()); + mapReplace(snMap); + return snMap; + }).collect(Collectors.toList()); repList.add(snList.get(0)); map.put("repList", repList); } - List staList = eTwoList - .stream().filter(e -> STABILITY.equals(e.getCheckType()) - && (StringUtils.isNotEmpty(e.getTestValueOneDate()) - || StringUtils.isNotEmpty(e.getTestValueTwoDate()) - || StringUtils.isNotEmpty(e.getTestValueThreeDate()) - || StringUtils.isNotEmpty(e.getTestValueFourDate()) - || StringUtils.isNotEmpty(e.getTestValueFiveDate()) - || StringUtils.isNotEmpty(e.getTestValueSixDate())) - ).collect(Collectors.toList()); + List staList = eTwoList.stream().filter(e -> STABILITY.equals(e.getCheckType()) && (StringUtils.isNotEmpty(e.getTestValueOneDate()) || StringUtils.isNotEmpty(e.getTestValueTwoDate()) || StringUtils.isNotEmpty(e.getTestValueThreeDate()) || StringUtils.isNotEmpty(e.getTestValueFourDate()) || StringUtils.isNotEmpty(e.getTestValueFiveDate()) || StringUtils.isNotEmpty(e.getTestValueSixDate()))).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(staList)) { statisticalDate(staList, STA_PREFIX, map); List repMapList = new ArrayList<>(); for (BizEquipmentStandardCheckDataETwo sta : staList) { Map repMap = BeanUtil.beanToMap(sta); - repMap.put("lessThan", ObjectUtils.isEmpty(sta.getLessThan()) || 0 == sta.getLessThan() ? "否" : "是"); + mapReplace(repMap); + if (sta.getLessThan() != null) { + repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); + } else { + repMap.put("lessThan", ""); + } repMapList.add(repMap); } map.put("staList", repMapList); @@ -269,17 +258,14 @@ return; } BizEquipmentStandardCheckDataETwo dataCalibrator = sta.get(0); - map.put(strListParam + DATE_PREFIX + 1, dataCalibrator.getTestValueOneDate()); - map.put(strListParam + DATE_PREFIX + 2, dataCalibrator.getTestValueTwoDate()); - map.put(strListParam + DATE_PREFIX + 3, dataCalibrator.getTestValueThreeDate()); - map.put(strListParam + DATE_PREFIX + 4, dataCalibrator.getTestValueFourDate()); - map.put(strListParam + DATE_PREFIX + 5, dataCalibrator.getTestValueFiveDate()); - map.put(strListParam + DATE_PREFIX + 6, dataCalibrator.getTestValueSixDate()); + map.put(strListParam + DATE_PREFIX + 1, StringUtils.isNotBlank(dataCalibrator.getTestValueOneDate()) ? dataCalibrator.getTestValueOneDate() : "/"); + map.put(strListParam + DATE_PREFIX + 2, StringUtils.isNotBlank(dataCalibrator.getTestValueTwoDate()) ? dataCalibrator.getTestValueTwoDate() : "/"); + map.put(strListParam + DATE_PREFIX + 3, StringUtils.isNotBlank(dataCalibrator.getTestValueThreeDate()) ? dataCalibrator.getTestValueThreeDate() : "/"); + map.put(strListParam + DATE_PREFIX + 4, StringUtils.isNotBlank(dataCalibrator.getTestValueFourDate()) ? dataCalibrator.getTestValueFourDate() : "/"); + map.put(strListParam + DATE_PREFIX + 5, StringUtils.isNotBlank(dataCalibrator.getTestValueFiveDate()) ? dataCalibrator.getTestValueFiveDate() : "/"); + map.put(strListParam + DATE_PREFIX + 6, StringUtils.isNotBlank(dataCalibrator.getTestValueSixDate()) ? dataCalibrator.getTestValueSixDate() : "/"); } -// private List> convertToListMap(String checkPoint, List eTwoList) { -// -// } @Override public List doCreateOriginalFile(BizBusinessDeviceMeasureApproval request) { @@ -301,7 +287,7 @@ equipmentList = new ArrayList<>(); equipmentList.add(new MeasureEquipmentInfoDTO()); } - map.put("actualDivisionValue", request.getActualDivisionValue()); + map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); //准备填充参数 prepareParams(map, request.getMeasureDataETwoList()); @@ -338,81 +324,95 @@ //重复性 List repPtOneList = eTwoList.stream() - .filter(e -> "1".equals(e.getDataType()) - && REPEATABILITY.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtOne())) + .filter(e -> "1".equals(e.getDataType()) && REPEATABILITY.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtOne())) .collect(Collectors.toList()); + getEquipment(equipmentList, repPtOneList); List repPtTwoList = eTwoList.stream() - .filter(e -> "1".equals(e.getDataType()) - && REPEATABILITY.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtTwo())) + .filter(e -> "1".equals(e.getDataType()) && REPEATABILITY.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtTwo())) .collect(Collectors.toList()); getEquipment(equipmentList, repPtTwoList); - map.put("repPtOneList", repPtOneList); + List> repOneMapList = repPtOneList.stream().map(e -> { + Map objectMap = BeanUtil.beanToMap(e); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("repPtOneList", repOneMapList); map.put("repPtOne", repPtOneList.get(0).getPtOne()); map.put("repPtOneaManufactureNo", repPtOneList.get(0).getAManufactureNo()); map.put("repPtOnebManufactureNo", repPtOneList.get(0).getBManufactureNo()); - map.put("repPtTwoList", repPtTwoList); + List> repTwoMapList = repPtTwoList.stream().map(e -> { + Map objectMap = BeanUtil.beanToMap(e); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("repPtTwoList", repTwoMapList); map.put("repPtTwo", repPtTwoList.get(0).getPtTwo()); map.put("repPtTwoaManufactureNo", repPtTwoList.get(0).getAManufactureNo()); map.put("repPtTwobManufactureNo", repPtTwoList.get(0).getBManufactureNo()); //偏载误差 - List loadPtOneList = eTwoList.stream() - .filter(e -> "2".equals(e.getDataType()) - && OFFSET_LOAD_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtOne())) - .collect(Collectors.toList()); + List loadPtOneList = eTwoList.stream().filter(e -> "2".equals(e.getDataType()) && OFFSET_LOAD_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtOne())).collect(Collectors.toList()); getEquipment(equipmentList, loadPtOneList); - List loadPtTwoList = eTwoList.stream() - .filter(e -> "2".equals(e.getDataType()) - && OFFSET_LOAD_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtTwo())) - .collect(Collectors.toList()); + List loadPtTwoList = eTwoList.stream().filter(e -> "2".equals(e.getDataType()) && OFFSET_LOAD_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtTwo())).collect(Collectors.toList()); getEquipment(equipmentList, loadPtTwoList); - map.put("loadPtOneList", loadPtOneList); + List> loadOneMapList = loadPtOneList.stream().map(e -> { + Map objectMap = BeanUtil.beanToMap(e); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("loadPtOneList", loadOneMapList); map.put("loadPtOne", loadPtOneList.get(0).getPtOne()); map.put("loadPtOneaManufactureNo", loadPtOneList.get(0).getAManufactureNo()); map.put("loadPtOnebManufactureNo", loadPtOneList.get(0).getBManufactureNo()); - map.put("loadPtTwoList", loadPtTwoList); + List> loadTwoMapList = loadPtTwoList.stream().map(e -> { + Map objectMap = BeanUtil.beanToMap(e); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("loadPtTwoList", loadTwoMapList); map.put("loadPtTwo", loadPtTwoList.get(0).getPtTwo()); map.put("loadPtTwoaManufactureNo", loadPtTwoList.get(0).getAManufactureNo()); map.put("loadPtTwobManufactureNo", loadPtTwoList.get(0).getBManufactureNo()); //局部示值误差 - List errorPtOneList = eTwoList.stream() - .filter(e -> "3".equals(e.getDataType()) - && LOCAL_INDICATION_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtOne())) - .collect(Collectors.toList()); + List errorPtOneList = eTwoList.stream().filter(e -> "3".equals(e.getDataType()) && LOCAL_INDICATION_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtOne())).collect(Collectors.toList()); getEquipment(equipmentList, errorPtOneList); - List errorPtTwoList = eTwoList.stream() - .filter(e -> "3".equals(e.getDataType()) - && LOCAL_INDICATION_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtTwo())) - .collect(Collectors.toList()); + List errorPtTwoList = eTwoList.stream().filter(e -> "3".equals(e.getDataType()) && LOCAL_INDICATION_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtTwo())).collect(Collectors.toList()); getEquipment(equipmentList, errorPtTwoList); - map.put("errorPtOneList", errorPtOneList); + + List> errorOneMapList = errorPtOneList.stream().map(e -> { + Map objectMap = BeanUtil.beanToMap(e); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("errorPtOneList", errorOneMapList); map.put("errorPtOne", errorPtOneList.get(0).getPtOne()); map.put("errorPtOneaManufactureNo", errorPtOneList.get(0).getAManufactureNo()); - map.put("errorPtOnemSValue", errorPtOneList.get(0).getMSValue()); - map.put("errorPtOnempesValue", errorPtOneList.get(0).getMpesValue()); - map.put("errorPtTwoList", errorPtTwoList); + map.put("errorPtOnemSValue", StringUtils.isNotBlank(errorPtOneList.get(0).getMSValue()) ? errorPtOneList.get(0).getMSValue() + "mg" : "/"); + map.put("errorPtOnempesValue", StringUtils.isNotBlank(errorPtOneList.get(0).getMpesValue()) ? errorPtOneList.get(0).getMpesValue() + "mg" : "/"); + + List> errorTwoMapList = errorPtTwoList.stream().map(e -> { + Map objectMap = BeanUtil.beanToMap(e); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("errorPtTwoList", errorTwoMapList); map.put("errorPtTwo", errorPtTwoList.get(0).getPtTwo()); map.put("errorPtTwoaManufactureNo", errorPtTwoList.get(0).getAManufactureNo()); - map.put("errorPtTwomSValue", errorPtTwoList.get(0).getMSValue()); - map.put("errorPtTwompesValue", errorPtTwoList.get(0).getMpesValue()); + map.put("errorPtTwomSValue", StringUtils.isNotBlank(errorPtTwoList.get(0).getMSValue()) ? errorPtTwoList.get(0).getMSValue() + "mg" : "/"); + map.put("errorPtTwompesValue", StringUtils.isNotBlank(errorPtTwoList.get(0).getMpesValue()) ? errorPtTwoList.get(0).getMpesValue() + "mg" : "/"); map.put("equipmentList", equipmentList); + mapReplace(map); } private void getEquipment(List> equipmentList, List list) throws Exception { @@ -432,9 +432,9 @@ aMap.put("uncertainty", aTarget.getUncertainty()); } aMap.put("equipmentType", "标准砝码"); - aMap.put("deviceNumber", list.get(0).getADeviceNumber()); - aMap.put("nominalQualityValue", list.get(0).getANominalQualityValue() + "g"); - aMap.put("convertQualityCorrectValue", list.get(0).getAConvertQualityCorrectValue() + "mg"); + aMap.put("deviceNumber", StringUtils.isNotBlank(list.get(0).getADeviceNumber()) ? list.get(0).getADeviceNumber() : "/"); + aMap.put("nominalQualityValue", StringUtils.isNotBlank(list.get(0).getANominalQualityValue()) ? list.get(0).getANominalQualityValue() + "g" : "/"); + aMap.put("convertQualityCorrectValue", StringUtils.isNotBlank(list.get(0).getAConvertQualityCorrectValue()) ? list.get(0).getAConvertQualityCorrectValue() + "mg" : "/"); aMap.put("remark", "/"); Map bMap = new HashMap<>(); @@ -449,9 +449,9 @@ aMap.put("uncertainty", bTarget.getUncertainty()); } bMap.put("equipmentType", "标准砝码"); - bMap.put("deviceNumber", list.get(0).getBDeviceNumber()); - bMap.put("nominalQualityValue", list.get(0).getBNominalQualityValue() + "g"); - bMap.put("convertQualityCorrectValue", list.get(0).getBConvertQualityCorrectValue() + "mg"); + bMap.put("deviceNumber", StringUtils.isNotBlank(list.get(0).getBDeviceNumber()) ? list.get(0).getBDeviceNumber() : "/"); + bMap.put("nominalQualityValue", StringUtils.isNotBlank(list.get(0).getBNominalQualityValue()) ? list.get(0).getBNominalQualityValue() + "g" : "/"); + bMap.put("convertQualityCorrectValue", StringUtils.isNotBlank(list.get(0).getBConvertQualityCorrectValue()) ? list.get(0).getBConvertQualityCorrectValue() + "mg" : "/"); bMap.put("remark", "/"); equipmentList.add(aMap); @@ -469,9 +469,9 @@ aMap.put("uncertainty", aTarget.getUncertainty()); } aMap.put("equipmentType", "标准砝码"); - aMap.put("deviceNumber", list.get(0).getADeviceNumber()); - aMap.put("nominalQualityValue", list.get(0).getANominalQualityValue() + "g"); - aMap.put("convertQualityCorrectValue", list.get(0).getAConvertQualityCorrectValue() + "mg"); + aMap.put("deviceNumber", StringUtils.isNotBlank(list.get(0).getADeviceNumber()) ? list.get(0).getADeviceNumber() : "/"); + aMap.put("nominalQualityValue", StringUtils.isNotBlank(list.get(0).getANominalQualityValue()) ? list.get(0).getANominalQualityValue() + "g" : "/"); + aMap.put("convertQualityCorrectValue", StringUtils.isNotBlank(list.get(0).getAConvertQualityCorrectValue()) ? list.get(0).getAConvertQualityCorrectValue() + "mg" : "/"); aMap.put("remark", "/"); equipmentList.add(aMap); } @@ -495,6 +495,7 @@ DictCodeUtils.convertDictCodeToName(request); request.setActualDivisionValue(request.getActualDivisionValue() + request.getActualDivisionValueUnit()); Map map = BeanUtil.beanToMap(request); + mapReplace(map); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); if (CollectionUtils.isEmpty(equipmentList)) { @@ -504,7 +505,7 @@ map.put("equipmentList", equipmentList); prepareCertificateParams(map, request.getMeasureDataETwoList()); - prepareParams(map, request.getMeasureDataETwoList()); +// prepareParams(map, request.getMeasureDataETwoList()); prepareCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); @@ -532,64 +533,64 @@ private void prepareCertificateParams(Map map, List eTwoList) { //重复性PtOne - List repPtOneList = eTwoList.stream() - .filter(e -> "1".equals(e.getDataType()) - && REPEATABILITY.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtOne())) - .collect(Collectors.toList()); + List repPtOneList = eTwoList.stream().filter(e -> "1".equals(e.getDataType()) && REPEATABILITY.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtOne())).collect(Collectors.toList()); //重复性PtTwo - List repPtTwoList = eTwoList.stream() - .filter(e -> "1".equals(e.getDataType()) - && REPEATABILITY.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtTwo())) - .collect(Collectors.toList()); + List repPtTwoList = eTwoList.stream().filter(e -> "1".equals(e.getDataType()) && REPEATABILITY.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtTwo())).collect(Collectors.toList()); + BizBusinessDeviceMeasureDataETwo repOne = repPtOneList.get(0); repOne.setPtOne(repOne.getPtOne() + repOne.getPtOneUnit()); + repOne.setSValue(StringUtils.isNotBlank(repOne.getSValue()) ? repOne.getSValue() + "mg" : "/"); + repOne.setURValue(StringUtils.isNotBlank(repOne.getURValue()) ? repOne.getURValue() + "mg" : "/"); + Map repOneMap = BeanUtil.beanToMap(repOne); + mapReplace(repOneMap); + map.put("repOne", repOneMap); - map.put("repOne", repOne); BizBusinessDeviceMeasureDataETwo repTwo = repPtTwoList.get(0); repTwo.setPtTwo(repTwo.getPtTwo() + repTwo.getPtTwoUnit()); - - map.put("repTwo", repTwo); + repTwo.setSValue(StringUtils.isNotBlank(repTwo.getSValue()) ? repTwo.getSValue() + "mg" : "/"); + repTwo.setURValue(StringUtils.isNotBlank(repTwo.getURValue()) ? repTwo.getURValue() + "mg" : "/"); + Map repTwoMap = BeanUtil.beanToMap(repTwo); + mapReplace(repTwoMap); + map.put("repTwo", repTwoMap); //偏载误差PtOne - List loadPtOneList = eTwoList.stream() - .filter(e -> "2".equals(e.getDataType()) - && OFFSET_LOAD_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtOne())) - .collect(Collectors.toList()); + List loadPtOneList = eTwoList.stream().filter(e -> "2".equals(e.getDataType()) && OFFSET_LOAD_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtOne())).collect(Collectors.toList()); //偏载误差PtTwo - List loadPtTwoList = eTwoList.stream() - .filter(e -> "2".equals(e.getDataType()) - && OFFSET_LOAD_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtTwo())) - .collect(Collectors.toList()); + List loadPtTwoList = eTwoList.stream().filter(e -> "2".equals(e.getDataType()) && OFFSET_LOAD_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtTwo())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataETwo loadOne = loadPtOneList.get(0); loadOne.setPtOne(loadOne.getPtOne() + loadOne.getPtOneUnit()); - map.put("loadOne", loadOne); + loadOne.setSValue(StringUtils.isNotBlank(loadOne.getSValue()) ? loadOne.getSValue() + "mg" : "/"); + loadOne.setURValue(StringUtils.isNotBlank(loadOne.getURValue()) ? loadOne.getURValue() + "mg" : "/"); + Map loadOneMap = BeanUtil.beanToMap(loadOne); + mapReplace(loadOneMap); + map.put("loadOne", loadOneMap); BizBusinessDeviceMeasureDataETwo loadTwo = loadPtTwoList.get(0); loadTwo.setPtTwo(loadTwo.getPtTwo() + loadTwo.getPtTwoUnit()); - map.put("loadTwo", loadTwo); + loadTwo.setSValue(StringUtils.isNotBlank(loadTwo.getSValue()) ? loadTwo.getSValue() + "mg" : "/"); + loadTwo.setURValue(StringUtils.isNotBlank(loadTwo.getURValue()) ? loadTwo.getURValue() + "mg" : "/"); + Map loadTwoMap = BeanUtil.beanToMap(loadTwo); + mapReplace(loadTwoMap); + map.put("loadTwo", loadTwoMap); //局部示值误差PtOne - List errorPtOneList = eTwoList.stream() - .filter(e -> "3".equals(e.getDataType()) - && LOCAL_INDICATION_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtOne())) - .collect(Collectors.toList()); + List errorPtOneList = eTwoList.stream().filter(e -> "3".equals(e.getDataType()) && LOCAL_INDICATION_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtOne())).collect(Collectors.toList()); //局部示值误差PtTwo - List errorPtTwoList = eTwoList.stream() - .filter(e -> "3".equals(e.getDataType()) - && LOCAL_INDICATION_ERROR.equals(e.getParams()) - && StringUtils.isNotBlank(e.getPtTwo())) - .collect(Collectors.toList()); + List errorPtTwoList = eTwoList.stream().filter(e -> "3".equals(e.getDataType()) && LOCAL_INDICATION_ERROR.equals(e.getParams()) && StringUtils.isNotBlank(e.getPtTwo())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataETwo errorOne = errorPtOneList.get(0); errorOne.setPtOne(errorOne.getPtOne() + errorOne.getPtOneUnit()); - map.put("errorOne", errorOne); + errorOne.setSValue(StringUtils.isNotBlank(errorOne.getSValue()) ? errorOne.getSValue() + "mg" : "/"); + errorOne.setURValue(StringUtils.isNotBlank(errorOne.getURValue()) ? errorOne.getURValue() + "mg" : "/"); + Map errorOneMap = BeanUtil.beanToMap(errorOne); + mapReplace(errorOneMap); + map.put("errorOne", errorOneMap); BizBusinessDeviceMeasureDataETwo errorTwo = errorPtTwoList.get(0); errorTwo.setPtTwo(errorTwo.getPtTwo() + errorTwo.getPtTwoUnit()); - map.put("errorTwo", errorTwo); + errorTwo.setSValue(StringUtils.isNotBlank(errorTwo.getSValue()) ? errorTwo.getSValue() + "mg" : "/"); + errorTwo.setURValue(StringUtils.isNotBlank(errorTwo.getURValue()) ? errorTwo.getURValue() + "mg" : "/"); + Map errorTwoMap = BeanUtil.beanToMap(errorTwo); + mapReplace(errorTwoMap); + map.put("errorTwo", errorTwoMap); } /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java index e106828..fb70360 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java @@ -28,6 +28,7 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; +import reactor.core.publisher.Mono; import java.text.SimpleDateFormat; import java.util.*; @@ -56,6 +57,7 @@ return null; } Map map = BeanUtil.beanToMap(request); + mapReplace(map); String[] pointStr = {DC_VOLTAGE, RESISTANCE_MEASUREMENT}; //重复性、稳定性 final String[] checkTypes = {REPEATABILITY, STABILITY}; @@ -70,6 +72,7 @@ List repMapList = new ArrayList<>(); for (BizEquipmentStandardCheckDataElectricalSafety rep : repList) { Map repMap = BeanUtil.beanToMap(rep); + mapReplace(repMap); repMapList.add(repMap); } map.put(REPEAT_PREFIX + (i + 1), repMapList); @@ -90,12 +93,13 @@ List repMapList = new ArrayList<>(); for (BizEquipmentStandardCheckDataElectricalSafety sta : staList) { Map repMap = BeanUtil.beanToMap(sta); + mapReplace(repMap); repMap.put("lessThan", ObjectUtils.isEmpty(sta.getLessThan()) || 0 == sta.getLessThan() ? "否" : "是"); repMapList.add(repMap); } map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF0A3"); map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF0A3"); - if (1==staList.get(0).getQualified()) { + if (1 == staList.get(0).getQualified()) { map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF052"); } else { map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF052"); @@ -114,7 +118,7 @@ urlList.add((String) map.get("pdfUrl")); } return urlList; - }catch (Exception ex){ + } catch (Exception ex) { log.info("-----package data is exception， this is {}", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } @@ -133,16 +137,16 @@ return; } BizEquipmentStandardCheckDataElectricalSafety dataCalibrator = sta.get(0); - map.put(strListParam + DATE_PREFIX + 1, dataCalibrator.getTestValueOneDate()); - map.put(strListParam + DATE_PREFIX + 2, dataCalibrator.getTestValueTwoDate()); - map.put(strListParam + DATE_PREFIX + 3, dataCalibrator.getTestValueThreeDate()); - map.put(strListParam + DATE_PREFIX + 4, dataCalibrator.getTestValueFourDate()); - map.put(strListParam + DATE_PREFIX + 5, dataCalibrator.getTestValueFiveDate()); - map.put(strListParam + DATE_PREFIX + 6, dataCalibrator.getTestValueSixDate()); + map.put(strListParam + DATE_PREFIX + 1, StringUtils.isNotBlank(dataCalibrator.getTestValueOneDate()) ? dataCalibrator.getTestValueOneDate() : "/"); + map.put(strListParam + DATE_PREFIX + 2, StringUtils.isNotBlank(dataCalibrator.getTestValueTwoDate()) ? dataCalibrator.getTestValueTwoDate() : "/"); + map.put(strListParam + DATE_PREFIX + 3, StringUtils.isNotBlank(dataCalibrator.getTestValueThreeDate()) ? dataCalibrator.getTestValueThreeDate() : "/"); + map.put(strListParam + DATE_PREFIX + 4, StringUtils.isNotBlank(dataCalibrator.getTestValueFourDate()) ? dataCalibrator.getTestValueFourDate() : "/"); + map.put(strListParam + DATE_PREFIX + 5, StringUtils.isNotBlank(dataCalibrator.getTestValueFiveDate()) ? dataCalibrator.getTestValueFiveDate() : "/"); + map.put(strListParam + DATE_PREFIX + 6, StringUtils.isNotBlank(dataCalibrator.getTestValueSixDate()) ? dataCalibrator.getTestValueSixDate() : "/"); } @Override - public List doCreateOriginalFile(BizBusinessDeviceMeasureApproval request) { + public List doCreateOriginalFile(BizBusinessDeviceMeasureApproval request) { try { if (ObjectUtils.isEmpty(request)) { return null; @@ -154,7 +158,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - + mapReplace(map); BizBusinessDeviceMeasureEquipmentMapper equipmentMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureEquipmentMapper.class); List equipmentList = equipmentMapper.selectEquipmentListByDataId(request.getDataId()); if (CollectionUtils.isEmpty(equipmentList)) { @@ -194,15 +198,24 @@ } } + + private void prepareParams(List electricalSafetyList, Map map) { - List voltageList = electricalSafetyList.stream() - .filter(e -> "1".equals(e.getDataType())).collect(Collectors.toList()); + List> voltageList = electricalSafetyList.stream() + .filter(e -> "1".equals(e.getDataType())).map(BeanUtil::beanToMap).collect(Collectors.toList()); List indicationErrorList = electricalSafetyList.stream() .filter(e -> "2".equals(e.getDataType())).collect(Collectors.toList()); doCustomParam(indicationErrorList); + List> errorList = indicationErrorList.stream().map(BeanUtil::beanToMap).collect(Collectors.toList()); + for (Map stringObjectMap : errorList) { + mapReplace(stringObjectMap); + } + for (Map stringObjectMap : voltageList) { + mapReplace(stringObjectMap); + } map.put("voltageList", voltageList); - map.put("errorList", indicationErrorList); + map.put("errorList", errorList); } /** @@ -257,13 +270,6 @@ log.debug("该报告没有证书报告"); return null; } - if (CollectionUtils.isEmpty(request.getMeasureDataElectricalSafetyList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataElectricalSafety()); - request.setMeasureDataElectricalSafetyList(list); - } - - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); @@ -274,17 +280,15 @@ equipmentList.add(new MeasureEquipmentInfoDTO()); } map.put("equipmentList", equipmentList); - prepareCustomCoverParams(map, request.getMeasureDataElectricalSafetyList()); - List electricalSafetyList = request.getMeasureDataElectricalSafetyList(); - List voltageList = electricalSafetyList.stream() - .filter(e -> "1".equals(e.getDataType())).collect(Collectors.toList()); - List indicationErrorList = electricalSafetyList.stream() - .filter(e -> "2".equals(e.getDataType())).collect(Collectors.toList()); - map.put("voltageList", voltageList); - map.put("errorList", indicationErrorList); + prepareCustomCoverParams(map, request.getMeasureDataElectricalSafetyList()); + + List electricalSafetyList = request.getMeasureDataElectricalSafetyList(); + //填充参数 + prepareParams(electricalSafetyList, map); //准备封面参数 prepareCoverParams(map, request.getLabCode()); + List customTemplateUrls = new ArrayList<>(); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); log.debug("--------get Certificate template is ...."); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ResistanceThermometerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ResistanceThermometerHandler.java index 65486a6..577caf3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ResistanceThermometerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ResistanceThermometerHandler.java @@ -61,7 +61,10 @@ DictCodeUtils.convertDictCodeToName(bizEquipmentInfo); } Map map = BeanUtil.beanToMap(request); - + if (ObjectUtil.isEmpty(map.get("technologyFile"))){ + map.put("technologyFile","无"); + } + mapReplace(map); List thermometerList = request.getCheckDataResistanceThermometerList(); if (CollectionUtils.isEmpty(thermometerList)) { return null; @@ -69,13 +72,19 @@ //最低和最高温度点重复性 TreeMap> repTreeMap = thermometerList.stream() - .filter(t -> TEMPERATURE.equals(t.getParams()) && REPEATABILITY.equals(t.getCheckType())) - .collect(Collectors.groupingBy(BizEquipmentStandardCheckDataResistanceThermometer::getCheckPoint, + .filter(t -> TEMPERATURE.equals(t.getParams()) + && REPEATABILITY.equals(t.getCheckType())) + .collect(Collectors.groupingBy( + BizEquipmentStandardCheckDataResistanceThermometer::getCheckPoint, () -> new TreeMap<>(getComparator()), Collectors.toList())); - map.put("lowerRep", repTreeMap.get(repTreeMap.firstKey()).get(0)); - map.put("upperRep", repTreeMap.get(repTreeMap.lastKey()).get(0)); + Map lowerRepMap = BeanUtil.beanToMap(repTreeMap.get(repTreeMap.firstKey()).get(0)); + mapReplace(lowerRepMap); + map.put("lowerRep", lowerRepMap); + Map upperRepMap = BeanUtil.beanToMap(repTreeMap.get(repTreeMap.lastKey()).get(0)); + mapReplace(upperRepMap); + map.put("upperRep", upperRepMap); //最低和最高温度点稳定性 TreeMap> staTreeMap = thermometerList.stream() .filter(t -> TEMPERATURE.equals(t.getParams()) && STABILITY.equals(t.getCheckType())) @@ -85,35 +94,48 @@ List lowerStaList = staTreeMap.get(staTreeMap.firstKey()); BizEquipmentStandardCheckDataResistanceThermometer lowerSta = lowerStaList.get(0); + Map lowerStaMap = BeanUtil.beanToMap(lowerSta); + mapReplace(lowerStaMap); if (lowerSta.getLessThan() == null) { - lowerSta.setConclusion(""); + lowerStaMap.put("conclusion", ""); } else { - lowerSta.setConclusion(lowerSta.getLessThan() == 0 ? "否" : "是"); + lowerStaMap.put("conclusion", lowerSta.getLessThan() == 0 ? "否" : "是"); } - map.put("lowerSta", lowerSta); + map.put("lowerSta", lowerStaMap); List upperStaList = staTreeMap.get(staTreeMap.lastKey()); BizEquipmentStandardCheckDataResistanceThermometer upperSta = upperStaList.get(0); + Map upperStaMap = BeanUtil.beanToMap(upperSta); + mapReplace(upperStaMap); if (upperSta.getLessThan() == null) { - upperSta.setConclusion(""); + upperStaMap.put("conclusion", ""); } else { - upperSta.setConclusion(upperSta.getLessThan() == 0 ? "否" : "是"); + upperStaMap.put("conclusion", lowerSta.getLessThan() == 0 ? "否" : "是"); } - map.put("upperSta", upperSta); + map.put("upperSta", upperStaMap); //RTP值重复性 List rtpRepList = thermometerList.stream() .filter(t -> RTP.equals(t.getParams()) && REPEATABILITY.equals(t.getCheckType())) .collect(Collectors.toList()); - map.put("RTPRep", rtpRepList.get(0)); + Map rtpRepMap = BeanUtil.beanToMap(rtpRepList.get(0)); + mapReplace(rtpRepMap); + map.put("RTPRep", rtpRepMap); //RTP值稳定性 List rtpStaList = thermometerList.stream() .filter(t -> RTP.equals(t.getParams()) && STABILITY.equals(t.getCheckType())) .collect(Collectors.toList()); - map.put("RTPSta", rtpStaList.get(0)); + Map rtpStaMap = BeanUtil.beanToMap(rtpStaList.get(0)); + mapReplace(rtpStaMap); + map.put("RTPSta", rtpStaMap); //绝缘电阻表校准 - List resistanceList = thermometerList.stream() + List> resistanceList = thermometerList.stream() .filter(t -> INSULATION_RESISTANCE_METER_CALIBRATION.equals(t.getParams())) + .map(t -> { + Map objectMap = BeanUtil.beanToMap(t); + mapReplace(objectMap); + return objectMap; + }) .collect(Collectors.toList()); map.put("resistanceList", resistanceList); @@ -156,7 +178,7 @@ } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - + mapReplace(map); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); if (CollectionUtils.isEmpty(equipmentList)) { equipmentList = new ArrayList<>(); @@ -213,10 +235,13 @@ * @param map */ private void assembleBimetalThermometerParams(List resistanceThermometerList, Map map) { - resistanceThermometerList.forEach(r -> { - r.setStandardizerNo("/"); - }); - map.put("bimetalList", resistanceThermometerList); + List> bimetalList = resistanceThermometerList.stream().map(t -> { + Map objectMap = BeanUtil.beanToMap(t); + mapReplace(objectMap); + return objectMap; + }) + .collect(Collectors.toList()); + map.put("bimetalList", bimetalList); } /** @@ -233,6 +258,7 @@ List volMapList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataResistanceThermometer thermometer : volLowerList) { Map volMap = BeanUtil.beanToMap(thermometer); + mapReplace(volMap); volMapList.add(volMap); } @@ -241,12 +267,16 @@ List volUpperMapList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataResistanceThermometer thermometer : volUpperList) { Map volMap = BeanUtil.beanToMap(thermometer); + mapReplace(volMap); volUpperMapList.add(volMap); } - - map.put("volLower", volLowerList.get(0)); + Map volLower = BeanUtil.beanToMap(volLowerList.get(0)); + mapReplace(volLower); + map.put("volLower", volLower); map.put("volLowerList", volMapList); - map.put("volUpper", volUpperList.get(0)); + Map volUpper = BeanUtil.beanToMap(volUpperList.get(0)); + mapReplace(volUpper); + map.put("volUpper", volUpper); map.put("volUpperList", volUpperMapList); //最大波动性 @@ -261,33 +291,48 @@ } map.put("maxVolatility", maxVolatility); + //均匀性测试 TreeMap> uniformityTreeMap = resistanceThermometerList.stream().filter(t -> "2".equals(t.getDataType())).collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataResistanceThermometer::getUpperLowerPoint, TreeMap::new, Collectors.toList())); String uniFirstKey = uniformityTreeMap.firstKey(); List lowerList = uniformityTreeMap.get(uniFirstKey); - List uniLowerList = lowerList.stream().sorted(Comparator.comparing(BizBusinessDeviceMeasureDataResistanceThermometer::getLocation)).collect(Collectors.toList()); + + List uniLowerList = lowerList.stream() + .sorted(Comparator.comparing(BizBusinessDeviceMeasureDataResistanceThermometer::getLocation)) + .collect(Collectors.toList()); + List uniLowerMapList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataResistanceThermometer thermometer : uniLowerList) { Map uniMap = BeanUtil.beanToMap(thermometer); + mapReplace(uniMap); uniLowerMapList.add(uniMap); } String uniLastKey = uniformityTreeMap.lastKey(); List upperList = uniformityTreeMap.get(uniLastKey); - List uniUpperList = upperList.stream().sorted(Comparator.comparing(BizBusinessDeviceMeasureDataResistanceThermometer::getLocation)).collect(Collectors.toList()); + List uniUpperList = upperList.stream() + .sorted(Comparator.comparing(BizBusinessDeviceMeasureDataResistanceThermometer::getLocation)) + .collect(Collectors.toList()); + List uniUpperMapList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataResistanceThermometer thermometer : uniUpperList) { Map uniMap = BeanUtil.beanToMap(thermometer); + mapReplace(uniMap); uniUpperMapList.add(uniMap); } - map.put("uniLower", uniLowerList.get(0)); + Map uniLower = BeanUtil.beanToMap(uniLowerList.get(0)); + mapReplace(uniLower); + map.put("uniLower", uniLower); map.put("uniLowerList", uniLowerMapList); - map.put("uniUpper", uniUpperList.get(0)); + Map uniUpper = BeanUtil.beanToMap(uniUpperList.get(0)); + mapReplace(uniUpper); + map.put("uniUpper", uniUpper); map.put("uniUpperList", uniUpperMapList); List maxDifferentList = resistanceThermometerList.stream() .filter(t -> "2".equals(t.getDataType())) .map(BizBusinessDeviceMeasureDataResistanceThermometer::getMaxWorkTemperatureDifferent) .collect(Collectors.toList()); + String maxWorkTemperatureDifferent = null; if (!CollectionUtils.isEmpty(maxDifferentList)) { maxWorkTemperatureDifferent = maxDifferentList.get(0); @@ -304,25 +349,62 @@ * @param map */ private void assembleThermalTesistanceParams(List resistanceThermometerList, Map map) { - List toleranceLevelZeroList = resistanceThermometerList.stream().filter(t -> "1".equals(t.getDataCategory()) && NOMINAL_TEMPERATURE_ZERO.equals(t.getNominalTemperature())).collect(Collectors.toList()); + List toleranceLevelZeroList = resistanceThermometerList.stream() + .filter(t -> "1".equals(t.getDataCategory()) && NOMINAL_TEMPERATURE_ZERO.equals(t.getNominalTemperature())) + .collect(Collectors.toList()); - List toleranceLevelHundredList = resistanceThermometerList.stream().filter(t -> "1".equals(t.getDataCategory()) && NOMINAL_TEMPERATURE_HUNDRED.equals(t.getNominalTemperature())).collect(Collectors.toList()); + List toleranceLevelHundredList = resistanceThermometerList.stream() + .filter(t -> "1".equals(t.getDataCategory()) && NOMINAL_TEMPERATURE_HUNDRED.equals(t.getNominalTemperature())) + .collect(Collectors.toList()); - List rtZeroList = resistanceThermometerList.stream().filter(t -> "2".equals(t.getDataCategory()) && RT_ZERO.equals(t.getItem())).collect(Collectors.toList()); - List rtHundredList = resistanceThermometerList.stream().filter(t -> "2".equals(t.getDataCategory()) && RT_HUNDRED.equals(t.getItem())).collect(Collectors.toList()); - List alphaList = resistanceThermometerList.stream().filter(t -> "2".equals(t.getDataCategory()) && ALPHA.equals(t.getItem())).collect(Collectors.toList()); - List deltaZeroList = resistanceThermometerList.stream().filter(t -> "2".equals(t.getDataCategory()) && DELTA_ZERO.equals(t.getItem())).collect(Collectors.toList()); - List deltaHundredList = resistanceThermometerList.stream().filter(t -> "2".equals(t.getDataCategory()) && DELTA_HUNDRED.equals(t.getItem())).collect(Collectors.toList()); - List deltaAlphaList = resistanceThermometerList.stream().filter(t -> "2".equals(t.getDataCategory()) && DELTA_ALPHA.equals(t.getItem())).collect(Collectors.toList()); + List rtZeroList = resistanceThermometerList.stream() + .filter(t -> "2".equals(t.getDataCategory()) && RT_ZERO.equals(t.getItem())) + .collect(Collectors.toList()); - map.put("toleranceLevelZero", toleranceLevelZeroList.get(0)); - map.put("toleranceLevelHundred", toleranceLevelHundredList.get(0)); - map.put("rtZero", rtZeroList.get(0)); - map.put("rtHundred", rtHundredList.get(0)); - map.put("alpha", alphaList.get(0)); - map.put("deltaZero", deltaZeroList.get(0)); - map.put("deltaHundred", deltaHundredList.get(0)); - map.put("deltaAlpha", deltaAlphaList.get(0)); + List rtHundredList = resistanceThermometerList.stream() + .filter(t -> "2".equals(t.getDataCategory()) && RT_HUNDRED.equals(t.getItem())) + .collect(Collectors.toList()); + + List alphaList = resistanceThermometerList.stream() + .filter(t -> "2".equals(t.getDataCategory()) && ALPHA.equals(t.getItem())) + .collect(Collectors.toList()); + + List deltaZeroList = resistanceThermometerList.stream() + .filter(t -> "2".equals(t.getDataCategory()) && DELTA_ZERO.equals(t.getItem())) + .collect(Collectors.toList()); + + List deltaHundredList = resistanceThermometerList.stream() + .filter(t -> "2".equals(t.getDataCategory()) && DELTA_HUNDRED.equals(t.getItem())) + .collect(Collectors.toList()); + + List deltaAlphaList = resistanceThermometerList.stream() + .filter(t -> "2".equals(t.getDataCategory()) && DELTA_ALPHA.equals(t.getItem())) + .collect(Collectors.toList()); + + Map toleranceLevelZero = BeanUtil.beanToMap(toleranceLevelZeroList.get(0)); + mapReplace(toleranceLevelZero); + map.put("toleranceLevelZero", toleranceLevelZero); + Map toleranceLevelHundred = BeanUtil.beanToMap(toleranceLevelHundredList.get(0)); + mapReplace(toleranceLevelHundred); + map.put("toleranceLevelHundred", toleranceLevelHundred); + Map rtZero = BeanUtil.beanToMap(rtZeroList.get(0)); + mapReplace(rtZero); + map.put("rtZero", rtZero); + Map rtHundred = BeanUtil.beanToMap(rtHundredList.get(0)); + mapReplace(rtHundred); + map.put("rtHundred", rtHundred); + Map alpha = BeanUtil.beanToMap(alphaList.get(0)); + mapReplace(alpha); + map.put("alpha", alpha); + Map deltaZero = BeanUtil.beanToMap(deltaZeroList.get(0)); + mapReplace(deltaZero); + map.put("deltaZero", deltaZero); + Map deltaHundred = BeanUtil.beanToMap(deltaHundredList.get(0)); + mapReplace(deltaHundred); + map.put("deltaHundred", deltaHundred); + Map deltaAlpha = BeanUtil.beanToMap(deltaAlphaList.get(0)); + mapReplace(deltaAlpha); + map.put("deltaAlpha", deltaAlpha); } /** @@ -432,7 +514,12 @@ * @param map */ private void assembleBimetalThermometerCertificateParams(List thermometerList, Map map) { - map.put("bimtalResList", thermometerList); + List> bimtalResList = thermometerList.stream().map(t -> { + Map objectMap = BeanUtil.beanToMap(t); + mapReplace(objectMap); + return objectMap; + }).collect(Collectors.toList()); + map.put("bimtalResList", bimtalResList); } /** @@ -442,21 +529,41 @@ * @param map */ private void assembleThermostaticBathCertificateParams(List thermometerList, Map map) { - List pointList = thermometerList.stream().map(BizBusinessDeviceMeasureDataResistanceThermometer::getUpperLowerPoint).sorted().distinct().collect(Collectors.toList()); - map.put("lowerPoint", pointList.get(0)); - map.put("upperPoint", pointList.get(1)); + List pointList = thermometerList.stream() + .map(BizBusinessDeviceMeasureDataResistanceThermometer::getUpperLowerPoint) + .sorted().distinct().collect(Collectors.toList()); + map.put("lowerPoint", StringUtils.isNotBlank(pointList.get(0)) ? pointList.get(0) : "/"); + map.put("upperPoint", StringUtils.isNotBlank(pointList.get(1)) ? pointList.get(1) : "/"); - List lowerVolatility = thermometerList.stream().filter(t -> pointList.get(0).equals(t.getUpperLowerPoint())).map(BizBusinessDeviceMeasureDataResistanceThermometer::getVolatility).sorted(Comparator.reverseOrder()).collect(Collectors.toList()); + List lowerVolatility = thermometerList.stream() + .filter(t -> pointList.get(0).equals(t.getUpperLowerPoint())) + .map(BizBusinessDeviceMeasureDataResistanceThermometer::getVolatility) + .sorted(Comparator.reverseOrder()) + .collect(Collectors.toList()); - List upperVolatility = thermometerList.stream().filter(t -> pointList.get(1).equals(t.getUpperLowerPoint())).map(BizBusinessDeviceMeasureDataResistanceThermometer::getVolatility).sorted(Comparator.reverseOrder()).collect(Collectors.toList()); + List upperVolatility = thermometerList.stream() + .filter(t -> pointList.get(1).equals(t.getUpperLowerPoint())) + .map(BizBusinessDeviceMeasureDataResistanceThermometer::getVolatility) + .sorted(Comparator.reverseOrder()).collect(Collectors.toList()); - map.put("lowerVolatility", lowerVolatility.get(0)); - map.put("upperVolatility", upperVolatility.get(0)); - List lowerMaxWork = thermometerList.stream().filter(t -> pointList.get(0).equals(t.getUpperLowerPoint())).map(BizBusinessDeviceMeasureDataResistanceThermometer::getMaxWorkTemperatureDifferent).sorted(Comparator.reverseOrder()).collect(Collectors.toList()); - List upperMaxWork = thermometerList.stream().filter(t -> pointList.get(1).equals(t.getUpperLowerPoint())).map(BizBusinessDeviceMeasureDataResistanceThermometer::getMaxWorkTemperatureDifferent).sorted(Comparator.reverseOrder()).collect(Collectors.toList()); - map.put("lowerMaxWork", lowerMaxWork.get(0)); - map.put("upperMaxWork", upperMaxWork.get(0)); + map.put("lowerVolatility", StringUtils.isNotBlank(lowerVolatility.get(0)) ? lowerVolatility.get(0) : "/"); + map.put("upperVolatility", StringUtils.isNotBlank(upperVolatility.get(0)) ? upperVolatility.get(0) : "/"); + + List lowerMaxWork = thermometerList.stream() + .filter(t -> pointList.get(0).equals(t.getUpperLowerPoint())) + .map(BizBusinessDeviceMeasureDataResistanceThermometer::getMaxWorkTemperatureDifferent) + .sorted(Comparator.reverseOrder()) + .collect(Collectors.toList()); + + List upperMaxWork = thermometerList.stream() + .filter(t -> pointList.get(1).equals(t.getUpperLowerPoint())) + .map(BizBusinessDeviceMeasureDataResistanceThermometer::getMaxWorkTemperatureDifferent) + .sorted(Comparator.reverseOrder()) + .collect(Collectors.toList()); + + map.put("lowerMaxWork", StringUtils.isNotBlank(lowerMaxWork.get(0)) ? lowerMaxWork.get(0) : "/"); + map.put("upperMaxWork", StringUtils.isNotBlank(upperMaxWork.get(0)) ? upperMaxWork.get(0) : "/"); } /** @@ -466,7 +573,14 @@ * @param map */ private void assembleThermalTesistanceCertificateParams(List thermometerList, Map map) { - List resultList = thermometerList.stream().filter(t -> "2".equals(t.getDataCategory())).collect(Collectors.toList()); + List> resultList = thermometerList.stream() + .filter(t -> "2".equals(t.getDataCategory())) + .map(t -> { + Map objectMap = BeanUtil.beanToMap(t); + mapReplace(objectMap); + return objectMap; + }) + .collect(Collectors.toList()); map.put("thermometerList", resultList); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SateyValueHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SateyValueHandler.java index aac6521..deaeb98 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SateyValueHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SateyValueHandler.java @@ -27,6 +27,7 @@ import org.springframework.stereotype.Component; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -42,8 +43,6 @@ @Slf4j public class SateyValueHandler extends StandardEquipmentSupport implements PrintFileModuleNameEnum, StandardEquipmentPrint { - private final BizBusinessDeviceMeasureInfoMapper bizBusinessDeviceMeasureInfoMapper; - private final PrintFileRegister printFileRegister; private final BizBusinessDeviceMeasureEquipmentMapper bizBusinessDeviceMeasureEquipmentMapper; @@ -61,46 +60,14 @@ if (ObjectUtil.isEmpty(request)) { return null; } - BizBusinessDeviceMeasureInfo measureInfo = bizBusinessDeviceMeasureInfoMapper.selectDetailById(request.getDataId()); DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - map.put("dataNo", measureInfo.getDataNo()); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); map.put("equipmentList", equipmentList); List safetyValveList = request.getMeasureDataSafetyValueList(); - //调整前列表 - List beforeAdjustList = safetyValveList.stream() - .filter(s -> StringUtils.isNotBlank(s.getBeforeAdjustFirst()) - && StringUtils.isNotBlank(s.getBeforeAdjustSecond()) - && StringUtils.isNotBlank(s.getBeforeAdjustThird()) - && StringUtils.isNotBlank(s.getBeforeAdjustAverage())) - .peek(s -> s.setAdjustType("调整前")) - .collect(Collectors.toList()); - //调整后列表 - List afterAdjustList = safetyValveList.stream() - .filter(s -> StringUtils.isNotBlank(s.getAfterAdjustFirst()) - && StringUtils.isNotBlank(s.getAfterAdjustSecond()) - && StringUtils.isNotBlank(s.getAfterAdjustThird()) - && StringUtils.isNotBlank(s.getAfterAdjustAverage())) - .peek(s -> s.setAdjustType("调整后")) - .collect(Collectors.toList()); - //标称值 - List nominalValueList = safetyValveList.stream() - .map(BizBusinessDeviceMeasureDataSafetyValue::getNominalValue) - .collect(Collectors.toList()); - //允许值 - String allowValue = safetyValveList.stream() - .flatMap(safetyValue -> - Stream.of(safetyValue.getLowerAllowValue() - , safetyValue.getUpperAllowValue())) - .collect(Collectors.joining("~")); - - map.put("beforeAdjust", beforeAdjustList.get(0)); - map.put("afterAdjust", afterAdjustList.get(0)); - map.put("nominalValue", nominalValueList.get(0)); - map.put("allowValue", allowValue); + assblemParams(safetyValveList, map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "1", request.getItemCategoryName())); @@ -124,6 +91,31 @@ } + private void assblemParams(List safetyValveList, Map map) { + List> list = new ArrayList<>(); + for (BizBusinessDeviceMeasureDataSafetyValue safetyValue : safetyValveList) { + Map beforeMap = new HashMap<>(); + beforeMap.put("nominalValue", StringUtils.isNotBlank(safetyValue.getNominalValue()) ? safetyValue.getNominalValue() : "/"); + beforeMap.put("allowValue", safetyValue.getLowerAllowValue() + "~" + safetyValue.getUpperAllowValue()); + beforeMap.put("adjustType", "调整前"); + beforeMap.put("adjustFirst", StringUtils.isNotBlank(safetyValue.getBeforeAdjustFirst()) ? safetyValue.getBeforeAdjustFirst() : "/"); + beforeMap.put("adjustSecond", StringUtils.isNotBlank(safetyValue.getBeforeAdjustSecond()) ? safetyValue.getBeforeAdjustSecond() : "/"); + beforeMap.put("adjustThird", StringUtils.isNotBlank(safetyValue.getBeforeAdjustThird()) ? safetyValue.getBeforeAdjustThird() : "/"); + beforeMap.put("adjustAverage", StringUtils.isNotBlank(safetyValue.getBeforeAdjustAverage()) ? safetyValue.getBeforeAdjustAverage() : "/"); + list.add(beforeMap); + Map afterMap = new HashMap<>(); + afterMap.put("nominalValue", StringUtils.isNotBlank(safetyValue.getNominalValue()) ? safetyValue.getNominalValue() : "/"); + afterMap.put("allowValue", safetyValue.getLowerAllowValue() + "~" + safetyValue.getUpperAllowValue()); + afterMap.put("adjustType", "调整后"); + afterMap.put("adjustFirst", StringUtils.isNotBlank(safetyValue.getAfterAdjustFirst()) ? safetyValue.getAfterAdjustFirst() : "/"); + afterMap.put("adjustSecond", StringUtils.isNotBlank(safetyValue.getAfterAdjustSecond()) ? safetyValue.getAfterAdjustSecond() : "/"); + afterMap.put("adjustThird", StringUtils.isNotBlank(safetyValue.getAfterAdjustThird()) ? safetyValue.getAfterAdjustThird() : "/"); + afterMap.put("adjustAverage", StringUtils.isNotBlank(safetyValue.getAfterAdjustAverage()) ? safetyValue.getAfterAdjustAverage() : "/"); + list.add(afterMap); + } + map.put("adjustList", list); + } + @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { @@ -133,47 +125,14 @@ log.debug("该报告没有证书报告"); return null; } - BizBusinessDeviceMeasureInfo measureInfo = bizBusinessDeviceMeasureInfoMapper.selectDetailById(request.getDataId()); DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - map.put("dataNo", measureInfo.getDataNo()); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); map.put("equipmentList", equipmentList); List safetyValveList = request.getMeasureDataSafetyValueList(); - //调整前列表 - List beforeAdjustList = safetyValveList.stream() - .filter(s -> StringUtils.isNotBlank(s.getBeforeAdjustFirst()) - && StringUtils.isNotBlank(s.getBeforeAdjustSecond()) - && StringUtils.isNotBlank(s.getBeforeAdjustThird()) - && StringUtils.isNotBlank(s.getBeforeAdjustAverage())) - .peek(s -> s.setAdjustType("调整前")) - .collect(Collectors.toList()); - //调整后列表 - List afterAdjustList = safetyValveList.stream() - .filter(s -> StringUtils.isNotBlank(s.getAfterAdjustFirst()) - && StringUtils.isNotBlank(s.getAfterAdjustSecond()) - && StringUtils.isNotBlank(s.getAfterAdjustThird()) - && StringUtils.isNotBlank(s.getAfterAdjustAverage())) - .peek(s -> s.setAdjustType("调整后")) - .collect(Collectors.toList()); - //标称值 - List nominalValueList = safetyValveList.stream() - .map(BizBusinessDeviceMeasureDataSafetyValue::getNominalValue) - .collect(Collectors.toList()); - //允许值 - String allowValue = safetyValveList.stream() - .flatMap(safetyValue -> - Stream.of(safetyValue.getLowerAllowValue() - , safetyValue.getUpperAllowValue())) - .collect(Collectors.joining("~")); - - map.put("beforeAdjust", beforeAdjustList.get(0)); - map.put("afterAdjust", afterAdjustList.get(0)); - map.put("nominalValue", nominalValueList.get(0)); - map.put("allowValue", allowValue); - + assblemParams(safetyValveList, map); prepareCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>();