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 4a811ba..877bc82 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 @@ -35,7 +35,7 @@ /** * @Author: TuT * @CreateTime: 2024-02-21 15:30 - * @Description: DCPowerSupplyHandler + * @Description: DCPowerSupplyHandler 直流稳压电源 */ @Component(MeasureItemBelongStandardEquipmentDictEnum.DC_POWER) @RequiredArgsConstructor @@ -62,7 +62,7 @@ } 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}; + 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); @@ -102,7 +102,7 @@ } 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"); @@ -143,7 +143,7 @@ } map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF0A3"); map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF0A3"); - if (1==staList.get(0).getQualified()) { + if (1 == staList.get(0).getQualified()) { map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF052"); } else { map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF052"); @@ -151,7 +151,6 @@ map.put(STA_PREFIX + 5, repMapList); } - ArrayList list = new ArrayList<>(); //除了选用的模板不一致,模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY_CHECK_DATA, "数据打印", null, map, false, null, null); List urlList = new ArrayList<>(); @@ -272,10 +271,11 @@ templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "1", request.getItemCategoryName())); //与证书模板区分 SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); + map.put("pdfStatus", 1); map.put("id", snowflakeUtil.nextId()); log.debug("original before ----"); //除了选用的模板不一致,模板配置流程是一致的 - String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, templateUrls); + String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); urlList.add(originalWordUrlFile); 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 4a811ba..877bc82 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 @@ -35,7 +35,7 @@ /** * @Author: TuT * @CreateTime: 2024-02-21 15:30 - * @Description: DCPowerSupplyHandler + * @Description: DCPowerSupplyHandler 直流稳压电源 */ @Component(MeasureItemBelongStandardEquipmentDictEnum.DC_POWER) @RequiredArgsConstructor @@ -62,7 +62,7 @@ } 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}; + 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); @@ -102,7 +102,7 @@ } 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"); @@ -143,7 +143,7 @@ } map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF0A3"); map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF0A3"); - if (1==staList.get(0).getQualified()) { + if (1 == staList.get(0).getQualified()) { map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF052"); } else { map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF052"); @@ -151,7 +151,6 @@ map.put(STA_PREFIX + 5, repMapList); } - ArrayList list = new ArrayList<>(); //除了选用的模板不一致,模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY_CHECK_DATA, "数据打印", null, map, false, null, null); List urlList = new ArrayList<>(); @@ -272,10 +271,11 @@ templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "1", request.getItemCategoryName())); //与证书模板区分 SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); + map.put("pdfStatus", 1); map.put("id", snowflakeUtil.nextId()); log.debug("original before ----"); //除了选用的模板不一致,模板配置流程是一致的 - String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, templateUrls); + String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); urlList.add(originalWordUrlFile); 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 3aa20cc..454fc65 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 @@ -37,7 +37,7 @@ /** * @Author: TuT * @CreateTime: 2024-01-29 11:07 - * @Description: MultiElectricalHandler + * @Description: MultiElectricalHandler 多功能电气安全校准器 */ @Component(MeasureItemBelongStandardEquipmentDictEnum.ELECTRICAL_SAFETY) @RequiredArgsConstructor 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 4a811ba..877bc82 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 @@ -35,7 +35,7 @@ /** * @Author: TuT * @CreateTime: 2024-02-21 15:30 - * @Description: DCPowerSupplyHandler + * @Description: DCPowerSupplyHandler 直流稳压电源 */ @Component(MeasureItemBelongStandardEquipmentDictEnum.DC_POWER) @RequiredArgsConstructor @@ -62,7 +62,7 @@ } 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}; + 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); @@ -102,7 +102,7 @@ } 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"); @@ -143,7 +143,7 @@ } map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF0A3"); map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF0A3"); - if (1==staList.get(0).getQualified()) { + if (1 == staList.get(0).getQualified()) { map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF052"); } else { map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF052"); @@ -151,7 +151,6 @@ map.put(STA_PREFIX + 5, repMapList); } - ArrayList list = new ArrayList<>(); //除了选用的模板不一致,模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY_CHECK_DATA, "数据打印", null, map, false, null, null); List urlList = new ArrayList<>(); @@ -272,10 +271,11 @@ templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "1", request.getItemCategoryName())); //与证书模板区分 SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); + map.put("pdfStatus", 1); map.put("id", snowflakeUtil.nextId()); log.debug("original before ----"); //除了选用的模板不一致,模板配置流程是一致的 - String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, templateUrls); + String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); urlList.add(originalWordUrlFile); 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 3aa20cc..454fc65 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 @@ -37,7 +37,7 @@ /** * @Author: TuT * @CreateTime: 2024-01-29 11:07 - * @Description: MultiElectricalHandler + * @Description: MultiElectricalHandler 多功能电气安全校准器 */ @Component(MeasureItemBelongStandardEquipmentDictEnum.ELECTRICAL_SAFETY) @RequiredArgsConstructor 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 8fe1813..e59adc6 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 @@ -34,7 +34,7 @@ /** * @Author: TuT * @CreateTime: 2024-02-23 10:34 - * @Description: ResistanceThermometerHandler + * @Description: ResistanceThermometerHandler 二等铂电阻温度计 */ @Component(MeasureItemBelongStandardEquipmentDictEnum.RESISTANCE_THERMOMETER) @RequiredArgsConstructor @@ -70,21 +70,21 @@ return null; } - Comparator comparator = (s1, s2) -> { - int v1 = Integer.parseInt(s1); - int v2 = Integer.parseInt(s2); - - // 先按绝对值降序,如果绝对值相等,则按原值升序(使得负数在正数后) - return Math.abs(v2) != Math.abs(v1) - ? Integer.compare(Math.abs(v2), Math.abs(v1)) - : Integer.compare(v1, v2); - }; +// Comparator comparator = (s1, s2) -> { +// int v1 = Integer.parseInt(s1); +// int v2 = Integer.parseInt(s2); +// +// // 先按绝对值降序,如果绝对值相等,则按原值升序(使得负数在正数后) +// return Math.abs(v2) != Math.abs(v1) +// ? Integer.compare(Math.abs(v2), Math.abs(v1)) +// : Integer.compare(v1, v2); +// }; //最低和最高温度点重复性 TreeMap> repTreeMap = thermometerList.stream() .filter(t -> TEMPERATURE.equals(t.getParams()) && REPEATABILITY.equals(t.getCheckType())) .collect(Collectors.groupingBy(BizEquipmentStandardCheckDataResistanceThermometer::getCheckPoint, - () -> new TreeMap<>(comparator), + () -> new TreeMap<>(getComparator()), Collectors.toList())); map.put("lowerRep", repTreeMap.get(repTreeMap.firstKey()).get(0)); @@ -93,7 +93,7 @@ TreeMap> staTreeMap = thermometerList.stream() .filter(t -> TEMPERATURE.equals(t.getParams()) && STABILITY.equals(t.getCheckType())) .collect(Collectors.groupingBy(BizEquipmentStandardCheckDataResistanceThermometer::getCheckPoint, - () -> new TreeMap<>(comparator), + () -> new TreeMap<>(getComparator()), Collectors.toList())); List lowerStaList = staTreeMap.get(staTreeMap.firstKey()); @@ -137,6 +137,18 @@ } } + private Comparator getComparator() { + return (s1, s2) -> { + int v1 = Integer.parseInt(s1); + int v2 = Integer.parseInt(s2); + + // 先按绝对值降序,如果绝对值相等,则按原值升序(使得负数在正数后) + return Math.abs(v2) != Math.abs(v1) + ? Integer.compare(Math.abs(v2), Math.abs(v1)) + : Integer.compare(v1, v2); + }; + } + @Override public List doCreateOriginalFile(BizBusinessDeviceMeasureApproval request) { try { @@ -244,6 +256,19 @@ map.put("volUpper", volUpperList.get(0)); map.put("volUpperList", volUpperMapList); + //最大波动性 + List volList = resistanceThermometerList.stream() + .filter(t -> "1".equals(t.getDataType())) + .map(BizBusinessDeviceMeasureDataResistanceThermometer::getVolatility) + .sorted(Comparator.reverseOrder()) + .collect(Collectors.toList()); + String maxVolatility = null; + if (!CollectionUtils.isEmpty(volList)){ + maxVolatility = volList.get(0); + + } + 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); @@ -265,6 +290,17 @@ map.put("uniLowerList", uniLowerMapList); map.put("uniUpper", uniUpperList.get(0)); 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); + } + map.put("maxWorkTemperatureDifferent",maxWorkTemperatureDifferent); + } 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 4a811ba..877bc82 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 @@ -35,7 +35,7 @@ /** * @Author: TuT * @CreateTime: 2024-02-21 15:30 - * @Description: DCPowerSupplyHandler + * @Description: DCPowerSupplyHandler 直流稳压电源 */ @Component(MeasureItemBelongStandardEquipmentDictEnum.DC_POWER) @RequiredArgsConstructor @@ -62,7 +62,7 @@ } 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}; + 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); @@ -102,7 +102,7 @@ } 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"); @@ -143,7 +143,7 @@ } map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF0A3"); map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF0A3"); - if (1==staList.get(0).getQualified()) { + if (1 == staList.get(0).getQualified()) { map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF052"); } else { map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF052"); @@ -151,7 +151,6 @@ map.put(STA_PREFIX + 5, repMapList); } - ArrayList list = new ArrayList<>(); //除了选用的模板不一致,模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY_CHECK_DATA, "数据打印", null, map, false, null, null); List urlList = new ArrayList<>(); @@ -272,10 +271,11 @@ templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "1", request.getItemCategoryName())); //与证书模板区分 SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); + map.put("pdfStatus", 1); map.put("id", snowflakeUtil.nextId()); log.debug("original before ----"); //除了选用的模板不一致,模板配置流程是一致的 - String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, templateUrls); + String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); urlList.add(originalWordUrlFile); 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 3aa20cc..454fc65 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 @@ -37,7 +37,7 @@ /** * @Author: TuT * @CreateTime: 2024-01-29 11:07 - * @Description: MultiElectricalHandler + * @Description: MultiElectricalHandler 多功能电气安全校准器 */ @Component(MeasureItemBelongStandardEquipmentDictEnum.ELECTRICAL_SAFETY) @RequiredArgsConstructor 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 8fe1813..e59adc6 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 @@ -34,7 +34,7 @@ /** * @Author: TuT * @CreateTime: 2024-02-23 10:34 - * @Description: ResistanceThermometerHandler + * @Description: ResistanceThermometerHandler 二等铂电阻温度计 */ @Component(MeasureItemBelongStandardEquipmentDictEnum.RESISTANCE_THERMOMETER) @RequiredArgsConstructor @@ -70,21 +70,21 @@ return null; } - Comparator comparator = (s1, s2) -> { - int v1 = Integer.parseInt(s1); - int v2 = Integer.parseInt(s2); - - // 先按绝对值降序,如果绝对值相等,则按原值升序(使得负数在正数后) - return Math.abs(v2) != Math.abs(v1) - ? Integer.compare(Math.abs(v2), Math.abs(v1)) - : Integer.compare(v1, v2); - }; +// Comparator comparator = (s1, s2) -> { +// int v1 = Integer.parseInt(s1); +// int v2 = Integer.parseInt(s2); +// +// // 先按绝对值降序,如果绝对值相等,则按原值升序(使得负数在正数后) +// return Math.abs(v2) != Math.abs(v1) +// ? Integer.compare(Math.abs(v2), Math.abs(v1)) +// : Integer.compare(v1, v2); +// }; //最低和最高温度点重复性 TreeMap> repTreeMap = thermometerList.stream() .filter(t -> TEMPERATURE.equals(t.getParams()) && REPEATABILITY.equals(t.getCheckType())) .collect(Collectors.groupingBy(BizEquipmentStandardCheckDataResistanceThermometer::getCheckPoint, - () -> new TreeMap<>(comparator), + () -> new TreeMap<>(getComparator()), Collectors.toList())); map.put("lowerRep", repTreeMap.get(repTreeMap.firstKey()).get(0)); @@ -93,7 +93,7 @@ TreeMap> staTreeMap = thermometerList.stream() .filter(t -> TEMPERATURE.equals(t.getParams()) && STABILITY.equals(t.getCheckType())) .collect(Collectors.groupingBy(BizEquipmentStandardCheckDataResistanceThermometer::getCheckPoint, - () -> new TreeMap<>(comparator), + () -> new TreeMap<>(getComparator()), Collectors.toList())); List lowerStaList = staTreeMap.get(staTreeMap.firstKey()); @@ -137,6 +137,18 @@ } } + private Comparator getComparator() { + return (s1, s2) -> { + int v1 = Integer.parseInt(s1); + int v2 = Integer.parseInt(s2); + + // 先按绝对值降序,如果绝对值相等,则按原值升序(使得负数在正数后) + return Math.abs(v2) != Math.abs(v1) + ? Integer.compare(Math.abs(v2), Math.abs(v1)) + : Integer.compare(v1, v2); + }; + } + @Override public List doCreateOriginalFile(BizBusinessDeviceMeasureApproval request) { try { @@ -244,6 +256,19 @@ map.put("volUpper", volUpperList.get(0)); map.put("volUpperList", volUpperMapList); + //最大波动性 + List volList = resistanceThermometerList.stream() + .filter(t -> "1".equals(t.getDataType())) + .map(BizBusinessDeviceMeasureDataResistanceThermometer::getVolatility) + .sorted(Comparator.reverseOrder()) + .collect(Collectors.toList()); + String maxVolatility = null; + if (!CollectionUtils.isEmpty(volList)){ + maxVolatility = volList.get(0); + + } + 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); @@ -265,6 +290,17 @@ map.put("uniLowerList", uniLowerMapList); map.put("uniUpper", uniUpperList.get(0)); 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); + } + map.put("maxWorkTemperatureDifferent",maxWorkTemperatureDifferent); + } 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 30c9fea..aac6521 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 @@ -35,7 +35,7 @@ /** * @Author: TuT * @CreateTime: 2024-02-22 10:16 - * @Description: SateyValueHandler + * @Description: SateyValueHandler 安全阀 */ @Component(MeasureItemBelongStandardEquipmentDictEnum.SAFETY_VALVE) @RequiredArgsConstructor 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 4a811ba..877bc82 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 @@ -35,7 +35,7 @@ /** * @Author: TuT * @CreateTime: 2024-02-21 15:30 - * @Description: DCPowerSupplyHandler + * @Description: DCPowerSupplyHandler 直流稳压电源 */ @Component(MeasureItemBelongStandardEquipmentDictEnum.DC_POWER) @RequiredArgsConstructor @@ -62,7 +62,7 @@ } 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}; + 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); @@ -102,7 +102,7 @@ } 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"); @@ -143,7 +143,7 @@ } map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF0A3"); map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF0A3"); - if (1==staList.get(0).getQualified()) { + if (1 == staList.get(0).getQualified()) { map.put(STA_PREFIX + 5 + UP_STANDARD, "\uF052"); } else { map.put(STA_PREFIX + 5 + BELOW_STANDARD, "\uF052"); @@ -151,7 +151,6 @@ map.put(STA_PREFIX + 5, repMapList); } - ArrayList list = new ArrayList<>(); //除了选用的模板不一致,模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY_CHECK_DATA, "数据打印", null, map, false, null, null); List urlList = new ArrayList<>(); @@ -272,10 +271,11 @@ templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "1", request.getItemCategoryName())); //与证书模板区分 SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); + map.put("pdfStatus", 1); map.put("id", snowflakeUtil.nextId()); log.debug("original before ----"); //除了选用的模板不一致,模板配置流程是一致的 - String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, templateUrls); + String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); urlList.add(originalWordUrlFile); 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 3aa20cc..454fc65 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 @@ -37,7 +37,7 @@ /** * @Author: TuT * @CreateTime: 2024-01-29 11:07 - * @Description: MultiElectricalHandler + * @Description: MultiElectricalHandler 多功能电气安全校准器 */ @Component(MeasureItemBelongStandardEquipmentDictEnum.ELECTRICAL_SAFETY) @RequiredArgsConstructor 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 8fe1813..e59adc6 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 @@ -34,7 +34,7 @@ /** * @Author: TuT * @CreateTime: 2024-02-23 10:34 - * @Description: ResistanceThermometerHandler + * @Description: ResistanceThermometerHandler 二等铂电阻温度计 */ @Component(MeasureItemBelongStandardEquipmentDictEnum.RESISTANCE_THERMOMETER) @RequiredArgsConstructor @@ -70,21 +70,21 @@ return null; } - Comparator comparator = (s1, s2) -> { - int v1 = Integer.parseInt(s1); - int v2 = Integer.parseInt(s2); - - // 先按绝对值降序,如果绝对值相等,则按原值升序(使得负数在正数后) - return Math.abs(v2) != Math.abs(v1) - ? Integer.compare(Math.abs(v2), Math.abs(v1)) - : Integer.compare(v1, v2); - }; +// Comparator comparator = (s1, s2) -> { +// int v1 = Integer.parseInt(s1); +// int v2 = Integer.parseInt(s2); +// +// // 先按绝对值降序,如果绝对值相等,则按原值升序(使得负数在正数后) +// return Math.abs(v2) != Math.abs(v1) +// ? Integer.compare(Math.abs(v2), Math.abs(v1)) +// : Integer.compare(v1, v2); +// }; //最低和最高温度点重复性 TreeMap> repTreeMap = thermometerList.stream() .filter(t -> TEMPERATURE.equals(t.getParams()) && REPEATABILITY.equals(t.getCheckType())) .collect(Collectors.groupingBy(BizEquipmentStandardCheckDataResistanceThermometer::getCheckPoint, - () -> new TreeMap<>(comparator), + () -> new TreeMap<>(getComparator()), Collectors.toList())); map.put("lowerRep", repTreeMap.get(repTreeMap.firstKey()).get(0)); @@ -93,7 +93,7 @@ TreeMap> staTreeMap = thermometerList.stream() .filter(t -> TEMPERATURE.equals(t.getParams()) && STABILITY.equals(t.getCheckType())) .collect(Collectors.groupingBy(BizEquipmentStandardCheckDataResistanceThermometer::getCheckPoint, - () -> new TreeMap<>(comparator), + () -> new TreeMap<>(getComparator()), Collectors.toList())); List lowerStaList = staTreeMap.get(staTreeMap.firstKey()); @@ -137,6 +137,18 @@ } } + private Comparator getComparator() { + return (s1, s2) -> { + int v1 = Integer.parseInt(s1); + int v2 = Integer.parseInt(s2); + + // 先按绝对值降序,如果绝对值相等,则按原值升序(使得负数在正数后) + return Math.abs(v2) != Math.abs(v1) + ? Integer.compare(Math.abs(v2), Math.abs(v1)) + : Integer.compare(v1, v2); + }; + } + @Override public List doCreateOriginalFile(BizBusinessDeviceMeasureApproval request) { try { @@ -244,6 +256,19 @@ map.put("volUpper", volUpperList.get(0)); map.put("volUpperList", volUpperMapList); + //最大波动性 + List volList = resistanceThermometerList.stream() + .filter(t -> "1".equals(t.getDataType())) + .map(BizBusinessDeviceMeasureDataResistanceThermometer::getVolatility) + .sorted(Comparator.reverseOrder()) + .collect(Collectors.toList()); + String maxVolatility = null; + if (!CollectionUtils.isEmpty(volList)){ + maxVolatility = volList.get(0); + + } + 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); @@ -265,6 +290,17 @@ map.put("uniLowerList", uniLowerMapList); map.put("uniUpper", uniUpperList.get(0)); 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); + } + map.put("maxWorkTemperatureDifferent",maxWorkTemperatureDifferent); + } 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 30c9fea..aac6521 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 @@ -35,7 +35,7 @@ /** * @Author: TuT * @CreateTime: 2024-02-22 10:16 - * @Description: SateyValueHandler + * @Description: SateyValueHandler 安全阀 */ @Component(MeasureItemBelongStandardEquipmentDictEnum.SAFETY_VALVE) @RequiredArgsConstructor diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java index 947c80a..4f1b923 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java @@ -116,14 +116,14 @@ log.error("文件打印出现异常,打印参数信息为{},异常信息为{}", JSON.toJSON(filePrintRegister), rex); } finally { //如果文件路径不为空,回传文件流 - if (StringUtils.isNotEmpty(printDocUrl)) { - miniName = createResponseFileInput(printDocUrl, response); - } - //删除无效的文件 - File invalidFile = new File(tempLocalFileDir); - // 删除运行空间下的文件 - deleteFile(invalidFile); - log.info("证书打印完成......,证书名称为{}", miniName); +// if (StringUtils.isNotEmpty(printDocUrl)) { +// miniName = createResponseFileInput(printDocUrl, response); +// } +// //删除无效的文件 +// File invalidFile = new File(tempLocalFileDir); +// // 删除运行空间下的文件 +// deleteFile(invalidFile); +// log.info("证书打印完成......,证书名称为{}", miniName); } return miniName; }