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 bdd83db..49486b0 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 @@ -65,6 +65,7 @@ prepareCheckParams(request, map); + map.put("pdfStatus", 1); //除了选用的模板不一致,模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY_CHECK_DATA, "数据打印", null, map, false, null, null); List urlList = new ArrayList<>(); @@ -269,6 +270,7 @@ List dcPowerList = request.getMeasureDataDcPowerList(); + //组装原始记录打印参数 prepareParams(dcPowerList, map); List templateUrls = new ArrayList<>(); 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 bdd83db..49486b0 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 @@ -65,6 +65,7 @@ prepareCheckParams(request, map); + map.put("pdfStatus", 1); //除了选用的模板不一致,模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY_CHECK_DATA, "数据打印", null, map, false, null, null); List urlList = new ArrayList<>(); @@ -269,6 +270,7 @@ List dcPowerList = request.getMeasureDataDcPowerList(); + //组装原始记录打印参数 prepareParams(dcPowerList, map); List templateUrls = new ArrayList<>(); 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 2ab844e..018d497 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 @@ -84,6 +84,7 @@ prepareCheckParams(eTwoList, map); + map.put("pdfStatus", 1); //除了选用的模板不一致,模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(ETWO_WEIGHT_CHECK_DATA, "数据打印", null, map, false, null, null); List urlList = new ArrayList<>(); 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 bdd83db..49486b0 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 @@ -65,6 +65,7 @@ prepareCheckParams(request, map); + map.put("pdfStatus", 1); //除了选用的模板不一致,模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY_CHECK_DATA, "数据打印", null, map, false, null, null); List urlList = new ArrayList<>(); @@ -269,6 +270,7 @@ List dcPowerList = request.getMeasureDataDcPowerList(); + //组装原始记录打印参数 prepareParams(dcPowerList, map); List templateUrls = new ArrayList<>(); 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 2ab844e..018d497 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 @@ -84,6 +84,7 @@ prepareCheckParams(eTwoList, map); + map.put("pdfStatus", 1); //除了选用的模板不一致,模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(ETWO_WEIGHT_CHECK_DATA, "数据打印", null, map, false, null, null); List urlList = new ArrayList<>(); 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 c80b5c9..fbe4e92 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 @@ -131,6 +131,7 @@ } } //除了选用的模板不一致,模板配置流程是一致的 + map.put("pdfStatus", 1); PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); String wordUrl = printFileRegister.registerPrintFile(ELECTRICAL_SAFETY_CHECK_DATA, "数据打印", null, map, false, null, null); List urlList = new ArrayList<>(); 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 bdd83db..49486b0 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 @@ -65,6 +65,7 @@ prepareCheckParams(request, map); + map.put("pdfStatus", 1); //除了选用的模板不一致,模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY_CHECK_DATA, "数据打印", null, map, false, null, null); List urlList = new ArrayList<>(); @@ -269,6 +270,7 @@ List dcPowerList = request.getMeasureDataDcPowerList(); + //组装原始记录打印参数 prepareParams(dcPowerList, map); List templateUrls = new ArrayList<>(); 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 2ab844e..018d497 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 @@ -84,6 +84,7 @@ prepareCheckParams(eTwoList, map); + map.put("pdfStatus", 1); //除了选用的模板不一致,模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(ETWO_WEIGHT_CHECK_DATA, "数据打印", null, map, false, null, null); List urlList = new ArrayList<>(); 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 c80b5c9..fbe4e92 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 @@ -131,6 +131,7 @@ } } //除了选用的模板不一致,模板配置流程是一致的 + map.put("pdfStatus", 1); PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); String wordUrl = printFileRegister.registerPrintFile(ELECTRICAL_SAFETY_CHECK_DATA, "数据打印", null, map, false, null, null); List urlList = new ArrayList<>(); 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 577caf3..5971090 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 @@ -70,75 +70,9 @@ return null; } - //最低和最高温度点重复性 - TreeMap> repTreeMap = thermometerList.stream() - .filter(t -> TEMPERATURE.equals(t.getParams()) - && REPEATABILITY.equals(t.getCheckType())) - .collect(Collectors.groupingBy( - BizEquipmentStandardCheckDataResistanceThermometer::getCheckPoint, - () -> new TreeMap<>(getComparator()), - Collectors.toList())); + prepareCheckParams(thermometerList, map); - 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())) - .collect(Collectors.groupingBy(BizEquipmentStandardCheckDataResistanceThermometer::getCheckPoint, - () -> new TreeMap<>(getComparator()), - Collectors.toList())); - - List lowerStaList = staTreeMap.get(staTreeMap.firstKey()); - BizEquipmentStandardCheckDataResistanceThermometer lowerSta = lowerStaList.get(0); - Map lowerStaMap = BeanUtil.beanToMap(lowerSta); - mapReplace(lowerStaMap); - if (lowerSta.getLessThan() == null) { - lowerStaMap.put("conclusion", ""); - } else { - lowerStaMap.put("conclusion", lowerSta.getLessThan() == 0 ? "否" : "是"); - } - 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) { - upperStaMap.put("conclusion", ""); - } else { - upperStaMap.put("conclusion", lowerSta.getLessThan() == 0 ? "否" : "是"); - } - map.put("upperSta", upperStaMap); - //RTP值重复性 - List rtpRepList = thermometerList.stream() - .filter(t -> RTP.equals(t.getParams()) && REPEATABILITY.equals(t.getCheckType())) - .collect(Collectors.toList()); - 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 rtpStaMap = BeanUtil.beanToMap(rtpStaList.get(0)); - mapReplace(rtpStaMap); - map.put("RTPSta", rtpStaMap); - - //绝缘电阻表校准 - 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); - + map.put("pdfStatus", 1); String wordUrl = printFileRegister.registerPrintFile(RESISTANCE_THERMOMETER_CHECK_DATA, "数据打印", null, map, false, null, null); List urlList = new ArrayList<>(); if (StringUtils.isNotEmpty(wordUrl)) { @@ -154,6 +88,82 @@ } } + /** + * 准备核查填充参数 + * @param thermometerList + * @param map + */ + private void prepareCheckParams(List thermometerList, Map map) { + //最低和最高温度点重复性 + TreeMap> repTreeMap = thermometerList.stream() + .filter(t -> TEMPERATURE.equals(t.getParams()) + && REPEATABILITY.equals(t.getCheckType())) + .collect(Collectors.groupingBy( + BizEquipmentStandardCheckDataResistanceThermometer::getCheckPoint, + () -> new TreeMap<>(getComparator()), + Collectors.toList())); + + 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())) + .collect(Collectors.groupingBy(BizEquipmentStandardCheckDataResistanceThermometer::getCheckPoint, + () -> new TreeMap<>(getComparator()), + Collectors.toList())); + + List lowerStaList = staTreeMap.get(staTreeMap.firstKey()); + BizEquipmentStandardCheckDataResistanceThermometer lowerSta = lowerStaList.get(0); + Map lowerStaMap = BeanUtil.beanToMap(lowerSta); + mapReplace(lowerStaMap); + if (lowerSta.getLessThan() == null) { + lowerStaMap.put("conclusion", ""); + } else { + lowerStaMap.put("conclusion", lowerSta.getLessThan() == 0 ? "否" : "是"); + } + 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) { + upperStaMap.put("conclusion", ""); + } else { + upperStaMap.put("conclusion", lowerSta.getLessThan() == 0 ? "否" : "是"); + } + map.put("upperSta", upperStaMap); + //RTP值重复性 + List rtpRepList = thermometerList.stream() + .filter(t -> RTP.equals(t.getParams()) && REPEATABILITY.equals(t.getCheckType())) + .collect(Collectors.toList()); + 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 rtpStaMap = BeanUtil.beanToMap(rtpStaList.get(0)); + mapReplace(rtpStaMap); + map.put("RTPSta", rtpStaMap); + + //绝缘电阻表校准 + 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); + } + private Comparator getComparator() { return (s1, s2) -> { int v1 = Integer.parseInt(s1);