diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java index b2974b4..2b3a3af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java @@ -382,6 +382,10 @@ @TableField(exist = false) private Integer colorMark = 0; + @ApiModelProperty(value = "测量范围",dataType = "String") + @TableField(exist = false) + private String range; + @ApiModelProperty(value = "技术指标", dataType = "List") @TableField(exist = false) private List technicalTargetList; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java index b2974b4..2b3a3af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java @@ -382,6 +382,10 @@ @TableField(exist = false) private Integer colorMark = 0; + @ApiModelProperty(value = "测量范围",dataType = "String") + @TableField(exist = false) + private String range; + @ApiModelProperty(value = "技术指标", dataType = "List") @TableField(exist = false) private List technicalTargetList; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java index 5e37fa3..d8a97c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java @@ -83,11 +83,9 @@ } } - private void readyForCheckDataParams(Map map, List checkDataCesiumAtomList) { - Map> groupMap = checkDataCesiumAtomList.stream().collect(Collectors.groupingBy(BizEquipmentStandardCheckDataCesiumAtom::getParams)); - + private void readyForCheckDataParams(Map map, List atomList) { //铯原子频标 - List cesiumAtomList = groupMap.get("1").stream().map(atom -> { + List cesiumAtomList = atomList.stream().filter(a -> "1".equals(a.getParams())).map(atom -> { atom.setCheckPoint(StringUtils.isNotBlank(atom.getCheckPoint()) ? atom.getCheckPoint() + atom.getUnit() : ""); atom.setElectricalLevel(StringUtils.isNotBlank(atom.getElectricalLevel()) ? atom.getElectricalLevel() + atom.getElectricalLevelUnit() : ""); atom.setAmplitude(StringUtils.isNotBlank(atom.getAmplitude()) ? atom.getAmplitude() + atom.getAmplitudeUnit() : ""); @@ -109,7 +107,7 @@ map.put(STA_PREFIX + 1 + DATE_PREFIX + 6, atom.getTestValueSixDate()); //函数信号发生器 - List funcationList = groupMap.get("2").stream().map(fun -> { + List funcationList = atomList.stream().filter(a -> "2".equals(a.getParams())).map(fun -> { fun.setCheckPoint(StringUtils.isNotBlank(fun.getCheckPoint()) ? fun.getCheckPoint() + fun.getUnit() : ""); fun.setElectricalLevel(StringUtils.isNotBlank(fun.getElectricalLevel()) ? fun.getElectricalLevel() + fun.getElectricalLevelUnit() : ""); fun.setAmplitude(StringUtils.isNotBlank(fun.getAmplitude()) ? fun.getAmplitude() + fun.getAmplitudeUnit() : ""); @@ -130,7 +128,7 @@ map.put(STA_PREFIX + 2 + DATE_PREFIX + 5, fun.getTestValueFiveDate()); map.put(STA_PREFIX + 2 + DATE_PREFIX + 6, fun.getTestValueSixDate()); - List signalList = groupMap.get("3").stream().map(signal -> { + List signalList = atomList.stream().filter(a -> "3".equals(a.getParams())).map(signal -> { signal.setCheckPoint(StringUtils.isNotBlank(signal.getCheckPoint()) ? signal.getCheckPoint() + signal.getUnit() : ""); signal.setElectricalLevel(StringUtils.isNotBlank(signal.getElectricalLevel()) ? signal.getElectricalLevel() + signal.getElectricalLevelUnit() : ""); signal.setAmplitude(StringUtils.isNotBlank(signal.getAmplitude()) ? signal.getAmplitude() + signal.getAmplitudeUnit() : ""); @@ -163,12 +161,6 @@ log.debug("校验没有原始记录"); return null; } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -220,97 +212,92 @@ } private void readyForMicrowaveCounter(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); //晶振开机特性 - List startupList = groupMap.get("1"); + List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0); map.put("gateTime1", cesiumAtom.getGateTime()); map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency()); map.put("groupNumber1", cesiumAtom.getSampleGroupNumber()); + map.put("startupList", startupList); //晶振1s频率稳定度 - List stabilityList = groupMap.get("2"); + List stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0); map.put("gateTime2", stability.getGateTime()); map.put("multiplyTimes2", stability.getMultiplyFrequency()); map.put("groupNumber2", stability.getSampleGroupNumber()); + map.put("stabilityList", stabilityList); //晶振相对频率偏差 - List deviationList = groupMap.get("3"); + List deviationList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom deviation = deviationList.get(0); map.put("gateTime3", deviation.getGateTime()); map.put("multiplyTimes3", deviation.getMultiplyFrequency()); + map.put("deviationList", deviationList); //晶振频率复现性 - List reproList = groupMap.get("4"); + List reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0); map.put("gateTime4", repro.getGateTime()); map.put("multiplyTimes4", repro.getMultiplyFrequency()); map.put("tOne", repro.getTOne()); map.put("tTwo", repro.getTTwo()); + map.put("reproList", reproList); //晶振日老化率 - List dailyList = groupMap.get("5"); + List dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0); map.put("gateTime5", daily.getGateTime()); map.put("multiplyTimes5", daily.getMultiplyFrequency()); map.put("groupNumber5", daily.getSerialNumber()); - //频率测量范围、输入灵敏度及最大输入电平 - List levelList = groupMap.get("6"); - //频率测量误差 - List errorList = groupMap.get("7"); - - map.put("startupList", startupList); - map.put("stabilityList", stabilityList); - map.put("deviationList", deviationList); - map.put("reproList", reproList); map.put("dailyList", dailyList); + //频率测量范围、输入灵敏度及最大输入电平 + List levelList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); map.put("levelList", levelList); + //频率测量误差 + List errorList = atomList.stream().filter(a -> "7".equals(a.getDataType())).collect(Collectors.toList()); map.put("errorList", errorList); } private void readyForUniversalCounter(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); //晶振开机 - List startupList = groupMap.get("1"); + List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0); map.put("gateTime1", cesiumAtom.getGateTime()); map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency()); map.put("groupNumber1", cesiumAtom.getGroupNumber()); //晶振1s频率稳定度 - List stabilityList = groupMap.get("2"); + List stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0); map.put("gateTime2", stability.getGateTime()); map.put("multiplyTimes2", stability.getMultiplyFrequency()); map.put("groupNumber2", stability.getGroupNumber()); //晶振相对频率偏差 - List relativeList = groupMap.get("3"); + List relativeList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0); map.put("gateTime3", relative.getGateTime()); map.put("multiplyTimes3", relative.getMultiplyFrequency()); //晶振频率复现性 - List reproList = groupMap.get("4"); + List reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0); map.put("gateTime4", repro.getGateTime()); map.put("multiplyTimes4", repro.getMultiplyFrequency()); map.put("tOne", repro.getTOne()); map.put("tTwo", repro.getTTwo()); //晶振日老化率 - List dailyList = groupMap.get("5"); + List dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0); map.put("gateTime5", daily.getGateTime()); map.put("multiplyTimes5", daily.getMultiplyFrequency()); map.put("groupNumber5", daily.getGroupNumber()); //频率测量范围、输入灵敏度 - List freqList = groupMap.get("6"); + List freqList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); //频率测量误差 - List freqErrorList = groupMap.get("7"); + List freqErrorList = atomList.stream().filter(a -> "7".equals(a.getDataType())).collect(Collectors.toList()); //周期测量范围、输入灵敏度 - List cycleList = groupMap.get("8"); + List cycleList = atomList.stream().filter(a -> "8".equals(a.getDataType())).collect(Collectors.toList()); //周期测量误差 - List cycleErrorList = groupMap.get("9"); + List cycleErrorList = atomList.stream().filter(a -> "9".equals(a.getDataType())).collect(Collectors.toList()); //时间间隔测量范围及测量误差 - List timeIntervalList = groupMap.get("10"); + List timeIntervalList = atomList.stream().filter(a -> "10".equals(a.getDataType())).collect(Collectors.toList()); map.put("startupList", startupList); map.put("stabilityList", stabilityList); @@ -325,26 +312,23 @@ } private void readyForRubidiumClock(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); - //输出信号 - List outputList = groupMap.get(FREQUENCY_SIGNAL_OUTPUT_AMPLITUDE); + List outputList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); //开机特性 - List bootList = groupMap.get(SECOND_PULSE_OUTPUT); + List bootList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); //频率稳定度 - List stabilityList = groupMap.get(FREQUENCY_STABILITY); + List stabilityList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); //相对频率偏差 - List relativeList = groupMap.get(RELATIVE_FREQUENCY_DEVIATION); + List relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); //频率复现性 - List reproList = groupMap.get(FREQUENCY_REPRODUCIBILITY); + List reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = reproList.get(0); map.put("tOne", cesiumAtom.getTOne()); map.put("tTwo", cesiumAtom.getTTwo()); map.put("tThree", cesiumAtom.getTThree()); //日频率漂移率 - List dailyList = groupMap.get(DAILY_AGING_RATE_OF_CRYSTAL_OSCILLATOR); + List dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); map.put("outputList", outputList); map.put("bootList", bootList); @@ -354,22 +338,19 @@ map.put("dailyList", dailyList); } - private void readyForCrystalOscillator(Map map, List cesiumAtomList) throws Exception { - //根据dataType进行分组，key为dataType值，value为具体List - Map> groupMap = cesiumAtomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); + private void readyForCrystalOscillator(Map map, List atomList) throws Exception { //频率信号输出幅度 - List outputList = groupMap.get(FREQUENCY_SIGNAL_OUTPUT_AMPLITUDE); + List outputList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); //秒脉冲输出 - List pulseList = groupMap.get(SECOND_PULSE_OUTPUT); + List pulseList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); //频率稳定度 - List stabilityList = groupMap.get(FREQUENCY_STABILITY); + List stabilityList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); //相对频率偏差 - List relativeList = groupMap.get(RELATIVE_FREQUENCY_DEVIATION); + List relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); //频率复现性 - List reproList = groupMap.get(FREQUENCY_REPRODUCIBILITY); + List reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); //晶振日老化率 - List dailyList = groupMap.get(DAILY_AGING_RATE_OF_CRYSTAL_OSCILLATOR); + List dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0); map.put("relativeGateTime", relative.getGateTime()); @@ -401,18 +382,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } - - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -440,7 +409,6 @@ default: throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST); } - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java index b2974b4..2b3a3af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java @@ -382,6 +382,10 @@ @TableField(exist = false) private Integer colorMark = 0; + @ApiModelProperty(value = "测量范围",dataType = "String") + @TableField(exist = false) + private String range; + @ApiModelProperty(value = "技术指标", dataType = "List") @TableField(exist = false) private List technicalTargetList; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java index 5e37fa3..d8a97c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java @@ -83,11 +83,9 @@ } } - private void readyForCheckDataParams(Map map, List checkDataCesiumAtomList) { - Map> groupMap = checkDataCesiumAtomList.stream().collect(Collectors.groupingBy(BizEquipmentStandardCheckDataCesiumAtom::getParams)); - + private void readyForCheckDataParams(Map map, List atomList) { //铯原子频标 - List cesiumAtomList = groupMap.get("1").stream().map(atom -> { + List cesiumAtomList = atomList.stream().filter(a -> "1".equals(a.getParams())).map(atom -> { atom.setCheckPoint(StringUtils.isNotBlank(atom.getCheckPoint()) ? atom.getCheckPoint() + atom.getUnit() : ""); atom.setElectricalLevel(StringUtils.isNotBlank(atom.getElectricalLevel()) ? atom.getElectricalLevel() + atom.getElectricalLevelUnit() : ""); atom.setAmplitude(StringUtils.isNotBlank(atom.getAmplitude()) ? atom.getAmplitude() + atom.getAmplitudeUnit() : ""); @@ -109,7 +107,7 @@ map.put(STA_PREFIX + 1 + DATE_PREFIX + 6, atom.getTestValueSixDate()); //函数信号发生器 - List funcationList = groupMap.get("2").stream().map(fun -> { + List funcationList = atomList.stream().filter(a -> "2".equals(a.getParams())).map(fun -> { fun.setCheckPoint(StringUtils.isNotBlank(fun.getCheckPoint()) ? fun.getCheckPoint() + fun.getUnit() : ""); fun.setElectricalLevel(StringUtils.isNotBlank(fun.getElectricalLevel()) ? fun.getElectricalLevel() + fun.getElectricalLevelUnit() : ""); fun.setAmplitude(StringUtils.isNotBlank(fun.getAmplitude()) ? fun.getAmplitude() + fun.getAmplitudeUnit() : ""); @@ -130,7 +128,7 @@ map.put(STA_PREFIX + 2 + DATE_PREFIX + 5, fun.getTestValueFiveDate()); map.put(STA_PREFIX + 2 + DATE_PREFIX + 6, fun.getTestValueSixDate()); - List signalList = groupMap.get("3").stream().map(signal -> { + List signalList = atomList.stream().filter(a -> "3".equals(a.getParams())).map(signal -> { signal.setCheckPoint(StringUtils.isNotBlank(signal.getCheckPoint()) ? signal.getCheckPoint() + signal.getUnit() : ""); signal.setElectricalLevel(StringUtils.isNotBlank(signal.getElectricalLevel()) ? signal.getElectricalLevel() + signal.getElectricalLevelUnit() : ""); signal.setAmplitude(StringUtils.isNotBlank(signal.getAmplitude()) ? signal.getAmplitude() + signal.getAmplitudeUnit() : ""); @@ -163,12 +161,6 @@ log.debug("校验没有原始记录"); return null; } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -220,97 +212,92 @@ } private void readyForMicrowaveCounter(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); //晶振开机特性 - List startupList = groupMap.get("1"); + List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0); map.put("gateTime1", cesiumAtom.getGateTime()); map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency()); map.put("groupNumber1", cesiumAtom.getSampleGroupNumber()); + map.put("startupList", startupList); //晶振1s频率稳定度 - List stabilityList = groupMap.get("2"); + List stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0); map.put("gateTime2", stability.getGateTime()); map.put("multiplyTimes2", stability.getMultiplyFrequency()); map.put("groupNumber2", stability.getSampleGroupNumber()); + map.put("stabilityList", stabilityList); //晶振相对频率偏差 - List deviationList = groupMap.get("3"); + List deviationList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom deviation = deviationList.get(0); map.put("gateTime3", deviation.getGateTime()); map.put("multiplyTimes3", deviation.getMultiplyFrequency()); + map.put("deviationList", deviationList); //晶振频率复现性 - List reproList = groupMap.get("4"); + List reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0); map.put("gateTime4", repro.getGateTime()); map.put("multiplyTimes4", repro.getMultiplyFrequency()); map.put("tOne", repro.getTOne()); map.put("tTwo", repro.getTTwo()); + map.put("reproList", reproList); //晶振日老化率 - List dailyList = groupMap.get("5"); + List dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0); map.put("gateTime5", daily.getGateTime()); map.put("multiplyTimes5", daily.getMultiplyFrequency()); map.put("groupNumber5", daily.getSerialNumber()); - //频率测量范围、输入灵敏度及最大输入电平 - List levelList = groupMap.get("6"); - //频率测量误差 - List errorList = groupMap.get("7"); - - map.put("startupList", startupList); - map.put("stabilityList", stabilityList); - map.put("deviationList", deviationList); - map.put("reproList", reproList); map.put("dailyList", dailyList); + //频率测量范围、输入灵敏度及最大输入电平 + List levelList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); map.put("levelList", levelList); + //频率测量误差 + List errorList = atomList.stream().filter(a -> "7".equals(a.getDataType())).collect(Collectors.toList()); map.put("errorList", errorList); } private void readyForUniversalCounter(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); //晶振开机 - List startupList = groupMap.get("1"); + List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0); map.put("gateTime1", cesiumAtom.getGateTime()); map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency()); map.put("groupNumber1", cesiumAtom.getGroupNumber()); //晶振1s频率稳定度 - List stabilityList = groupMap.get("2"); + List stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0); map.put("gateTime2", stability.getGateTime()); map.put("multiplyTimes2", stability.getMultiplyFrequency()); map.put("groupNumber2", stability.getGroupNumber()); //晶振相对频率偏差 - List relativeList = groupMap.get("3"); + List relativeList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0); map.put("gateTime3", relative.getGateTime()); map.put("multiplyTimes3", relative.getMultiplyFrequency()); //晶振频率复现性 - List reproList = groupMap.get("4"); + List reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0); map.put("gateTime4", repro.getGateTime()); map.put("multiplyTimes4", repro.getMultiplyFrequency()); map.put("tOne", repro.getTOne()); map.put("tTwo", repro.getTTwo()); //晶振日老化率 - List dailyList = groupMap.get("5"); + List dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0); map.put("gateTime5", daily.getGateTime()); map.put("multiplyTimes5", daily.getMultiplyFrequency()); map.put("groupNumber5", daily.getGroupNumber()); //频率测量范围、输入灵敏度 - List freqList = groupMap.get("6"); + List freqList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); //频率测量误差 - List freqErrorList = groupMap.get("7"); + List freqErrorList = atomList.stream().filter(a -> "7".equals(a.getDataType())).collect(Collectors.toList()); //周期测量范围、输入灵敏度 - List cycleList = groupMap.get("8"); + List cycleList = atomList.stream().filter(a -> "8".equals(a.getDataType())).collect(Collectors.toList()); //周期测量误差 - List cycleErrorList = groupMap.get("9"); + List cycleErrorList = atomList.stream().filter(a -> "9".equals(a.getDataType())).collect(Collectors.toList()); //时间间隔测量范围及测量误差 - List timeIntervalList = groupMap.get("10"); + List timeIntervalList = atomList.stream().filter(a -> "10".equals(a.getDataType())).collect(Collectors.toList()); map.put("startupList", startupList); map.put("stabilityList", stabilityList); @@ -325,26 +312,23 @@ } private void readyForRubidiumClock(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); - //输出信号 - List outputList = groupMap.get(FREQUENCY_SIGNAL_OUTPUT_AMPLITUDE); + List outputList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); //开机特性 - List bootList = groupMap.get(SECOND_PULSE_OUTPUT); + List bootList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); //频率稳定度 - List stabilityList = groupMap.get(FREQUENCY_STABILITY); + List stabilityList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); //相对频率偏差 - List relativeList = groupMap.get(RELATIVE_FREQUENCY_DEVIATION); + List relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); //频率复现性 - List reproList = groupMap.get(FREQUENCY_REPRODUCIBILITY); + List reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = reproList.get(0); map.put("tOne", cesiumAtom.getTOne()); map.put("tTwo", cesiumAtom.getTTwo()); map.put("tThree", cesiumAtom.getTThree()); //日频率漂移率 - List dailyList = groupMap.get(DAILY_AGING_RATE_OF_CRYSTAL_OSCILLATOR); + List dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); map.put("outputList", outputList); map.put("bootList", bootList); @@ -354,22 +338,19 @@ map.put("dailyList", dailyList); } - private void readyForCrystalOscillator(Map map, List cesiumAtomList) throws Exception { - //根据dataType进行分组，key为dataType值，value为具体List - Map> groupMap = cesiumAtomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); + private void readyForCrystalOscillator(Map map, List atomList) throws Exception { //频率信号输出幅度 - List outputList = groupMap.get(FREQUENCY_SIGNAL_OUTPUT_AMPLITUDE); + List outputList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); //秒脉冲输出 - List pulseList = groupMap.get(SECOND_PULSE_OUTPUT); + List pulseList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); //频率稳定度 - List stabilityList = groupMap.get(FREQUENCY_STABILITY); + List stabilityList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); //相对频率偏差 - List relativeList = groupMap.get(RELATIVE_FREQUENCY_DEVIATION); + List relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); //频率复现性 - List reproList = groupMap.get(FREQUENCY_REPRODUCIBILITY); + List reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); //晶振日老化率 - List dailyList = groupMap.get(DAILY_AGING_RATE_OF_CRYSTAL_OSCILLATOR); + List dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0); map.put("relativeGateTime", relative.getGateTime()); @@ -401,18 +382,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } - - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -440,7 +409,6 @@ default: throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST); } - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); 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 ab6e2c5..18d5c57 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 @@ -71,9 +71,7 @@ Map map = BeanUtil.beanToMap(request); processCheckAccord(map, request.getLabCode()); List eTwoList = request.getCheckDataETwoList(); - prepareCheckParams(eTwoList, map); - map.put("pdfStatus", 1); //除了选用的模板不一致，模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(ETWO_WEIGHT_CHECK_DATA, "数据打印", null, map, false, null, null); @@ -178,7 +176,6 @@ deltaIotaMap.put("fiveValue", e.getAverageValueFive()); deltaIotaMap.put("sixValue", e.getAverageValueSix()); mapReplace(deltaIotaMap); - ; return deltaIotaMap; }).collect(Collectors.toList()); repList.add(deltaIotaList.get(0)); @@ -469,16 +466,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataDcPower()); - request.setMeasureDataDcPowerList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java index b2974b4..2b3a3af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java @@ -382,6 +382,10 @@ @TableField(exist = false) private Integer colorMark = 0; + @ApiModelProperty(value = "测量范围",dataType = "String") + @TableField(exist = false) + private String range; + @ApiModelProperty(value = "技术指标", dataType = "List") @TableField(exist = false) private List technicalTargetList; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java index 5e37fa3..d8a97c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java @@ -83,11 +83,9 @@ } } - private void readyForCheckDataParams(Map map, List checkDataCesiumAtomList) { - Map> groupMap = checkDataCesiumAtomList.stream().collect(Collectors.groupingBy(BizEquipmentStandardCheckDataCesiumAtom::getParams)); - + private void readyForCheckDataParams(Map map, List atomList) { //铯原子频标 - List cesiumAtomList = groupMap.get("1").stream().map(atom -> { + List cesiumAtomList = atomList.stream().filter(a -> "1".equals(a.getParams())).map(atom -> { atom.setCheckPoint(StringUtils.isNotBlank(atom.getCheckPoint()) ? atom.getCheckPoint() + atom.getUnit() : ""); atom.setElectricalLevel(StringUtils.isNotBlank(atom.getElectricalLevel()) ? atom.getElectricalLevel() + atom.getElectricalLevelUnit() : ""); atom.setAmplitude(StringUtils.isNotBlank(atom.getAmplitude()) ? atom.getAmplitude() + atom.getAmplitudeUnit() : ""); @@ -109,7 +107,7 @@ map.put(STA_PREFIX + 1 + DATE_PREFIX + 6, atom.getTestValueSixDate()); //函数信号发生器 - List funcationList = groupMap.get("2").stream().map(fun -> { + List funcationList = atomList.stream().filter(a -> "2".equals(a.getParams())).map(fun -> { fun.setCheckPoint(StringUtils.isNotBlank(fun.getCheckPoint()) ? fun.getCheckPoint() + fun.getUnit() : ""); fun.setElectricalLevel(StringUtils.isNotBlank(fun.getElectricalLevel()) ? fun.getElectricalLevel() + fun.getElectricalLevelUnit() : ""); fun.setAmplitude(StringUtils.isNotBlank(fun.getAmplitude()) ? fun.getAmplitude() + fun.getAmplitudeUnit() : ""); @@ -130,7 +128,7 @@ map.put(STA_PREFIX + 2 + DATE_PREFIX + 5, fun.getTestValueFiveDate()); map.put(STA_PREFIX + 2 + DATE_PREFIX + 6, fun.getTestValueSixDate()); - List signalList = groupMap.get("3").stream().map(signal -> { + List signalList = atomList.stream().filter(a -> "3".equals(a.getParams())).map(signal -> { signal.setCheckPoint(StringUtils.isNotBlank(signal.getCheckPoint()) ? signal.getCheckPoint() + signal.getUnit() : ""); signal.setElectricalLevel(StringUtils.isNotBlank(signal.getElectricalLevel()) ? signal.getElectricalLevel() + signal.getElectricalLevelUnit() : ""); signal.setAmplitude(StringUtils.isNotBlank(signal.getAmplitude()) ? signal.getAmplitude() + signal.getAmplitudeUnit() : ""); @@ -163,12 +161,6 @@ log.debug("校验没有原始记录"); return null; } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -220,97 +212,92 @@ } private void readyForMicrowaveCounter(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); //晶振开机特性 - List startupList = groupMap.get("1"); + List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0); map.put("gateTime1", cesiumAtom.getGateTime()); map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency()); map.put("groupNumber1", cesiumAtom.getSampleGroupNumber()); + map.put("startupList", startupList); //晶振1s频率稳定度 - List stabilityList = groupMap.get("2"); + List stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0); map.put("gateTime2", stability.getGateTime()); map.put("multiplyTimes2", stability.getMultiplyFrequency()); map.put("groupNumber2", stability.getSampleGroupNumber()); + map.put("stabilityList", stabilityList); //晶振相对频率偏差 - List deviationList = groupMap.get("3"); + List deviationList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom deviation = deviationList.get(0); map.put("gateTime3", deviation.getGateTime()); map.put("multiplyTimes3", deviation.getMultiplyFrequency()); + map.put("deviationList", deviationList); //晶振频率复现性 - List reproList = groupMap.get("4"); + List reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0); map.put("gateTime4", repro.getGateTime()); map.put("multiplyTimes4", repro.getMultiplyFrequency()); map.put("tOne", repro.getTOne()); map.put("tTwo", repro.getTTwo()); + map.put("reproList", reproList); //晶振日老化率 - List dailyList = groupMap.get("5"); + List dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0); map.put("gateTime5", daily.getGateTime()); map.put("multiplyTimes5", daily.getMultiplyFrequency()); map.put("groupNumber5", daily.getSerialNumber()); - //频率测量范围、输入灵敏度及最大输入电平 - List levelList = groupMap.get("6"); - //频率测量误差 - List errorList = groupMap.get("7"); - - map.put("startupList", startupList); - map.put("stabilityList", stabilityList); - map.put("deviationList", deviationList); - map.put("reproList", reproList); map.put("dailyList", dailyList); + //频率测量范围、输入灵敏度及最大输入电平 + List levelList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); map.put("levelList", levelList); + //频率测量误差 + List errorList = atomList.stream().filter(a -> "7".equals(a.getDataType())).collect(Collectors.toList()); map.put("errorList", errorList); } private void readyForUniversalCounter(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); //晶振开机 - List startupList = groupMap.get("1"); + List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0); map.put("gateTime1", cesiumAtom.getGateTime()); map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency()); map.put("groupNumber1", cesiumAtom.getGroupNumber()); //晶振1s频率稳定度 - List stabilityList = groupMap.get("2"); + List stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0); map.put("gateTime2", stability.getGateTime()); map.put("multiplyTimes2", stability.getMultiplyFrequency()); map.put("groupNumber2", stability.getGroupNumber()); //晶振相对频率偏差 - List relativeList = groupMap.get("3"); + List relativeList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0); map.put("gateTime3", relative.getGateTime()); map.put("multiplyTimes3", relative.getMultiplyFrequency()); //晶振频率复现性 - List reproList = groupMap.get("4"); + List reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0); map.put("gateTime4", repro.getGateTime()); map.put("multiplyTimes4", repro.getMultiplyFrequency()); map.put("tOne", repro.getTOne()); map.put("tTwo", repro.getTTwo()); //晶振日老化率 - List dailyList = groupMap.get("5"); + List dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0); map.put("gateTime5", daily.getGateTime()); map.put("multiplyTimes5", daily.getMultiplyFrequency()); map.put("groupNumber5", daily.getGroupNumber()); //频率测量范围、输入灵敏度 - List freqList = groupMap.get("6"); + List freqList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); //频率测量误差 - List freqErrorList = groupMap.get("7"); + List freqErrorList = atomList.stream().filter(a -> "7".equals(a.getDataType())).collect(Collectors.toList()); //周期测量范围、输入灵敏度 - List cycleList = groupMap.get("8"); + List cycleList = atomList.stream().filter(a -> "8".equals(a.getDataType())).collect(Collectors.toList()); //周期测量误差 - List cycleErrorList = groupMap.get("9"); + List cycleErrorList = atomList.stream().filter(a -> "9".equals(a.getDataType())).collect(Collectors.toList()); //时间间隔测量范围及测量误差 - List timeIntervalList = groupMap.get("10"); + List timeIntervalList = atomList.stream().filter(a -> "10".equals(a.getDataType())).collect(Collectors.toList()); map.put("startupList", startupList); map.put("stabilityList", stabilityList); @@ -325,26 +312,23 @@ } private void readyForRubidiumClock(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); - //输出信号 - List outputList = groupMap.get(FREQUENCY_SIGNAL_OUTPUT_AMPLITUDE); + List outputList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); //开机特性 - List bootList = groupMap.get(SECOND_PULSE_OUTPUT); + List bootList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); //频率稳定度 - List stabilityList = groupMap.get(FREQUENCY_STABILITY); + List stabilityList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); //相对频率偏差 - List relativeList = groupMap.get(RELATIVE_FREQUENCY_DEVIATION); + List relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); //频率复现性 - List reproList = groupMap.get(FREQUENCY_REPRODUCIBILITY); + List reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = reproList.get(0); map.put("tOne", cesiumAtom.getTOne()); map.put("tTwo", cesiumAtom.getTTwo()); map.put("tThree", cesiumAtom.getTThree()); //日频率漂移率 - List dailyList = groupMap.get(DAILY_AGING_RATE_OF_CRYSTAL_OSCILLATOR); + List dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); map.put("outputList", outputList); map.put("bootList", bootList); @@ -354,22 +338,19 @@ map.put("dailyList", dailyList); } - private void readyForCrystalOscillator(Map map, List cesiumAtomList) throws Exception { - //根据dataType进行分组，key为dataType值，value为具体List - Map> groupMap = cesiumAtomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); + private void readyForCrystalOscillator(Map map, List atomList) throws Exception { //频率信号输出幅度 - List outputList = groupMap.get(FREQUENCY_SIGNAL_OUTPUT_AMPLITUDE); + List outputList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); //秒脉冲输出 - List pulseList = groupMap.get(SECOND_PULSE_OUTPUT); + List pulseList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); //频率稳定度 - List stabilityList = groupMap.get(FREQUENCY_STABILITY); + List stabilityList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); //相对频率偏差 - List relativeList = groupMap.get(RELATIVE_FREQUENCY_DEVIATION); + List relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); //频率复现性 - List reproList = groupMap.get(FREQUENCY_REPRODUCIBILITY); + List reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); //晶振日老化率 - List dailyList = groupMap.get(DAILY_AGING_RATE_OF_CRYSTAL_OSCILLATOR); + List dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0); map.put("relativeGateTime", relative.getGateTime()); @@ -401,18 +382,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } - - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -440,7 +409,6 @@ default: throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST); } - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); 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 ab6e2c5..18d5c57 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 @@ -71,9 +71,7 @@ Map map = BeanUtil.beanToMap(request); processCheckAccord(map, request.getLabCode()); List eTwoList = request.getCheckDataETwoList(); - prepareCheckParams(eTwoList, map); - map.put("pdfStatus", 1); //除了选用的模板不一致，模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(ETWO_WEIGHT_CHECK_DATA, "数据打印", null, map, false, null, null); @@ -178,7 +176,6 @@ deltaIotaMap.put("fiveValue", e.getAverageValueFive()); deltaIotaMap.put("sixValue", e.getAverageValueSix()); mapReplace(deltaIotaMap); - ; return deltaIotaMap; }).collect(Collectors.toList()); repList.add(deltaIotaList.get(0)); @@ -469,16 +466,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataDcPower()); - request.setMeasureDataDcPowerList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java index 07c5d96..d42b7f7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java @@ -163,22 +163,22 @@ Map> groupMap = list.stream() .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataLowFrequencySignal::getDataType)); //频率 - List frequencyList = groupMap.get("1"); + List frequencyList = list.stream().filter(data->"1".equals(data.getDataType())).collect(Collectors.toList()); map.put("frequencyList", frequencyList); //交流电压 - List crossList = groupMap.get("2"); + List crossList = list.stream().filter(data->"2".equals(data.getDataType())).collect(Collectors.toList()); map.put("crossList", crossList); //直流电压 - List dcList = groupMap.get("3"); + List dcList = list.stream().filter(data->"3".equals(data.getDataType())).collect(Collectors.toList()); map.put("dcList", dcList); //上升时间 - List riseList = groupMap.get("4"); + List riseList = list.stream().filter(data->"4".equals(data.getDataType())).collect(Collectors.toList()); map.put("riseList", riseList); //正弦信号平坦度 - List flatnessList = groupMap.get("5"); + List flatnessList = list.stream().filter(data->"5".equals(data.getDataType())).collect(Collectors.toList()); map.put("flatnessList", flatnessList); //总谐波失真 - List harmonicList = groupMap.get("6"); + List harmonicList = list.stream().filter(data->"6".equals(data.getDataType())).collect(Collectors.toList()); map.put("harmonicList", harmonicList); } @@ -189,16 +189,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java index b2974b4..2b3a3af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java @@ -382,6 +382,10 @@ @TableField(exist = false) private Integer colorMark = 0; + @ApiModelProperty(value = "测量范围",dataType = "String") + @TableField(exist = false) + private String range; + @ApiModelProperty(value = "技术指标", dataType = "List") @TableField(exist = false) private List technicalTargetList; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java index 5e37fa3..d8a97c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java @@ -83,11 +83,9 @@ } } - private void readyForCheckDataParams(Map map, List checkDataCesiumAtomList) { - Map> groupMap = checkDataCesiumAtomList.stream().collect(Collectors.groupingBy(BizEquipmentStandardCheckDataCesiumAtom::getParams)); - + private void readyForCheckDataParams(Map map, List atomList) { //铯原子频标 - List cesiumAtomList = groupMap.get("1").stream().map(atom -> { + List cesiumAtomList = atomList.stream().filter(a -> "1".equals(a.getParams())).map(atom -> { atom.setCheckPoint(StringUtils.isNotBlank(atom.getCheckPoint()) ? atom.getCheckPoint() + atom.getUnit() : ""); atom.setElectricalLevel(StringUtils.isNotBlank(atom.getElectricalLevel()) ? atom.getElectricalLevel() + atom.getElectricalLevelUnit() : ""); atom.setAmplitude(StringUtils.isNotBlank(atom.getAmplitude()) ? atom.getAmplitude() + atom.getAmplitudeUnit() : ""); @@ -109,7 +107,7 @@ map.put(STA_PREFIX + 1 + DATE_PREFIX + 6, atom.getTestValueSixDate()); //函数信号发生器 - List funcationList = groupMap.get("2").stream().map(fun -> { + List funcationList = atomList.stream().filter(a -> "2".equals(a.getParams())).map(fun -> { fun.setCheckPoint(StringUtils.isNotBlank(fun.getCheckPoint()) ? fun.getCheckPoint() + fun.getUnit() : ""); fun.setElectricalLevel(StringUtils.isNotBlank(fun.getElectricalLevel()) ? fun.getElectricalLevel() + fun.getElectricalLevelUnit() : ""); fun.setAmplitude(StringUtils.isNotBlank(fun.getAmplitude()) ? fun.getAmplitude() + fun.getAmplitudeUnit() : ""); @@ -130,7 +128,7 @@ map.put(STA_PREFIX + 2 + DATE_PREFIX + 5, fun.getTestValueFiveDate()); map.put(STA_PREFIX + 2 + DATE_PREFIX + 6, fun.getTestValueSixDate()); - List signalList = groupMap.get("3").stream().map(signal -> { + List signalList = atomList.stream().filter(a -> "3".equals(a.getParams())).map(signal -> { signal.setCheckPoint(StringUtils.isNotBlank(signal.getCheckPoint()) ? signal.getCheckPoint() + signal.getUnit() : ""); signal.setElectricalLevel(StringUtils.isNotBlank(signal.getElectricalLevel()) ? signal.getElectricalLevel() + signal.getElectricalLevelUnit() : ""); signal.setAmplitude(StringUtils.isNotBlank(signal.getAmplitude()) ? signal.getAmplitude() + signal.getAmplitudeUnit() : ""); @@ -163,12 +161,6 @@ log.debug("校验没有原始记录"); return null; } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -220,97 +212,92 @@ } private void readyForMicrowaveCounter(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); //晶振开机特性 - List startupList = groupMap.get("1"); + List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0); map.put("gateTime1", cesiumAtom.getGateTime()); map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency()); map.put("groupNumber1", cesiumAtom.getSampleGroupNumber()); + map.put("startupList", startupList); //晶振1s频率稳定度 - List stabilityList = groupMap.get("2"); + List stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0); map.put("gateTime2", stability.getGateTime()); map.put("multiplyTimes2", stability.getMultiplyFrequency()); map.put("groupNumber2", stability.getSampleGroupNumber()); + map.put("stabilityList", stabilityList); //晶振相对频率偏差 - List deviationList = groupMap.get("3"); + List deviationList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom deviation = deviationList.get(0); map.put("gateTime3", deviation.getGateTime()); map.put("multiplyTimes3", deviation.getMultiplyFrequency()); + map.put("deviationList", deviationList); //晶振频率复现性 - List reproList = groupMap.get("4"); + List reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0); map.put("gateTime4", repro.getGateTime()); map.put("multiplyTimes4", repro.getMultiplyFrequency()); map.put("tOne", repro.getTOne()); map.put("tTwo", repro.getTTwo()); + map.put("reproList", reproList); //晶振日老化率 - List dailyList = groupMap.get("5"); + List dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0); map.put("gateTime5", daily.getGateTime()); map.put("multiplyTimes5", daily.getMultiplyFrequency()); map.put("groupNumber5", daily.getSerialNumber()); - //频率测量范围、输入灵敏度及最大输入电平 - List levelList = groupMap.get("6"); - //频率测量误差 - List errorList = groupMap.get("7"); - - map.put("startupList", startupList); - map.put("stabilityList", stabilityList); - map.put("deviationList", deviationList); - map.put("reproList", reproList); map.put("dailyList", dailyList); + //频率测量范围、输入灵敏度及最大输入电平 + List levelList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); map.put("levelList", levelList); + //频率测量误差 + List errorList = atomList.stream().filter(a -> "7".equals(a.getDataType())).collect(Collectors.toList()); map.put("errorList", errorList); } private void readyForUniversalCounter(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); //晶振开机 - List startupList = groupMap.get("1"); + List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0); map.put("gateTime1", cesiumAtom.getGateTime()); map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency()); map.put("groupNumber1", cesiumAtom.getGroupNumber()); //晶振1s频率稳定度 - List stabilityList = groupMap.get("2"); + List stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0); map.put("gateTime2", stability.getGateTime()); map.put("multiplyTimes2", stability.getMultiplyFrequency()); map.put("groupNumber2", stability.getGroupNumber()); //晶振相对频率偏差 - List relativeList = groupMap.get("3"); + List relativeList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0); map.put("gateTime3", relative.getGateTime()); map.put("multiplyTimes3", relative.getMultiplyFrequency()); //晶振频率复现性 - List reproList = groupMap.get("4"); + List reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0); map.put("gateTime4", repro.getGateTime()); map.put("multiplyTimes4", repro.getMultiplyFrequency()); map.put("tOne", repro.getTOne()); map.put("tTwo", repro.getTTwo()); //晶振日老化率 - List dailyList = groupMap.get("5"); + List dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0); map.put("gateTime5", daily.getGateTime()); map.put("multiplyTimes5", daily.getMultiplyFrequency()); map.put("groupNumber5", daily.getGroupNumber()); //频率测量范围、输入灵敏度 - List freqList = groupMap.get("6"); + List freqList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); //频率测量误差 - List freqErrorList = groupMap.get("7"); + List freqErrorList = atomList.stream().filter(a -> "7".equals(a.getDataType())).collect(Collectors.toList()); //周期测量范围、输入灵敏度 - List cycleList = groupMap.get("8"); + List cycleList = atomList.stream().filter(a -> "8".equals(a.getDataType())).collect(Collectors.toList()); //周期测量误差 - List cycleErrorList = groupMap.get("9"); + List cycleErrorList = atomList.stream().filter(a -> "9".equals(a.getDataType())).collect(Collectors.toList()); //时间间隔测量范围及测量误差 - List timeIntervalList = groupMap.get("10"); + List timeIntervalList = atomList.stream().filter(a -> "10".equals(a.getDataType())).collect(Collectors.toList()); map.put("startupList", startupList); map.put("stabilityList", stabilityList); @@ -325,26 +312,23 @@ } private void readyForRubidiumClock(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); - //输出信号 - List outputList = groupMap.get(FREQUENCY_SIGNAL_OUTPUT_AMPLITUDE); + List outputList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); //开机特性 - List bootList = groupMap.get(SECOND_PULSE_OUTPUT); + List bootList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); //频率稳定度 - List stabilityList = groupMap.get(FREQUENCY_STABILITY); + List stabilityList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); //相对频率偏差 - List relativeList = groupMap.get(RELATIVE_FREQUENCY_DEVIATION); + List relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); //频率复现性 - List reproList = groupMap.get(FREQUENCY_REPRODUCIBILITY); + List reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = reproList.get(0); map.put("tOne", cesiumAtom.getTOne()); map.put("tTwo", cesiumAtom.getTTwo()); map.put("tThree", cesiumAtom.getTThree()); //日频率漂移率 - List dailyList = groupMap.get(DAILY_AGING_RATE_OF_CRYSTAL_OSCILLATOR); + List dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); map.put("outputList", outputList); map.put("bootList", bootList); @@ -354,22 +338,19 @@ map.put("dailyList", dailyList); } - private void readyForCrystalOscillator(Map map, List cesiumAtomList) throws Exception { - //根据dataType进行分组，key为dataType值，value为具体List - Map> groupMap = cesiumAtomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); + private void readyForCrystalOscillator(Map map, List atomList) throws Exception { //频率信号输出幅度 - List outputList = groupMap.get(FREQUENCY_SIGNAL_OUTPUT_AMPLITUDE); + List outputList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); //秒脉冲输出 - List pulseList = groupMap.get(SECOND_PULSE_OUTPUT); + List pulseList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); //频率稳定度 - List stabilityList = groupMap.get(FREQUENCY_STABILITY); + List stabilityList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); //相对频率偏差 - List relativeList = groupMap.get(RELATIVE_FREQUENCY_DEVIATION); + List relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); //频率复现性 - List reproList = groupMap.get(FREQUENCY_REPRODUCIBILITY); + List reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); //晶振日老化率 - List dailyList = groupMap.get(DAILY_AGING_RATE_OF_CRYSTAL_OSCILLATOR); + List dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0); map.put("relativeGateTime", relative.getGateTime()); @@ -401,18 +382,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } - - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -440,7 +409,6 @@ default: throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST); } - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); 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 ab6e2c5..18d5c57 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 @@ -71,9 +71,7 @@ Map map = BeanUtil.beanToMap(request); processCheckAccord(map, request.getLabCode()); List eTwoList = request.getCheckDataETwoList(); - prepareCheckParams(eTwoList, map); - map.put("pdfStatus", 1); //除了选用的模板不一致，模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(ETWO_WEIGHT_CHECK_DATA, "数据打印", null, map, false, null, null); @@ -178,7 +176,6 @@ deltaIotaMap.put("fiveValue", e.getAverageValueFive()); deltaIotaMap.put("sixValue", e.getAverageValueSix()); mapReplace(deltaIotaMap); - ; return deltaIotaMap; }).collect(Collectors.toList()); repList.add(deltaIotaList.get(0)); @@ -469,16 +466,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataDcPower()); - request.setMeasureDataDcPowerList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java index 07c5d96..d42b7f7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java @@ -163,22 +163,22 @@ Map> groupMap = list.stream() .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataLowFrequencySignal::getDataType)); //频率 - List frequencyList = groupMap.get("1"); + List frequencyList = list.stream().filter(data->"1".equals(data.getDataType())).collect(Collectors.toList()); map.put("frequencyList", frequencyList); //交流电压 - List crossList = groupMap.get("2"); + List crossList = list.stream().filter(data->"2".equals(data.getDataType())).collect(Collectors.toList()); map.put("crossList", crossList); //直流电压 - List dcList = groupMap.get("3"); + List dcList = list.stream().filter(data->"3".equals(data.getDataType())).collect(Collectors.toList()); map.put("dcList", dcList); //上升时间 - List riseList = groupMap.get("4"); + List riseList = list.stream().filter(data->"4".equals(data.getDataType())).collect(Collectors.toList()); map.put("riseList", riseList); //正弦信号平坦度 - List flatnessList = groupMap.get("5"); + List flatnessList = list.stream().filter(data->"5".equals(data.getDataType())).collect(Collectors.toList()); map.put("flatnessList", flatnessList); //总谐波失真 - List harmonicList = groupMap.get("6"); + List harmonicList = list.stream().filter(data->"6".equals(data.getDataType())).collect(Collectors.toList()); map.put("harmonicList", harmonicList); } @@ -189,16 +189,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java index 115263d..8e9573f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java @@ -160,16 +160,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java index b2974b4..2b3a3af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java @@ -382,6 +382,10 @@ @TableField(exist = false) private Integer colorMark = 0; + @ApiModelProperty(value = "测量范围",dataType = "String") + @TableField(exist = false) + private String range; + @ApiModelProperty(value = "技术指标", dataType = "List") @TableField(exist = false) private List technicalTargetList; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java index 5e37fa3..d8a97c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java @@ -83,11 +83,9 @@ } } - private void readyForCheckDataParams(Map map, List checkDataCesiumAtomList) { - Map> groupMap = checkDataCesiumAtomList.stream().collect(Collectors.groupingBy(BizEquipmentStandardCheckDataCesiumAtom::getParams)); - + private void readyForCheckDataParams(Map map, List atomList) { //铯原子频标 - List cesiumAtomList = groupMap.get("1").stream().map(atom -> { + List cesiumAtomList = atomList.stream().filter(a -> "1".equals(a.getParams())).map(atom -> { atom.setCheckPoint(StringUtils.isNotBlank(atom.getCheckPoint()) ? atom.getCheckPoint() + atom.getUnit() : ""); atom.setElectricalLevel(StringUtils.isNotBlank(atom.getElectricalLevel()) ? atom.getElectricalLevel() + atom.getElectricalLevelUnit() : ""); atom.setAmplitude(StringUtils.isNotBlank(atom.getAmplitude()) ? atom.getAmplitude() + atom.getAmplitudeUnit() : ""); @@ -109,7 +107,7 @@ map.put(STA_PREFIX + 1 + DATE_PREFIX + 6, atom.getTestValueSixDate()); //函数信号发生器 - List funcationList = groupMap.get("2").stream().map(fun -> { + List funcationList = atomList.stream().filter(a -> "2".equals(a.getParams())).map(fun -> { fun.setCheckPoint(StringUtils.isNotBlank(fun.getCheckPoint()) ? fun.getCheckPoint() + fun.getUnit() : ""); fun.setElectricalLevel(StringUtils.isNotBlank(fun.getElectricalLevel()) ? fun.getElectricalLevel() + fun.getElectricalLevelUnit() : ""); fun.setAmplitude(StringUtils.isNotBlank(fun.getAmplitude()) ? fun.getAmplitude() + fun.getAmplitudeUnit() : ""); @@ -130,7 +128,7 @@ map.put(STA_PREFIX + 2 + DATE_PREFIX + 5, fun.getTestValueFiveDate()); map.put(STA_PREFIX + 2 + DATE_PREFIX + 6, fun.getTestValueSixDate()); - List signalList = groupMap.get("3").stream().map(signal -> { + List signalList = atomList.stream().filter(a -> "3".equals(a.getParams())).map(signal -> { signal.setCheckPoint(StringUtils.isNotBlank(signal.getCheckPoint()) ? signal.getCheckPoint() + signal.getUnit() : ""); signal.setElectricalLevel(StringUtils.isNotBlank(signal.getElectricalLevel()) ? signal.getElectricalLevel() + signal.getElectricalLevelUnit() : ""); signal.setAmplitude(StringUtils.isNotBlank(signal.getAmplitude()) ? signal.getAmplitude() + signal.getAmplitudeUnit() : ""); @@ -163,12 +161,6 @@ log.debug("校验没有原始记录"); return null; } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -220,97 +212,92 @@ } private void readyForMicrowaveCounter(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); //晶振开机特性 - List startupList = groupMap.get("1"); + List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0); map.put("gateTime1", cesiumAtom.getGateTime()); map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency()); map.put("groupNumber1", cesiumAtom.getSampleGroupNumber()); + map.put("startupList", startupList); //晶振1s频率稳定度 - List stabilityList = groupMap.get("2"); + List stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0); map.put("gateTime2", stability.getGateTime()); map.put("multiplyTimes2", stability.getMultiplyFrequency()); map.put("groupNumber2", stability.getSampleGroupNumber()); + map.put("stabilityList", stabilityList); //晶振相对频率偏差 - List deviationList = groupMap.get("3"); + List deviationList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom deviation = deviationList.get(0); map.put("gateTime3", deviation.getGateTime()); map.put("multiplyTimes3", deviation.getMultiplyFrequency()); + map.put("deviationList", deviationList); //晶振频率复现性 - List reproList = groupMap.get("4"); + List reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0); map.put("gateTime4", repro.getGateTime()); map.put("multiplyTimes4", repro.getMultiplyFrequency()); map.put("tOne", repro.getTOne()); map.put("tTwo", repro.getTTwo()); + map.put("reproList", reproList); //晶振日老化率 - List dailyList = groupMap.get("5"); + List dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0); map.put("gateTime5", daily.getGateTime()); map.put("multiplyTimes5", daily.getMultiplyFrequency()); map.put("groupNumber5", daily.getSerialNumber()); - //频率测量范围、输入灵敏度及最大输入电平 - List levelList = groupMap.get("6"); - //频率测量误差 - List errorList = groupMap.get("7"); - - map.put("startupList", startupList); - map.put("stabilityList", stabilityList); - map.put("deviationList", deviationList); - map.put("reproList", reproList); map.put("dailyList", dailyList); + //频率测量范围、输入灵敏度及最大输入电平 + List levelList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); map.put("levelList", levelList); + //频率测量误差 + List errorList = atomList.stream().filter(a -> "7".equals(a.getDataType())).collect(Collectors.toList()); map.put("errorList", errorList); } private void readyForUniversalCounter(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); //晶振开机 - List startupList = groupMap.get("1"); + List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0); map.put("gateTime1", cesiumAtom.getGateTime()); map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency()); map.put("groupNumber1", cesiumAtom.getGroupNumber()); //晶振1s频率稳定度 - List stabilityList = groupMap.get("2"); + List stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0); map.put("gateTime2", stability.getGateTime()); map.put("multiplyTimes2", stability.getMultiplyFrequency()); map.put("groupNumber2", stability.getGroupNumber()); //晶振相对频率偏差 - List relativeList = groupMap.get("3"); + List relativeList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0); map.put("gateTime3", relative.getGateTime()); map.put("multiplyTimes3", relative.getMultiplyFrequency()); //晶振频率复现性 - List reproList = groupMap.get("4"); + List reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0); map.put("gateTime4", repro.getGateTime()); map.put("multiplyTimes4", repro.getMultiplyFrequency()); map.put("tOne", repro.getTOne()); map.put("tTwo", repro.getTTwo()); //晶振日老化率 - List dailyList = groupMap.get("5"); + List dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0); map.put("gateTime5", daily.getGateTime()); map.put("multiplyTimes5", daily.getMultiplyFrequency()); map.put("groupNumber5", daily.getGroupNumber()); //频率测量范围、输入灵敏度 - List freqList = groupMap.get("6"); + List freqList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); //频率测量误差 - List freqErrorList = groupMap.get("7"); + List freqErrorList = atomList.stream().filter(a -> "7".equals(a.getDataType())).collect(Collectors.toList()); //周期测量范围、输入灵敏度 - List cycleList = groupMap.get("8"); + List cycleList = atomList.stream().filter(a -> "8".equals(a.getDataType())).collect(Collectors.toList()); //周期测量误差 - List cycleErrorList = groupMap.get("9"); + List cycleErrorList = atomList.stream().filter(a -> "9".equals(a.getDataType())).collect(Collectors.toList()); //时间间隔测量范围及测量误差 - List timeIntervalList = groupMap.get("10"); + List timeIntervalList = atomList.stream().filter(a -> "10".equals(a.getDataType())).collect(Collectors.toList()); map.put("startupList", startupList); map.put("stabilityList", stabilityList); @@ -325,26 +312,23 @@ } private void readyForRubidiumClock(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); - //输出信号 - List outputList = groupMap.get(FREQUENCY_SIGNAL_OUTPUT_AMPLITUDE); + List outputList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); //开机特性 - List bootList = groupMap.get(SECOND_PULSE_OUTPUT); + List bootList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); //频率稳定度 - List stabilityList = groupMap.get(FREQUENCY_STABILITY); + List stabilityList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); //相对频率偏差 - List relativeList = groupMap.get(RELATIVE_FREQUENCY_DEVIATION); + List relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); //频率复现性 - List reproList = groupMap.get(FREQUENCY_REPRODUCIBILITY); + List reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = reproList.get(0); map.put("tOne", cesiumAtom.getTOne()); map.put("tTwo", cesiumAtom.getTTwo()); map.put("tThree", cesiumAtom.getTThree()); //日频率漂移率 - List dailyList = groupMap.get(DAILY_AGING_RATE_OF_CRYSTAL_OSCILLATOR); + List dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); map.put("outputList", outputList); map.put("bootList", bootList); @@ -354,22 +338,19 @@ map.put("dailyList", dailyList); } - private void readyForCrystalOscillator(Map map, List cesiumAtomList) throws Exception { - //根据dataType进行分组，key为dataType值，value为具体List - Map> groupMap = cesiumAtomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); + private void readyForCrystalOscillator(Map map, List atomList) throws Exception { //频率信号输出幅度 - List outputList = groupMap.get(FREQUENCY_SIGNAL_OUTPUT_AMPLITUDE); + List outputList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); //秒脉冲输出 - List pulseList = groupMap.get(SECOND_PULSE_OUTPUT); + List pulseList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); //频率稳定度 - List stabilityList = groupMap.get(FREQUENCY_STABILITY); + List stabilityList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); //相对频率偏差 - List relativeList = groupMap.get(RELATIVE_FREQUENCY_DEVIATION); + List relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); //频率复现性 - List reproList = groupMap.get(FREQUENCY_REPRODUCIBILITY); + List reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); //晶振日老化率 - List dailyList = groupMap.get(DAILY_AGING_RATE_OF_CRYSTAL_OSCILLATOR); + List dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0); map.put("relativeGateTime", relative.getGateTime()); @@ -401,18 +382,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } - - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -440,7 +409,6 @@ default: throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST); } - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); 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 ab6e2c5..18d5c57 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 @@ -71,9 +71,7 @@ Map map = BeanUtil.beanToMap(request); processCheckAccord(map, request.getLabCode()); List eTwoList = request.getCheckDataETwoList(); - prepareCheckParams(eTwoList, map); - map.put("pdfStatus", 1); //除了选用的模板不一致，模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(ETWO_WEIGHT_CHECK_DATA, "数据打印", null, map, false, null, null); @@ -178,7 +176,6 @@ deltaIotaMap.put("fiveValue", e.getAverageValueFive()); deltaIotaMap.put("sixValue", e.getAverageValueSix()); mapReplace(deltaIotaMap); - ; return deltaIotaMap; }).collect(Collectors.toList()); repList.add(deltaIotaList.get(0)); @@ -469,16 +466,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataDcPower()); - request.setMeasureDataDcPowerList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java index 07c5d96..d42b7f7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java @@ -163,22 +163,22 @@ Map> groupMap = list.stream() .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataLowFrequencySignal::getDataType)); //频率 - List frequencyList = groupMap.get("1"); + List frequencyList = list.stream().filter(data->"1".equals(data.getDataType())).collect(Collectors.toList()); map.put("frequencyList", frequencyList); //交流电压 - List crossList = groupMap.get("2"); + List crossList = list.stream().filter(data->"2".equals(data.getDataType())).collect(Collectors.toList()); map.put("crossList", crossList); //直流电压 - List dcList = groupMap.get("3"); + List dcList = list.stream().filter(data->"3".equals(data.getDataType())).collect(Collectors.toList()); map.put("dcList", dcList); //上升时间 - List riseList = groupMap.get("4"); + List riseList = list.stream().filter(data->"4".equals(data.getDataType())).collect(Collectors.toList()); map.put("riseList", riseList); //正弦信号平坦度 - List flatnessList = groupMap.get("5"); + List flatnessList = list.stream().filter(data->"5".equals(data.getDataType())).collect(Collectors.toList()); map.put("flatnessList", flatnessList); //总谐波失真 - List harmonicList = groupMap.get("6"); + List harmonicList = list.stream().filter(data->"6".equals(data.getDataType())).collect(Collectors.toList()); map.put("harmonicList", harmonicList); } @@ -189,16 +189,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java index 115263d..8e9573f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java @@ -160,16 +160,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java index d0b58b8..6aaeab4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java @@ -192,22 +192,10 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - readyForMicrowaveParams(map, request.getMeasureDataMicrowaveAttenuationList()); - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java index b2974b4..2b3a3af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java @@ -382,6 +382,10 @@ @TableField(exist = false) private Integer colorMark = 0; + @ApiModelProperty(value = "测量范围",dataType = "String") + @TableField(exist = false) + private String range; + @ApiModelProperty(value = "技术指标", dataType = "List") @TableField(exist = false) private List technicalTargetList; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java index 5e37fa3..d8a97c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java @@ -83,11 +83,9 @@ } } - private void readyForCheckDataParams(Map map, List checkDataCesiumAtomList) { - Map> groupMap = checkDataCesiumAtomList.stream().collect(Collectors.groupingBy(BizEquipmentStandardCheckDataCesiumAtom::getParams)); - + private void readyForCheckDataParams(Map map, List atomList) { //铯原子频标 - List cesiumAtomList = groupMap.get("1").stream().map(atom -> { + List cesiumAtomList = atomList.stream().filter(a -> "1".equals(a.getParams())).map(atom -> { atom.setCheckPoint(StringUtils.isNotBlank(atom.getCheckPoint()) ? atom.getCheckPoint() + atom.getUnit() : ""); atom.setElectricalLevel(StringUtils.isNotBlank(atom.getElectricalLevel()) ? atom.getElectricalLevel() + atom.getElectricalLevelUnit() : ""); atom.setAmplitude(StringUtils.isNotBlank(atom.getAmplitude()) ? atom.getAmplitude() + atom.getAmplitudeUnit() : ""); @@ -109,7 +107,7 @@ map.put(STA_PREFIX + 1 + DATE_PREFIX + 6, atom.getTestValueSixDate()); //函数信号发生器 - List funcationList = groupMap.get("2").stream().map(fun -> { + List funcationList = atomList.stream().filter(a -> "2".equals(a.getParams())).map(fun -> { fun.setCheckPoint(StringUtils.isNotBlank(fun.getCheckPoint()) ? fun.getCheckPoint() + fun.getUnit() : ""); fun.setElectricalLevel(StringUtils.isNotBlank(fun.getElectricalLevel()) ? fun.getElectricalLevel() + fun.getElectricalLevelUnit() : ""); fun.setAmplitude(StringUtils.isNotBlank(fun.getAmplitude()) ? fun.getAmplitude() + fun.getAmplitudeUnit() : ""); @@ -130,7 +128,7 @@ map.put(STA_PREFIX + 2 + DATE_PREFIX + 5, fun.getTestValueFiveDate()); map.put(STA_PREFIX + 2 + DATE_PREFIX + 6, fun.getTestValueSixDate()); - List signalList = groupMap.get("3").stream().map(signal -> { + List signalList = atomList.stream().filter(a -> "3".equals(a.getParams())).map(signal -> { signal.setCheckPoint(StringUtils.isNotBlank(signal.getCheckPoint()) ? signal.getCheckPoint() + signal.getUnit() : ""); signal.setElectricalLevel(StringUtils.isNotBlank(signal.getElectricalLevel()) ? signal.getElectricalLevel() + signal.getElectricalLevelUnit() : ""); signal.setAmplitude(StringUtils.isNotBlank(signal.getAmplitude()) ? signal.getAmplitude() + signal.getAmplitudeUnit() : ""); @@ -163,12 +161,6 @@ log.debug("校验没有原始记录"); return null; } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -220,97 +212,92 @@ } private void readyForMicrowaveCounter(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); //晶振开机特性 - List startupList = groupMap.get("1"); + List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0); map.put("gateTime1", cesiumAtom.getGateTime()); map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency()); map.put("groupNumber1", cesiumAtom.getSampleGroupNumber()); + map.put("startupList", startupList); //晶振1s频率稳定度 - List stabilityList = groupMap.get("2"); + List stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0); map.put("gateTime2", stability.getGateTime()); map.put("multiplyTimes2", stability.getMultiplyFrequency()); map.put("groupNumber2", stability.getSampleGroupNumber()); + map.put("stabilityList", stabilityList); //晶振相对频率偏差 - List deviationList = groupMap.get("3"); + List deviationList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom deviation = deviationList.get(0); map.put("gateTime3", deviation.getGateTime()); map.put("multiplyTimes3", deviation.getMultiplyFrequency()); + map.put("deviationList", deviationList); //晶振频率复现性 - List reproList = groupMap.get("4"); + List reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0); map.put("gateTime4", repro.getGateTime()); map.put("multiplyTimes4", repro.getMultiplyFrequency()); map.put("tOne", repro.getTOne()); map.put("tTwo", repro.getTTwo()); + map.put("reproList", reproList); //晶振日老化率 - List dailyList = groupMap.get("5"); + List dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0); map.put("gateTime5", daily.getGateTime()); map.put("multiplyTimes5", daily.getMultiplyFrequency()); map.put("groupNumber5", daily.getSerialNumber()); - //频率测量范围、输入灵敏度及最大输入电平 - List levelList = groupMap.get("6"); - //频率测量误差 - List errorList = groupMap.get("7"); - - map.put("startupList", startupList); - map.put("stabilityList", stabilityList); - map.put("deviationList", deviationList); - map.put("reproList", reproList); map.put("dailyList", dailyList); + //频率测量范围、输入灵敏度及最大输入电平 + List levelList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); map.put("levelList", levelList); + //频率测量误差 + List errorList = atomList.stream().filter(a -> "7".equals(a.getDataType())).collect(Collectors.toList()); map.put("errorList", errorList); } private void readyForUniversalCounter(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); //晶振开机 - List startupList = groupMap.get("1"); + List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0); map.put("gateTime1", cesiumAtom.getGateTime()); map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency()); map.put("groupNumber1", cesiumAtom.getGroupNumber()); //晶振1s频率稳定度 - List stabilityList = groupMap.get("2"); + List stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0); map.put("gateTime2", stability.getGateTime()); map.put("multiplyTimes2", stability.getMultiplyFrequency()); map.put("groupNumber2", stability.getGroupNumber()); //晶振相对频率偏差 - List relativeList = groupMap.get("3"); + List relativeList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0); map.put("gateTime3", relative.getGateTime()); map.put("multiplyTimes3", relative.getMultiplyFrequency()); //晶振频率复现性 - List reproList = groupMap.get("4"); + List reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0); map.put("gateTime4", repro.getGateTime()); map.put("multiplyTimes4", repro.getMultiplyFrequency()); map.put("tOne", repro.getTOne()); map.put("tTwo", repro.getTTwo()); //晶振日老化率 - List dailyList = groupMap.get("5"); + List dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0); map.put("gateTime5", daily.getGateTime()); map.put("multiplyTimes5", daily.getMultiplyFrequency()); map.put("groupNumber5", daily.getGroupNumber()); //频率测量范围、输入灵敏度 - List freqList = groupMap.get("6"); + List freqList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); //频率测量误差 - List freqErrorList = groupMap.get("7"); + List freqErrorList = atomList.stream().filter(a -> "7".equals(a.getDataType())).collect(Collectors.toList()); //周期测量范围、输入灵敏度 - List cycleList = groupMap.get("8"); + List cycleList = atomList.stream().filter(a -> "8".equals(a.getDataType())).collect(Collectors.toList()); //周期测量误差 - List cycleErrorList = groupMap.get("9"); + List cycleErrorList = atomList.stream().filter(a -> "9".equals(a.getDataType())).collect(Collectors.toList()); //时间间隔测量范围及测量误差 - List timeIntervalList = groupMap.get("10"); + List timeIntervalList = atomList.stream().filter(a -> "10".equals(a.getDataType())).collect(Collectors.toList()); map.put("startupList", startupList); map.put("stabilityList", stabilityList); @@ -325,26 +312,23 @@ } private void readyForRubidiumClock(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); - //输出信号 - List outputList = groupMap.get(FREQUENCY_SIGNAL_OUTPUT_AMPLITUDE); + List outputList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); //开机特性 - List bootList = groupMap.get(SECOND_PULSE_OUTPUT); + List bootList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); //频率稳定度 - List stabilityList = groupMap.get(FREQUENCY_STABILITY); + List stabilityList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); //相对频率偏差 - List relativeList = groupMap.get(RELATIVE_FREQUENCY_DEVIATION); + List relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); //频率复现性 - List reproList = groupMap.get(FREQUENCY_REPRODUCIBILITY); + List reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = reproList.get(0); map.put("tOne", cesiumAtom.getTOne()); map.put("tTwo", cesiumAtom.getTTwo()); map.put("tThree", cesiumAtom.getTThree()); //日频率漂移率 - List dailyList = groupMap.get(DAILY_AGING_RATE_OF_CRYSTAL_OSCILLATOR); + List dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); map.put("outputList", outputList); map.put("bootList", bootList); @@ -354,22 +338,19 @@ map.put("dailyList", dailyList); } - private void readyForCrystalOscillator(Map map, List cesiumAtomList) throws Exception { - //根据dataType进行分组，key为dataType值，value为具体List - Map> groupMap = cesiumAtomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); + private void readyForCrystalOscillator(Map map, List atomList) throws Exception { //频率信号输出幅度 - List outputList = groupMap.get(FREQUENCY_SIGNAL_OUTPUT_AMPLITUDE); + List outputList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); //秒脉冲输出 - List pulseList = groupMap.get(SECOND_PULSE_OUTPUT); + List pulseList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); //频率稳定度 - List stabilityList = groupMap.get(FREQUENCY_STABILITY); + List stabilityList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); //相对频率偏差 - List relativeList = groupMap.get(RELATIVE_FREQUENCY_DEVIATION); + List relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); //频率复现性 - List reproList = groupMap.get(FREQUENCY_REPRODUCIBILITY); + List reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); //晶振日老化率 - List dailyList = groupMap.get(DAILY_AGING_RATE_OF_CRYSTAL_OSCILLATOR); + List dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0); map.put("relativeGateTime", relative.getGateTime()); @@ -401,18 +382,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } - - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -440,7 +409,6 @@ default: throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST); } - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); 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 ab6e2c5..18d5c57 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 @@ -71,9 +71,7 @@ Map map = BeanUtil.beanToMap(request); processCheckAccord(map, request.getLabCode()); List eTwoList = request.getCheckDataETwoList(); - prepareCheckParams(eTwoList, map); - map.put("pdfStatus", 1); //除了选用的模板不一致，模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(ETWO_WEIGHT_CHECK_DATA, "数据打印", null, map, false, null, null); @@ -178,7 +176,6 @@ deltaIotaMap.put("fiveValue", e.getAverageValueFive()); deltaIotaMap.put("sixValue", e.getAverageValueSix()); mapReplace(deltaIotaMap); - ; return deltaIotaMap; }).collect(Collectors.toList()); repList.add(deltaIotaList.get(0)); @@ -469,16 +466,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataDcPower()); - request.setMeasureDataDcPowerList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java index 07c5d96..d42b7f7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java @@ -163,22 +163,22 @@ Map> groupMap = list.stream() .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataLowFrequencySignal::getDataType)); //频率 - List frequencyList = groupMap.get("1"); + List frequencyList = list.stream().filter(data->"1".equals(data.getDataType())).collect(Collectors.toList()); map.put("frequencyList", frequencyList); //交流电压 - List crossList = groupMap.get("2"); + List crossList = list.stream().filter(data->"2".equals(data.getDataType())).collect(Collectors.toList()); map.put("crossList", crossList); //直流电压 - List dcList = groupMap.get("3"); + List dcList = list.stream().filter(data->"3".equals(data.getDataType())).collect(Collectors.toList()); map.put("dcList", dcList); //上升时间 - List riseList = groupMap.get("4"); + List riseList = list.stream().filter(data->"4".equals(data.getDataType())).collect(Collectors.toList()); map.put("riseList", riseList); //正弦信号平坦度 - List flatnessList = groupMap.get("5"); + List flatnessList = list.stream().filter(data->"5".equals(data.getDataType())).collect(Collectors.toList()); map.put("flatnessList", flatnessList); //总谐波失真 - List harmonicList = groupMap.get("6"); + List harmonicList = list.stream().filter(data->"6".equals(data.getDataType())).collect(Collectors.toList()); map.put("harmonicList", harmonicList); } @@ -189,16 +189,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java index 115263d..8e9573f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java @@ -160,16 +160,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java index d0b58b8..6aaeab4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java @@ -192,22 +192,10 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - readyForMicrowaveParams(map, request.getMeasureDataMicrowaveAttenuationList()); - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java index 9a781a1..85a7c50 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java @@ -139,27 +139,15 @@ log.debug("校验没有原始记录"); return null; } - if (examineOriginalFile(request)) { - log.debug("校验没有原始记录"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataSpectrumAnalyzerList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataSpectrumAnalyzer()); - request.setMeasureDataSpectrumAnalyzerList(list); - } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataOscilloscope oscilloscope : request.getMeasureDataOscilloscopeList()) { BizBusinessDeviceMeasureDataOscilloscope scope = (BizBusinessDeviceMeasureDataOscilloscope) BeanUtils.cloneBean(oscilloscope); scope.applyStrategyBasedOnDataType(request.getItemCategoryName()); list.add(scope); } - switch (request.getItemCategoryName()) { case DIGITAL_OSCILLOSCOPE: readyForDigitalParams(map, list); @@ -168,9 +156,8 @@ readyForImitateParams(map, list); break; default: - throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST); + break; } - //替换/方法 replaceSlash(map); List templateUrls = new ArrayList<>(); @@ -202,28 +189,15 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataSpectrumAnalyzerList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataSpectrumAnalyzer()); - request.setMeasureDataSpectrumAnalyzerList(list); - } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataOscilloscope oscilloscope : request.getMeasureDataOscilloscopeList()) { BizBusinessDeviceMeasureDataOscilloscope scope = (BizBusinessDeviceMeasureDataOscilloscope) BeanUtils.cloneBean(oscilloscope); scope.applyStrategyBasedOnDataType(request.getItemCategoryName()); list.add(scope); } - switch (request.getItemCategoryName()) { case DIGITAL_OSCILLOSCOPE: readyForDigitalParams(map, list); @@ -232,9 +206,8 @@ readyForImitateParams(map, list); break; default: - throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST); + break; } - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); @@ -267,32 +240,26 @@ * @param oscilloscopeList */ private void readyForImitateParams(Map map, List oscilloscopeList) { - if (CollectionUtils.isEmpty(oscilloscopeList)) { - throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_MEASURE_DATA_NOT_EXIST); - } - //根据dataType分组，key为dataType，value为List - Map> groupMap = oscilloscopeList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataOscilloscope::getDataType)); //扫描时间系数及扩展 - List expansionList = groupMap.get(SCAN_TIME_COEFFICIENT_AND_EXPANSION); + List expansionList = oscilloscopeList.stream().filter(o -> "1".equals(o.getDataType())).collect(Collectors.toList()); map.put("expansionList", expansionList); //垂直幅度测量 - List verticalList = groupMap.get(VERTICAL_AMPLITUDE_MEASUREMENT); + List verticalList = oscilloscopeList.stream().filter(o -> "2".equals(o.getDataType())).collect(Collectors.toList()); map.put("verticalList", verticalList); //频带宽度 - List widthList = groupMap.get(FREQUENCY_BAND_WIDTH); + List widthList = oscilloscopeList.stream().filter(o -> "3".equals(o.getDataType())).collect(Collectors.toList()); map.put("widthList", widthList); //触发特性 - List triggerList = groupMap.get(TRIGGER_CHARACTERISTICS); + List triggerList = oscilloscopeList.stream().filter(o -> "4".equals(o.getDataType())).collect(Collectors.toList()); map.put("triggerList", triggerList); //输入电阻 - List resistanceList = groupMap.get(INPUT_RESISTANCE); + List resistanceList = oscilloscopeList.stream().filter(o -> "5".equals(o.getDataType())).collect(Collectors.toList()); map.put("resistanceList", resistanceList); //上升时间 - List riseList = groupMap.get(RISE_TIME); + List riseList = oscilloscopeList.stream().filter(o -> "6".equals(o.getDataType())).collect(Collectors.toList()); map.put("riseList", riseList); //校准信号 - List signalList = groupMap.get(OSCILLOSCOPE_CALIBRATION_SIGNAL); + List signalList = oscilloscopeList.stream().filter(o -> "7".equals(o.getDataType())).collect(Collectors.toList()); map.put("signalList", signalList); } @@ -303,35 +270,28 @@ * @param oscilloscopeList */ private void readyForDigitalParams(Map map, List oscilloscopeList) { - if (CollectionUtils.isEmpty(oscilloscopeList)) { - throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_MEASURE_DATA_NOT_EXIST); - } - //根据dataType分组，key为dataType，value为List - Map> groupMap = oscilloscopeList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataOscilloscope::getDataType)); - - List baseList = groupMap.get(TIME_BASE); + List baseList = oscilloscopeList.stream().filter(o -> "1".equals(o.getDataType())).collect(Collectors.toList()); map.put("baseList", baseList); - List gainList = groupMap.get(DC_GAIN); + List gainList = oscilloscopeList.stream().filter(o -> "2".equals(o.getDataType())).collect(Collectors.toList()); map.put("gainList", gainList); - List offetList = groupMap.get(DC_OFFSET); + List offetList = oscilloscopeList.stream().filter(o -> "3".equals(o.getDataType())).collect(Collectors.toList()); map.put("offsetList", offetList); - List bandwidthList = groupMap.get(OSCILLOSCOPE_FREQUENCY_BAND_WIDTH); + List bandwidthList = oscilloscopeList.stream().filter(o -> "4".equals(o.getDataType())).collect(Collectors.toList()); map.put("bandwidthList", bandwidthList); - List sensitivityList = groupMap.get(TRIGGER_SENSITIVITY); + List sensitivityList = oscilloscopeList.stream().filter(o -> "5".equals(o.getDataType())).collect(Collectors.toList()); map.put("sensitivityList", sensitivityList); - List riseTimeList = groupMap.get(RISE_TIME); + List riseTimeList = oscilloscopeList.stream().filter(o -> "6".equals(o.getDataType())).collect(Collectors.toList()); map.put("timeList", riseTimeList); - List inputList = groupMap.get(OSCILLOSCOPE_INPUT_RESISTANCE); + List inputList = oscilloscopeList.stream().filter(o -> "7".equals(o.getDataType())).collect(Collectors.toList()); map.put("inputList", inputList); - List signalList = groupMap.get(SIGNAL); + List signalList = oscilloscopeList.stream().filter(o -> "8".equals(o.getDataType())).collect(Collectors.toList()); map.put("signalList", signalList); } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java index b2974b4..2b3a3af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java @@ -382,6 +382,10 @@ @TableField(exist = false) private Integer colorMark = 0; + @ApiModelProperty(value = "测量范围",dataType = "String") + @TableField(exist = false) + private String range; + @ApiModelProperty(value = "技术指标", dataType = "List") @TableField(exist = false) private List technicalTargetList; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java index 5e37fa3..d8a97c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java @@ -83,11 +83,9 @@ } } - private void readyForCheckDataParams(Map map, List checkDataCesiumAtomList) { - Map> groupMap = checkDataCesiumAtomList.stream().collect(Collectors.groupingBy(BizEquipmentStandardCheckDataCesiumAtom::getParams)); - + private void readyForCheckDataParams(Map map, List atomList) { //铯原子频标 - List cesiumAtomList = groupMap.get("1").stream().map(atom -> { + List cesiumAtomList = atomList.stream().filter(a -> "1".equals(a.getParams())).map(atom -> { atom.setCheckPoint(StringUtils.isNotBlank(atom.getCheckPoint()) ? atom.getCheckPoint() + atom.getUnit() : ""); atom.setElectricalLevel(StringUtils.isNotBlank(atom.getElectricalLevel()) ? atom.getElectricalLevel() + atom.getElectricalLevelUnit() : ""); atom.setAmplitude(StringUtils.isNotBlank(atom.getAmplitude()) ? atom.getAmplitude() + atom.getAmplitudeUnit() : ""); @@ -109,7 +107,7 @@ map.put(STA_PREFIX + 1 + DATE_PREFIX + 6, atom.getTestValueSixDate()); //函数信号发生器 - List funcationList = groupMap.get("2").stream().map(fun -> { + List funcationList = atomList.stream().filter(a -> "2".equals(a.getParams())).map(fun -> { fun.setCheckPoint(StringUtils.isNotBlank(fun.getCheckPoint()) ? fun.getCheckPoint() + fun.getUnit() : ""); fun.setElectricalLevel(StringUtils.isNotBlank(fun.getElectricalLevel()) ? fun.getElectricalLevel() + fun.getElectricalLevelUnit() : ""); fun.setAmplitude(StringUtils.isNotBlank(fun.getAmplitude()) ? fun.getAmplitude() + fun.getAmplitudeUnit() : ""); @@ -130,7 +128,7 @@ map.put(STA_PREFIX + 2 + DATE_PREFIX + 5, fun.getTestValueFiveDate()); map.put(STA_PREFIX + 2 + DATE_PREFIX + 6, fun.getTestValueSixDate()); - List signalList = groupMap.get("3").stream().map(signal -> { + List signalList = atomList.stream().filter(a -> "3".equals(a.getParams())).map(signal -> { signal.setCheckPoint(StringUtils.isNotBlank(signal.getCheckPoint()) ? signal.getCheckPoint() + signal.getUnit() : ""); signal.setElectricalLevel(StringUtils.isNotBlank(signal.getElectricalLevel()) ? signal.getElectricalLevel() + signal.getElectricalLevelUnit() : ""); signal.setAmplitude(StringUtils.isNotBlank(signal.getAmplitude()) ? signal.getAmplitude() + signal.getAmplitudeUnit() : ""); @@ -163,12 +161,6 @@ log.debug("校验没有原始记录"); return null; } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -220,97 +212,92 @@ } private void readyForMicrowaveCounter(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); //晶振开机特性 - List startupList = groupMap.get("1"); + List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0); map.put("gateTime1", cesiumAtom.getGateTime()); map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency()); map.put("groupNumber1", cesiumAtom.getSampleGroupNumber()); + map.put("startupList", startupList); //晶振1s频率稳定度 - List stabilityList = groupMap.get("2"); + List stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0); map.put("gateTime2", stability.getGateTime()); map.put("multiplyTimes2", stability.getMultiplyFrequency()); map.put("groupNumber2", stability.getSampleGroupNumber()); + map.put("stabilityList", stabilityList); //晶振相对频率偏差 - List deviationList = groupMap.get("3"); + List deviationList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom deviation = deviationList.get(0); map.put("gateTime3", deviation.getGateTime()); map.put("multiplyTimes3", deviation.getMultiplyFrequency()); + map.put("deviationList", deviationList); //晶振频率复现性 - List reproList = groupMap.get("4"); + List reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0); map.put("gateTime4", repro.getGateTime()); map.put("multiplyTimes4", repro.getMultiplyFrequency()); map.put("tOne", repro.getTOne()); map.put("tTwo", repro.getTTwo()); + map.put("reproList", reproList); //晶振日老化率 - List dailyList = groupMap.get("5"); + List dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0); map.put("gateTime5", daily.getGateTime()); map.put("multiplyTimes5", daily.getMultiplyFrequency()); map.put("groupNumber5", daily.getSerialNumber()); - //频率测量范围、输入灵敏度及最大输入电平 - List levelList = groupMap.get("6"); - //频率测量误差 - List errorList = groupMap.get("7"); - - map.put("startupList", startupList); - map.put("stabilityList", stabilityList); - map.put("deviationList", deviationList); - map.put("reproList", reproList); map.put("dailyList", dailyList); + //频率测量范围、输入灵敏度及最大输入电平 + List levelList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); map.put("levelList", levelList); + //频率测量误差 + List errorList = atomList.stream().filter(a -> "7".equals(a.getDataType())).collect(Collectors.toList()); map.put("errorList", errorList); } private void readyForUniversalCounter(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); //晶振开机 - List startupList = groupMap.get("1"); + List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0); map.put("gateTime1", cesiumAtom.getGateTime()); map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency()); map.put("groupNumber1", cesiumAtom.getGroupNumber()); //晶振1s频率稳定度 - List stabilityList = groupMap.get("2"); + List stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0); map.put("gateTime2", stability.getGateTime()); map.put("multiplyTimes2", stability.getMultiplyFrequency()); map.put("groupNumber2", stability.getGroupNumber()); //晶振相对频率偏差 - List relativeList = groupMap.get("3"); + List relativeList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0); map.put("gateTime3", relative.getGateTime()); map.put("multiplyTimes3", relative.getMultiplyFrequency()); //晶振频率复现性 - List reproList = groupMap.get("4"); + List reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0); map.put("gateTime4", repro.getGateTime()); map.put("multiplyTimes4", repro.getMultiplyFrequency()); map.put("tOne", repro.getTOne()); map.put("tTwo", repro.getTTwo()); //晶振日老化率 - List dailyList = groupMap.get("5"); + List dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0); map.put("gateTime5", daily.getGateTime()); map.put("multiplyTimes5", daily.getMultiplyFrequency()); map.put("groupNumber5", daily.getGroupNumber()); //频率测量范围、输入灵敏度 - List freqList = groupMap.get("6"); + List freqList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); //频率测量误差 - List freqErrorList = groupMap.get("7"); + List freqErrorList = atomList.stream().filter(a -> "7".equals(a.getDataType())).collect(Collectors.toList()); //周期测量范围、输入灵敏度 - List cycleList = groupMap.get("8"); + List cycleList = atomList.stream().filter(a -> "8".equals(a.getDataType())).collect(Collectors.toList()); //周期测量误差 - List cycleErrorList = groupMap.get("9"); + List cycleErrorList = atomList.stream().filter(a -> "9".equals(a.getDataType())).collect(Collectors.toList()); //时间间隔测量范围及测量误差 - List timeIntervalList = groupMap.get("10"); + List timeIntervalList = atomList.stream().filter(a -> "10".equals(a.getDataType())).collect(Collectors.toList()); map.put("startupList", startupList); map.put("stabilityList", stabilityList); @@ -325,26 +312,23 @@ } private void readyForRubidiumClock(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); - //输出信号 - List outputList = groupMap.get(FREQUENCY_SIGNAL_OUTPUT_AMPLITUDE); + List outputList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); //开机特性 - List bootList = groupMap.get(SECOND_PULSE_OUTPUT); + List bootList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); //频率稳定度 - List stabilityList = groupMap.get(FREQUENCY_STABILITY); + List stabilityList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); //相对频率偏差 - List relativeList = groupMap.get(RELATIVE_FREQUENCY_DEVIATION); + List relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); //频率复现性 - List reproList = groupMap.get(FREQUENCY_REPRODUCIBILITY); + List reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = reproList.get(0); map.put("tOne", cesiumAtom.getTOne()); map.put("tTwo", cesiumAtom.getTTwo()); map.put("tThree", cesiumAtom.getTThree()); //日频率漂移率 - List dailyList = groupMap.get(DAILY_AGING_RATE_OF_CRYSTAL_OSCILLATOR); + List dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); map.put("outputList", outputList); map.put("bootList", bootList); @@ -354,22 +338,19 @@ map.put("dailyList", dailyList); } - private void readyForCrystalOscillator(Map map, List cesiumAtomList) throws Exception { - //根据dataType进行分组，key为dataType值，value为具体List - Map> groupMap = cesiumAtomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); + private void readyForCrystalOscillator(Map map, List atomList) throws Exception { //频率信号输出幅度 - List outputList = groupMap.get(FREQUENCY_SIGNAL_OUTPUT_AMPLITUDE); + List outputList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); //秒脉冲输出 - List pulseList = groupMap.get(SECOND_PULSE_OUTPUT); + List pulseList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); //频率稳定度 - List stabilityList = groupMap.get(FREQUENCY_STABILITY); + List stabilityList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); //相对频率偏差 - List relativeList = groupMap.get(RELATIVE_FREQUENCY_DEVIATION); + List relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); //频率复现性 - List reproList = groupMap.get(FREQUENCY_REPRODUCIBILITY); + List reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); //晶振日老化率 - List dailyList = groupMap.get(DAILY_AGING_RATE_OF_CRYSTAL_OSCILLATOR); + List dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0); map.put("relativeGateTime", relative.getGateTime()); @@ -401,18 +382,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } - - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -440,7 +409,6 @@ default: throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST); } - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); 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 ab6e2c5..18d5c57 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 @@ -71,9 +71,7 @@ Map map = BeanUtil.beanToMap(request); processCheckAccord(map, request.getLabCode()); List eTwoList = request.getCheckDataETwoList(); - prepareCheckParams(eTwoList, map); - map.put("pdfStatus", 1); //除了选用的模板不一致，模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(ETWO_WEIGHT_CHECK_DATA, "数据打印", null, map, false, null, null); @@ -178,7 +176,6 @@ deltaIotaMap.put("fiveValue", e.getAverageValueFive()); deltaIotaMap.put("sixValue", e.getAverageValueSix()); mapReplace(deltaIotaMap); - ; return deltaIotaMap; }).collect(Collectors.toList()); repList.add(deltaIotaList.get(0)); @@ -469,16 +466,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataDcPower()); - request.setMeasureDataDcPowerList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java index 07c5d96..d42b7f7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java @@ -163,22 +163,22 @@ Map> groupMap = list.stream() .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataLowFrequencySignal::getDataType)); //频率 - List frequencyList = groupMap.get("1"); + List frequencyList = list.stream().filter(data->"1".equals(data.getDataType())).collect(Collectors.toList()); map.put("frequencyList", frequencyList); //交流电压 - List crossList = groupMap.get("2"); + List crossList = list.stream().filter(data->"2".equals(data.getDataType())).collect(Collectors.toList()); map.put("crossList", crossList); //直流电压 - List dcList = groupMap.get("3"); + List dcList = list.stream().filter(data->"3".equals(data.getDataType())).collect(Collectors.toList()); map.put("dcList", dcList); //上升时间 - List riseList = groupMap.get("4"); + List riseList = list.stream().filter(data->"4".equals(data.getDataType())).collect(Collectors.toList()); map.put("riseList", riseList); //正弦信号平坦度 - List flatnessList = groupMap.get("5"); + List flatnessList = list.stream().filter(data->"5".equals(data.getDataType())).collect(Collectors.toList()); map.put("flatnessList", flatnessList); //总谐波失真 - List harmonicList = groupMap.get("6"); + List harmonicList = list.stream().filter(data->"6".equals(data.getDataType())).collect(Collectors.toList()); map.put("harmonicList", harmonicList); } @@ -189,16 +189,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java index 115263d..8e9573f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java @@ -160,16 +160,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java index d0b58b8..6aaeab4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java @@ -192,22 +192,10 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - readyForMicrowaveParams(map, request.getMeasureDataMicrowaveAttenuationList()); - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java index 9a781a1..85a7c50 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java @@ -139,27 +139,15 @@ log.debug("校验没有原始记录"); return null; } - if (examineOriginalFile(request)) { - log.debug("校验没有原始记录"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataSpectrumAnalyzerList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataSpectrumAnalyzer()); - request.setMeasureDataSpectrumAnalyzerList(list); - } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataOscilloscope oscilloscope : request.getMeasureDataOscilloscopeList()) { BizBusinessDeviceMeasureDataOscilloscope scope = (BizBusinessDeviceMeasureDataOscilloscope) BeanUtils.cloneBean(oscilloscope); scope.applyStrategyBasedOnDataType(request.getItemCategoryName()); list.add(scope); } - switch (request.getItemCategoryName()) { case DIGITAL_OSCILLOSCOPE: readyForDigitalParams(map, list); @@ -168,9 +156,8 @@ readyForImitateParams(map, list); break; default: - throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST); + break; } - //替换/方法 replaceSlash(map); List templateUrls = new ArrayList<>(); @@ -202,28 +189,15 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataSpectrumAnalyzerList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataSpectrumAnalyzer()); - request.setMeasureDataSpectrumAnalyzerList(list); - } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataOscilloscope oscilloscope : request.getMeasureDataOscilloscopeList()) { BizBusinessDeviceMeasureDataOscilloscope scope = (BizBusinessDeviceMeasureDataOscilloscope) BeanUtils.cloneBean(oscilloscope); scope.applyStrategyBasedOnDataType(request.getItemCategoryName()); list.add(scope); } - switch (request.getItemCategoryName()) { case DIGITAL_OSCILLOSCOPE: readyForDigitalParams(map, list); @@ -232,9 +206,8 @@ readyForImitateParams(map, list); break; default: - throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST); + break; } - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); @@ -267,32 +240,26 @@ * @param oscilloscopeList */ private void readyForImitateParams(Map map, List oscilloscopeList) { - if (CollectionUtils.isEmpty(oscilloscopeList)) { - throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_MEASURE_DATA_NOT_EXIST); - } - //根据dataType分组，key为dataType，value为List - Map> groupMap = oscilloscopeList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataOscilloscope::getDataType)); //扫描时间系数及扩展 - List expansionList = groupMap.get(SCAN_TIME_COEFFICIENT_AND_EXPANSION); + List expansionList = oscilloscopeList.stream().filter(o -> "1".equals(o.getDataType())).collect(Collectors.toList()); map.put("expansionList", expansionList); //垂直幅度测量 - List verticalList = groupMap.get(VERTICAL_AMPLITUDE_MEASUREMENT); + List verticalList = oscilloscopeList.stream().filter(o -> "2".equals(o.getDataType())).collect(Collectors.toList()); map.put("verticalList", verticalList); //频带宽度 - List widthList = groupMap.get(FREQUENCY_BAND_WIDTH); + List widthList = oscilloscopeList.stream().filter(o -> "3".equals(o.getDataType())).collect(Collectors.toList()); map.put("widthList", widthList); //触发特性 - List triggerList = groupMap.get(TRIGGER_CHARACTERISTICS); + List triggerList = oscilloscopeList.stream().filter(o -> "4".equals(o.getDataType())).collect(Collectors.toList()); map.put("triggerList", triggerList); //输入电阻 - List resistanceList = groupMap.get(INPUT_RESISTANCE); + List resistanceList = oscilloscopeList.stream().filter(o -> "5".equals(o.getDataType())).collect(Collectors.toList()); map.put("resistanceList", resistanceList); //上升时间 - List riseList = groupMap.get(RISE_TIME); + List riseList = oscilloscopeList.stream().filter(o -> "6".equals(o.getDataType())).collect(Collectors.toList()); map.put("riseList", riseList); //校准信号 - List signalList = groupMap.get(OSCILLOSCOPE_CALIBRATION_SIGNAL); + List signalList = oscilloscopeList.stream().filter(o -> "7".equals(o.getDataType())).collect(Collectors.toList()); map.put("signalList", signalList); } @@ -303,35 +270,28 @@ * @param oscilloscopeList */ private void readyForDigitalParams(Map map, List oscilloscopeList) { - if (CollectionUtils.isEmpty(oscilloscopeList)) { - throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_MEASURE_DATA_NOT_EXIST); - } - //根据dataType分组，key为dataType，value为List - Map> groupMap = oscilloscopeList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataOscilloscope::getDataType)); - - List baseList = groupMap.get(TIME_BASE); + List baseList = oscilloscopeList.stream().filter(o -> "1".equals(o.getDataType())).collect(Collectors.toList()); map.put("baseList", baseList); - List gainList = groupMap.get(DC_GAIN); + List gainList = oscilloscopeList.stream().filter(o -> "2".equals(o.getDataType())).collect(Collectors.toList()); map.put("gainList", gainList); - List offetList = groupMap.get(DC_OFFSET); + List offetList = oscilloscopeList.stream().filter(o -> "3".equals(o.getDataType())).collect(Collectors.toList()); map.put("offsetList", offetList); - List bandwidthList = groupMap.get(OSCILLOSCOPE_FREQUENCY_BAND_WIDTH); + List bandwidthList = oscilloscopeList.stream().filter(o -> "4".equals(o.getDataType())).collect(Collectors.toList()); map.put("bandwidthList", bandwidthList); - List sensitivityList = groupMap.get(TRIGGER_SENSITIVITY); + List sensitivityList = oscilloscopeList.stream().filter(o -> "5".equals(o.getDataType())).collect(Collectors.toList()); map.put("sensitivityList", sensitivityList); - List riseTimeList = groupMap.get(RISE_TIME); + List riseTimeList = oscilloscopeList.stream().filter(o -> "6".equals(o.getDataType())).collect(Collectors.toList()); map.put("timeList", riseTimeList); - List inputList = groupMap.get(OSCILLOSCOPE_INPUT_RESISTANCE); + List inputList = oscilloscopeList.stream().filter(o -> "7".equals(o.getDataType())).collect(Collectors.toList()); map.put("inputList", inputList); - List signalList = groupMap.get(SIGNAL); + List signalList = oscilloscopeList.stream().filter(o -> "8".equals(o.getDataType())).collect(Collectors.toList()); map.put("signalList", signalList); } } 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 8792368..66781e5 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 @@ -84,6 +84,7 @@ /** * 准备核查填充参数 + * * @param thermometerList * @param map */ @@ -185,10 +186,13 @@ request.setMeasureDataResistanceThermometerList(list); } DictCodeUtils.convertDictCodeToName(request); + if (StringUtils.isNotBlank(request.getAngleAdjustError())){ + request.setAngleAdjustError("0".equals(request.getAngleAdjustError()) ? "可用" : "不可用"); + } Map map = BeanUtil.beanToMap(request); mapReplace(map); - readyForCoverParams(map,request.getLabCode()); + readyForCoverParams(map, request.getLabCode()); List resistanceThermometerList = request.getMeasureDataResistanceThermometerList(); @@ -416,17 +420,9 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - - - readyForCoverParams(map,request.getLabCode()); - + readyForCoverParams(map, request.getLabCode()); List thermometerList = request.getMeasureDataResistanceThermometerList(); switch (request.getItemCategoryName()) { case THERMAL_RESISTANCE: @@ -444,8 +440,6 @@ default: break; } - - readyForCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java index b2974b4..2b3a3af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java @@ -382,6 +382,10 @@ @TableField(exist = false) private Integer colorMark = 0; + @ApiModelProperty(value = "测量范围",dataType = "String") + @TableField(exist = false) + private String range; + @ApiModelProperty(value = "技术指标", dataType = "List") @TableField(exist = false) private List technicalTargetList; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java index 5e37fa3..d8a97c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java @@ -83,11 +83,9 @@ } } - private void readyForCheckDataParams(Map map, List checkDataCesiumAtomList) { - Map> groupMap = checkDataCesiumAtomList.stream().collect(Collectors.groupingBy(BizEquipmentStandardCheckDataCesiumAtom::getParams)); - + private void readyForCheckDataParams(Map map, List atomList) { //铯原子频标 - List cesiumAtomList = groupMap.get("1").stream().map(atom -> { + List cesiumAtomList = atomList.stream().filter(a -> "1".equals(a.getParams())).map(atom -> { atom.setCheckPoint(StringUtils.isNotBlank(atom.getCheckPoint()) ? atom.getCheckPoint() + atom.getUnit() : ""); atom.setElectricalLevel(StringUtils.isNotBlank(atom.getElectricalLevel()) ? atom.getElectricalLevel() + atom.getElectricalLevelUnit() : ""); atom.setAmplitude(StringUtils.isNotBlank(atom.getAmplitude()) ? atom.getAmplitude() + atom.getAmplitudeUnit() : ""); @@ -109,7 +107,7 @@ map.put(STA_PREFIX + 1 + DATE_PREFIX + 6, atom.getTestValueSixDate()); //函数信号发生器 - List funcationList = groupMap.get("2").stream().map(fun -> { + List funcationList = atomList.stream().filter(a -> "2".equals(a.getParams())).map(fun -> { fun.setCheckPoint(StringUtils.isNotBlank(fun.getCheckPoint()) ? fun.getCheckPoint() + fun.getUnit() : ""); fun.setElectricalLevel(StringUtils.isNotBlank(fun.getElectricalLevel()) ? fun.getElectricalLevel() + fun.getElectricalLevelUnit() : ""); fun.setAmplitude(StringUtils.isNotBlank(fun.getAmplitude()) ? fun.getAmplitude() + fun.getAmplitudeUnit() : ""); @@ -130,7 +128,7 @@ map.put(STA_PREFIX + 2 + DATE_PREFIX + 5, fun.getTestValueFiveDate()); map.put(STA_PREFIX + 2 + DATE_PREFIX + 6, fun.getTestValueSixDate()); - List signalList = groupMap.get("3").stream().map(signal -> { + List signalList = atomList.stream().filter(a -> "3".equals(a.getParams())).map(signal -> { signal.setCheckPoint(StringUtils.isNotBlank(signal.getCheckPoint()) ? signal.getCheckPoint() + signal.getUnit() : ""); signal.setElectricalLevel(StringUtils.isNotBlank(signal.getElectricalLevel()) ? signal.getElectricalLevel() + signal.getElectricalLevelUnit() : ""); signal.setAmplitude(StringUtils.isNotBlank(signal.getAmplitude()) ? signal.getAmplitude() + signal.getAmplitudeUnit() : ""); @@ -163,12 +161,6 @@ log.debug("校验没有原始记录"); return null; } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -220,97 +212,92 @@ } private void readyForMicrowaveCounter(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); //晶振开机特性 - List startupList = groupMap.get("1"); + List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0); map.put("gateTime1", cesiumAtom.getGateTime()); map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency()); map.put("groupNumber1", cesiumAtom.getSampleGroupNumber()); + map.put("startupList", startupList); //晶振1s频率稳定度 - List stabilityList = groupMap.get("2"); + List stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0); map.put("gateTime2", stability.getGateTime()); map.put("multiplyTimes2", stability.getMultiplyFrequency()); map.put("groupNumber2", stability.getSampleGroupNumber()); + map.put("stabilityList", stabilityList); //晶振相对频率偏差 - List deviationList = groupMap.get("3"); + List deviationList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom deviation = deviationList.get(0); map.put("gateTime3", deviation.getGateTime()); map.put("multiplyTimes3", deviation.getMultiplyFrequency()); + map.put("deviationList", deviationList); //晶振频率复现性 - List reproList = groupMap.get("4"); + List reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0); map.put("gateTime4", repro.getGateTime()); map.put("multiplyTimes4", repro.getMultiplyFrequency()); map.put("tOne", repro.getTOne()); map.put("tTwo", repro.getTTwo()); + map.put("reproList", reproList); //晶振日老化率 - List dailyList = groupMap.get("5"); + List dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0); map.put("gateTime5", daily.getGateTime()); map.put("multiplyTimes5", daily.getMultiplyFrequency()); map.put("groupNumber5", daily.getSerialNumber()); - //频率测量范围、输入灵敏度及最大输入电平 - List levelList = groupMap.get("6"); - //频率测量误差 - List errorList = groupMap.get("7"); - - map.put("startupList", startupList); - map.put("stabilityList", stabilityList); - map.put("deviationList", deviationList); - map.put("reproList", reproList); map.put("dailyList", dailyList); + //频率测量范围、输入灵敏度及最大输入电平 + List levelList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); map.put("levelList", levelList); + //频率测量误差 + List errorList = atomList.stream().filter(a -> "7".equals(a.getDataType())).collect(Collectors.toList()); map.put("errorList", errorList); } private void readyForUniversalCounter(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); //晶振开机 - List startupList = groupMap.get("1"); + List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0); map.put("gateTime1", cesiumAtom.getGateTime()); map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency()); map.put("groupNumber1", cesiumAtom.getGroupNumber()); //晶振1s频率稳定度 - List stabilityList = groupMap.get("2"); + List stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0); map.put("gateTime2", stability.getGateTime()); map.put("multiplyTimes2", stability.getMultiplyFrequency()); map.put("groupNumber2", stability.getGroupNumber()); //晶振相对频率偏差 - List relativeList = groupMap.get("3"); + List relativeList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0); map.put("gateTime3", relative.getGateTime()); map.put("multiplyTimes3", relative.getMultiplyFrequency()); //晶振频率复现性 - List reproList = groupMap.get("4"); + List reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0); map.put("gateTime4", repro.getGateTime()); map.put("multiplyTimes4", repro.getMultiplyFrequency()); map.put("tOne", repro.getTOne()); map.put("tTwo", repro.getTTwo()); //晶振日老化率 - List dailyList = groupMap.get("5"); + List dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0); map.put("gateTime5", daily.getGateTime()); map.put("multiplyTimes5", daily.getMultiplyFrequency()); map.put("groupNumber5", daily.getGroupNumber()); //频率测量范围、输入灵敏度 - List freqList = groupMap.get("6"); + List freqList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); //频率测量误差 - List freqErrorList = groupMap.get("7"); + List freqErrorList = atomList.stream().filter(a -> "7".equals(a.getDataType())).collect(Collectors.toList()); //周期测量范围、输入灵敏度 - List cycleList = groupMap.get("8"); + List cycleList = atomList.stream().filter(a -> "8".equals(a.getDataType())).collect(Collectors.toList()); //周期测量误差 - List cycleErrorList = groupMap.get("9"); + List cycleErrorList = atomList.stream().filter(a -> "9".equals(a.getDataType())).collect(Collectors.toList()); //时间间隔测量范围及测量误差 - List timeIntervalList = groupMap.get("10"); + List timeIntervalList = atomList.stream().filter(a -> "10".equals(a.getDataType())).collect(Collectors.toList()); map.put("startupList", startupList); map.put("stabilityList", stabilityList); @@ -325,26 +312,23 @@ } private void readyForRubidiumClock(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); - //输出信号 - List outputList = groupMap.get(FREQUENCY_SIGNAL_OUTPUT_AMPLITUDE); + List outputList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); //开机特性 - List bootList = groupMap.get(SECOND_PULSE_OUTPUT); + List bootList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); //频率稳定度 - List stabilityList = groupMap.get(FREQUENCY_STABILITY); + List stabilityList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); //相对频率偏差 - List relativeList = groupMap.get(RELATIVE_FREQUENCY_DEVIATION); + List relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); //频率复现性 - List reproList = groupMap.get(FREQUENCY_REPRODUCIBILITY); + List reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = reproList.get(0); map.put("tOne", cesiumAtom.getTOne()); map.put("tTwo", cesiumAtom.getTTwo()); map.put("tThree", cesiumAtom.getTThree()); //日频率漂移率 - List dailyList = groupMap.get(DAILY_AGING_RATE_OF_CRYSTAL_OSCILLATOR); + List dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); map.put("outputList", outputList); map.put("bootList", bootList); @@ -354,22 +338,19 @@ map.put("dailyList", dailyList); } - private void readyForCrystalOscillator(Map map, List cesiumAtomList) throws Exception { - //根据dataType进行分组，key为dataType值，value为具体List - Map> groupMap = cesiumAtomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); + private void readyForCrystalOscillator(Map map, List atomList) throws Exception { //频率信号输出幅度 - List outputList = groupMap.get(FREQUENCY_SIGNAL_OUTPUT_AMPLITUDE); + List outputList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); //秒脉冲输出 - List pulseList = groupMap.get(SECOND_PULSE_OUTPUT); + List pulseList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); //频率稳定度 - List stabilityList = groupMap.get(FREQUENCY_STABILITY); + List stabilityList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); //相对频率偏差 - List relativeList = groupMap.get(RELATIVE_FREQUENCY_DEVIATION); + List relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); //频率复现性 - List reproList = groupMap.get(FREQUENCY_REPRODUCIBILITY); + List reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); //晶振日老化率 - List dailyList = groupMap.get(DAILY_AGING_RATE_OF_CRYSTAL_OSCILLATOR); + List dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0); map.put("relativeGateTime", relative.getGateTime()); @@ -401,18 +382,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } - - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -440,7 +409,6 @@ default: throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST); } - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); 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 ab6e2c5..18d5c57 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 @@ -71,9 +71,7 @@ Map map = BeanUtil.beanToMap(request); processCheckAccord(map, request.getLabCode()); List eTwoList = request.getCheckDataETwoList(); - prepareCheckParams(eTwoList, map); - map.put("pdfStatus", 1); //除了选用的模板不一致，模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(ETWO_WEIGHT_CHECK_DATA, "数据打印", null, map, false, null, null); @@ -178,7 +176,6 @@ deltaIotaMap.put("fiveValue", e.getAverageValueFive()); deltaIotaMap.put("sixValue", e.getAverageValueSix()); mapReplace(deltaIotaMap); - ; return deltaIotaMap; }).collect(Collectors.toList()); repList.add(deltaIotaList.get(0)); @@ -469,16 +466,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataDcPower()); - request.setMeasureDataDcPowerList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java index 07c5d96..d42b7f7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java @@ -163,22 +163,22 @@ Map> groupMap = list.stream() .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataLowFrequencySignal::getDataType)); //频率 - List frequencyList = groupMap.get("1"); + List frequencyList = list.stream().filter(data->"1".equals(data.getDataType())).collect(Collectors.toList()); map.put("frequencyList", frequencyList); //交流电压 - List crossList = groupMap.get("2"); + List crossList = list.stream().filter(data->"2".equals(data.getDataType())).collect(Collectors.toList()); map.put("crossList", crossList); //直流电压 - List dcList = groupMap.get("3"); + List dcList = list.stream().filter(data->"3".equals(data.getDataType())).collect(Collectors.toList()); map.put("dcList", dcList); //上升时间 - List riseList = groupMap.get("4"); + List riseList = list.stream().filter(data->"4".equals(data.getDataType())).collect(Collectors.toList()); map.put("riseList", riseList); //正弦信号平坦度 - List flatnessList = groupMap.get("5"); + List flatnessList = list.stream().filter(data->"5".equals(data.getDataType())).collect(Collectors.toList()); map.put("flatnessList", flatnessList); //总谐波失真 - List harmonicList = groupMap.get("6"); + List harmonicList = list.stream().filter(data->"6".equals(data.getDataType())).collect(Collectors.toList()); map.put("harmonicList", harmonicList); } @@ -189,16 +189,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java index 115263d..8e9573f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java @@ -160,16 +160,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java index d0b58b8..6aaeab4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java @@ -192,22 +192,10 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - readyForMicrowaveParams(map, request.getMeasureDataMicrowaveAttenuationList()); - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java index 9a781a1..85a7c50 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java @@ -139,27 +139,15 @@ log.debug("校验没有原始记录"); return null; } - if (examineOriginalFile(request)) { - log.debug("校验没有原始记录"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataSpectrumAnalyzerList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataSpectrumAnalyzer()); - request.setMeasureDataSpectrumAnalyzerList(list); - } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataOscilloscope oscilloscope : request.getMeasureDataOscilloscopeList()) { BizBusinessDeviceMeasureDataOscilloscope scope = (BizBusinessDeviceMeasureDataOscilloscope) BeanUtils.cloneBean(oscilloscope); scope.applyStrategyBasedOnDataType(request.getItemCategoryName()); list.add(scope); } - switch (request.getItemCategoryName()) { case DIGITAL_OSCILLOSCOPE: readyForDigitalParams(map, list); @@ -168,9 +156,8 @@ readyForImitateParams(map, list); break; default: - throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST); + break; } - //替换/方法 replaceSlash(map); List templateUrls = new ArrayList<>(); @@ -202,28 +189,15 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataSpectrumAnalyzerList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataSpectrumAnalyzer()); - request.setMeasureDataSpectrumAnalyzerList(list); - } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataOscilloscope oscilloscope : request.getMeasureDataOscilloscopeList()) { BizBusinessDeviceMeasureDataOscilloscope scope = (BizBusinessDeviceMeasureDataOscilloscope) BeanUtils.cloneBean(oscilloscope); scope.applyStrategyBasedOnDataType(request.getItemCategoryName()); list.add(scope); } - switch (request.getItemCategoryName()) { case DIGITAL_OSCILLOSCOPE: readyForDigitalParams(map, list); @@ -232,9 +206,8 @@ readyForImitateParams(map, list); break; default: - throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST); + break; } - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); @@ -267,32 +240,26 @@ * @param oscilloscopeList */ private void readyForImitateParams(Map map, List oscilloscopeList) { - if (CollectionUtils.isEmpty(oscilloscopeList)) { - throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_MEASURE_DATA_NOT_EXIST); - } - //根据dataType分组，key为dataType，value为List - Map> groupMap = oscilloscopeList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataOscilloscope::getDataType)); //扫描时间系数及扩展 - List expansionList = groupMap.get(SCAN_TIME_COEFFICIENT_AND_EXPANSION); + List expansionList = oscilloscopeList.stream().filter(o -> "1".equals(o.getDataType())).collect(Collectors.toList()); map.put("expansionList", expansionList); //垂直幅度测量 - List verticalList = groupMap.get(VERTICAL_AMPLITUDE_MEASUREMENT); + List verticalList = oscilloscopeList.stream().filter(o -> "2".equals(o.getDataType())).collect(Collectors.toList()); map.put("verticalList", verticalList); //频带宽度 - List widthList = groupMap.get(FREQUENCY_BAND_WIDTH); + List widthList = oscilloscopeList.stream().filter(o -> "3".equals(o.getDataType())).collect(Collectors.toList()); map.put("widthList", widthList); //触发特性 - List triggerList = groupMap.get(TRIGGER_CHARACTERISTICS); + List triggerList = oscilloscopeList.stream().filter(o -> "4".equals(o.getDataType())).collect(Collectors.toList()); map.put("triggerList", triggerList); //输入电阻 - List resistanceList = groupMap.get(INPUT_RESISTANCE); + List resistanceList = oscilloscopeList.stream().filter(o -> "5".equals(o.getDataType())).collect(Collectors.toList()); map.put("resistanceList", resistanceList); //上升时间 - List riseList = groupMap.get(RISE_TIME); + List riseList = oscilloscopeList.stream().filter(o -> "6".equals(o.getDataType())).collect(Collectors.toList()); map.put("riseList", riseList); //校准信号 - List signalList = groupMap.get(OSCILLOSCOPE_CALIBRATION_SIGNAL); + List signalList = oscilloscopeList.stream().filter(o -> "7".equals(o.getDataType())).collect(Collectors.toList()); map.put("signalList", signalList); } @@ -303,35 +270,28 @@ * @param oscilloscopeList */ private void readyForDigitalParams(Map map, List oscilloscopeList) { - if (CollectionUtils.isEmpty(oscilloscopeList)) { - throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_MEASURE_DATA_NOT_EXIST); - } - //根据dataType分组，key为dataType，value为List - Map> groupMap = oscilloscopeList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataOscilloscope::getDataType)); - - List baseList = groupMap.get(TIME_BASE); + List baseList = oscilloscopeList.stream().filter(o -> "1".equals(o.getDataType())).collect(Collectors.toList()); map.put("baseList", baseList); - List gainList = groupMap.get(DC_GAIN); + List gainList = oscilloscopeList.stream().filter(o -> "2".equals(o.getDataType())).collect(Collectors.toList()); map.put("gainList", gainList); - List offetList = groupMap.get(DC_OFFSET); + List offetList = oscilloscopeList.stream().filter(o -> "3".equals(o.getDataType())).collect(Collectors.toList()); map.put("offsetList", offetList); - List bandwidthList = groupMap.get(OSCILLOSCOPE_FREQUENCY_BAND_WIDTH); + List bandwidthList = oscilloscopeList.stream().filter(o -> "4".equals(o.getDataType())).collect(Collectors.toList()); map.put("bandwidthList", bandwidthList); - List sensitivityList = groupMap.get(TRIGGER_SENSITIVITY); + List sensitivityList = oscilloscopeList.stream().filter(o -> "5".equals(o.getDataType())).collect(Collectors.toList()); map.put("sensitivityList", sensitivityList); - List riseTimeList = groupMap.get(RISE_TIME); + List riseTimeList = oscilloscopeList.stream().filter(o -> "6".equals(o.getDataType())).collect(Collectors.toList()); map.put("timeList", riseTimeList); - List inputList = groupMap.get(OSCILLOSCOPE_INPUT_RESISTANCE); + List inputList = oscilloscopeList.stream().filter(o -> "7".equals(o.getDataType())).collect(Collectors.toList()); map.put("inputList", inputList); - List signalList = groupMap.get(SIGNAL); + List signalList = oscilloscopeList.stream().filter(o -> "8".equals(o.getDataType())).collect(Collectors.toList()); map.put("signalList", signalList); } } 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 8792368..66781e5 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 @@ -84,6 +84,7 @@ /** * 准备核查填充参数 + * * @param thermometerList * @param map */ @@ -185,10 +186,13 @@ request.setMeasureDataResistanceThermometerList(list); } DictCodeUtils.convertDictCodeToName(request); + if (StringUtils.isNotBlank(request.getAngleAdjustError())){ + request.setAngleAdjustError("0".equals(request.getAngleAdjustError()) ? "可用" : "不可用"); + } Map map = BeanUtil.beanToMap(request); mapReplace(map); - readyForCoverParams(map,request.getLabCode()); + readyForCoverParams(map, request.getLabCode()); List resistanceThermometerList = request.getMeasureDataResistanceThermometerList(); @@ -416,17 +420,9 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - - - readyForCoverParams(map,request.getLabCode()); - + readyForCoverParams(map, request.getLabCode()); List thermometerList = request.getMeasureDataResistanceThermometerList(); switch (request.getItemCategoryName()) { case THERMAL_RESISTANCE: @@ -444,8 +440,6 @@ default: break; } - - readyForCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 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 f56749d..162b048 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 @@ -62,7 +62,6 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - List safetyValveList = request.getMeasureDataSafetyValueList(); readyForCoverParams(map,request.getLabCode()); List list = new ArrayList<>(); @@ -125,11 +124,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map,request.getLabCode()); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java index b2974b4..2b3a3af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java @@ -382,6 +382,10 @@ @TableField(exist = false) private Integer colorMark = 0; + @ApiModelProperty(value = "测量范围",dataType = "String") + @TableField(exist = false) + private String range; + @ApiModelProperty(value = "技术指标", dataType = "List") @TableField(exist = false) private List technicalTargetList; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java index 5e37fa3..d8a97c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java @@ -83,11 +83,9 @@ } } - private void readyForCheckDataParams(Map map, List checkDataCesiumAtomList) { - Map> groupMap = checkDataCesiumAtomList.stream().collect(Collectors.groupingBy(BizEquipmentStandardCheckDataCesiumAtom::getParams)); - + private void readyForCheckDataParams(Map map, List atomList) { //铯原子频标 - List cesiumAtomList = groupMap.get("1").stream().map(atom -> { + List cesiumAtomList = atomList.stream().filter(a -> "1".equals(a.getParams())).map(atom -> { atom.setCheckPoint(StringUtils.isNotBlank(atom.getCheckPoint()) ? atom.getCheckPoint() + atom.getUnit() : ""); atom.setElectricalLevel(StringUtils.isNotBlank(atom.getElectricalLevel()) ? atom.getElectricalLevel() + atom.getElectricalLevelUnit() : ""); atom.setAmplitude(StringUtils.isNotBlank(atom.getAmplitude()) ? atom.getAmplitude() + atom.getAmplitudeUnit() : ""); @@ -109,7 +107,7 @@ map.put(STA_PREFIX + 1 + DATE_PREFIX + 6, atom.getTestValueSixDate()); //函数信号发生器 - List funcationList = groupMap.get("2").stream().map(fun -> { + List funcationList = atomList.stream().filter(a -> "2".equals(a.getParams())).map(fun -> { fun.setCheckPoint(StringUtils.isNotBlank(fun.getCheckPoint()) ? fun.getCheckPoint() + fun.getUnit() : ""); fun.setElectricalLevel(StringUtils.isNotBlank(fun.getElectricalLevel()) ? fun.getElectricalLevel() + fun.getElectricalLevelUnit() : ""); fun.setAmplitude(StringUtils.isNotBlank(fun.getAmplitude()) ? fun.getAmplitude() + fun.getAmplitudeUnit() : ""); @@ -130,7 +128,7 @@ map.put(STA_PREFIX + 2 + DATE_PREFIX + 5, fun.getTestValueFiveDate()); map.put(STA_PREFIX + 2 + DATE_PREFIX + 6, fun.getTestValueSixDate()); - List signalList = groupMap.get("3").stream().map(signal -> { + List signalList = atomList.stream().filter(a -> "3".equals(a.getParams())).map(signal -> { signal.setCheckPoint(StringUtils.isNotBlank(signal.getCheckPoint()) ? signal.getCheckPoint() + signal.getUnit() : ""); signal.setElectricalLevel(StringUtils.isNotBlank(signal.getElectricalLevel()) ? signal.getElectricalLevel() + signal.getElectricalLevelUnit() : ""); signal.setAmplitude(StringUtils.isNotBlank(signal.getAmplitude()) ? signal.getAmplitude() + signal.getAmplitudeUnit() : ""); @@ -163,12 +161,6 @@ log.debug("校验没有原始记录"); return null; } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -220,97 +212,92 @@ } private void readyForMicrowaveCounter(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); //晶振开机特性 - List startupList = groupMap.get("1"); + List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0); map.put("gateTime1", cesiumAtom.getGateTime()); map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency()); map.put("groupNumber1", cesiumAtom.getSampleGroupNumber()); + map.put("startupList", startupList); //晶振1s频率稳定度 - List stabilityList = groupMap.get("2"); + List stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0); map.put("gateTime2", stability.getGateTime()); map.put("multiplyTimes2", stability.getMultiplyFrequency()); map.put("groupNumber2", stability.getSampleGroupNumber()); + map.put("stabilityList", stabilityList); //晶振相对频率偏差 - List deviationList = groupMap.get("3"); + List deviationList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom deviation = deviationList.get(0); map.put("gateTime3", deviation.getGateTime()); map.put("multiplyTimes3", deviation.getMultiplyFrequency()); + map.put("deviationList", deviationList); //晶振频率复现性 - List reproList = groupMap.get("4"); + List reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0); map.put("gateTime4", repro.getGateTime()); map.put("multiplyTimes4", repro.getMultiplyFrequency()); map.put("tOne", repro.getTOne()); map.put("tTwo", repro.getTTwo()); + map.put("reproList", reproList); //晶振日老化率 - List dailyList = groupMap.get("5"); + List dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0); map.put("gateTime5", daily.getGateTime()); map.put("multiplyTimes5", daily.getMultiplyFrequency()); map.put("groupNumber5", daily.getSerialNumber()); - //频率测量范围、输入灵敏度及最大输入电平 - List levelList = groupMap.get("6"); - //频率测量误差 - List errorList = groupMap.get("7"); - - map.put("startupList", startupList); - map.put("stabilityList", stabilityList); - map.put("deviationList", deviationList); - map.put("reproList", reproList); map.put("dailyList", dailyList); + //频率测量范围、输入灵敏度及最大输入电平 + List levelList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); map.put("levelList", levelList); + //频率测量误差 + List errorList = atomList.stream().filter(a -> "7".equals(a.getDataType())).collect(Collectors.toList()); map.put("errorList", errorList); } private void readyForUniversalCounter(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); //晶振开机 - List startupList = groupMap.get("1"); + List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0); map.put("gateTime1", cesiumAtom.getGateTime()); map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency()); map.put("groupNumber1", cesiumAtom.getGroupNumber()); //晶振1s频率稳定度 - List stabilityList = groupMap.get("2"); + List stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0); map.put("gateTime2", stability.getGateTime()); map.put("multiplyTimes2", stability.getMultiplyFrequency()); map.put("groupNumber2", stability.getGroupNumber()); //晶振相对频率偏差 - List relativeList = groupMap.get("3"); + List relativeList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0); map.put("gateTime3", relative.getGateTime()); map.put("multiplyTimes3", relative.getMultiplyFrequency()); //晶振频率复现性 - List reproList = groupMap.get("4"); + List reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0); map.put("gateTime4", repro.getGateTime()); map.put("multiplyTimes4", repro.getMultiplyFrequency()); map.put("tOne", repro.getTOne()); map.put("tTwo", repro.getTTwo()); //晶振日老化率 - List dailyList = groupMap.get("5"); + List dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0); map.put("gateTime5", daily.getGateTime()); map.put("multiplyTimes5", daily.getMultiplyFrequency()); map.put("groupNumber5", daily.getGroupNumber()); //频率测量范围、输入灵敏度 - List freqList = groupMap.get("6"); + List freqList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); //频率测量误差 - List freqErrorList = groupMap.get("7"); + List freqErrorList = atomList.stream().filter(a -> "7".equals(a.getDataType())).collect(Collectors.toList()); //周期测量范围、输入灵敏度 - List cycleList = groupMap.get("8"); + List cycleList = atomList.stream().filter(a -> "8".equals(a.getDataType())).collect(Collectors.toList()); //周期测量误差 - List cycleErrorList = groupMap.get("9"); + List cycleErrorList = atomList.stream().filter(a -> "9".equals(a.getDataType())).collect(Collectors.toList()); //时间间隔测量范围及测量误差 - List timeIntervalList = groupMap.get("10"); + List timeIntervalList = atomList.stream().filter(a -> "10".equals(a.getDataType())).collect(Collectors.toList()); map.put("startupList", startupList); map.put("stabilityList", stabilityList); @@ -325,26 +312,23 @@ } private void readyForRubidiumClock(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); - //输出信号 - List outputList = groupMap.get(FREQUENCY_SIGNAL_OUTPUT_AMPLITUDE); + List outputList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); //开机特性 - List bootList = groupMap.get(SECOND_PULSE_OUTPUT); + List bootList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); //频率稳定度 - List stabilityList = groupMap.get(FREQUENCY_STABILITY); + List stabilityList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); //相对频率偏差 - List relativeList = groupMap.get(RELATIVE_FREQUENCY_DEVIATION); + List relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); //频率复现性 - List reproList = groupMap.get(FREQUENCY_REPRODUCIBILITY); + List reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = reproList.get(0); map.put("tOne", cesiumAtom.getTOne()); map.put("tTwo", cesiumAtom.getTTwo()); map.put("tThree", cesiumAtom.getTThree()); //日频率漂移率 - List dailyList = groupMap.get(DAILY_AGING_RATE_OF_CRYSTAL_OSCILLATOR); + List dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); map.put("outputList", outputList); map.put("bootList", bootList); @@ -354,22 +338,19 @@ map.put("dailyList", dailyList); } - private void readyForCrystalOscillator(Map map, List cesiumAtomList) throws Exception { - //根据dataType进行分组，key为dataType值，value为具体List - Map> groupMap = cesiumAtomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); + private void readyForCrystalOscillator(Map map, List atomList) throws Exception { //频率信号输出幅度 - List outputList = groupMap.get(FREQUENCY_SIGNAL_OUTPUT_AMPLITUDE); + List outputList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); //秒脉冲输出 - List pulseList = groupMap.get(SECOND_PULSE_OUTPUT); + List pulseList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); //频率稳定度 - List stabilityList = groupMap.get(FREQUENCY_STABILITY); + List stabilityList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); //相对频率偏差 - List relativeList = groupMap.get(RELATIVE_FREQUENCY_DEVIATION); + List relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); //频率复现性 - List reproList = groupMap.get(FREQUENCY_REPRODUCIBILITY); + List reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); //晶振日老化率 - List dailyList = groupMap.get(DAILY_AGING_RATE_OF_CRYSTAL_OSCILLATOR); + List dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0); map.put("relativeGateTime", relative.getGateTime()); @@ -401,18 +382,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } - - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -440,7 +409,6 @@ default: throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST); } - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); 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 ab6e2c5..18d5c57 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 @@ -71,9 +71,7 @@ Map map = BeanUtil.beanToMap(request); processCheckAccord(map, request.getLabCode()); List eTwoList = request.getCheckDataETwoList(); - prepareCheckParams(eTwoList, map); - map.put("pdfStatus", 1); //除了选用的模板不一致，模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(ETWO_WEIGHT_CHECK_DATA, "数据打印", null, map, false, null, null); @@ -178,7 +176,6 @@ deltaIotaMap.put("fiveValue", e.getAverageValueFive()); deltaIotaMap.put("sixValue", e.getAverageValueSix()); mapReplace(deltaIotaMap); - ; return deltaIotaMap; }).collect(Collectors.toList()); repList.add(deltaIotaList.get(0)); @@ -469,16 +466,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataDcPower()); - request.setMeasureDataDcPowerList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java index 07c5d96..d42b7f7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java @@ -163,22 +163,22 @@ Map> groupMap = list.stream() .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataLowFrequencySignal::getDataType)); //频率 - List frequencyList = groupMap.get("1"); + List frequencyList = list.stream().filter(data->"1".equals(data.getDataType())).collect(Collectors.toList()); map.put("frequencyList", frequencyList); //交流电压 - List crossList = groupMap.get("2"); + List crossList = list.stream().filter(data->"2".equals(data.getDataType())).collect(Collectors.toList()); map.put("crossList", crossList); //直流电压 - List dcList = groupMap.get("3"); + List dcList = list.stream().filter(data->"3".equals(data.getDataType())).collect(Collectors.toList()); map.put("dcList", dcList); //上升时间 - List riseList = groupMap.get("4"); + List riseList = list.stream().filter(data->"4".equals(data.getDataType())).collect(Collectors.toList()); map.put("riseList", riseList); //正弦信号平坦度 - List flatnessList = groupMap.get("5"); + List flatnessList = list.stream().filter(data->"5".equals(data.getDataType())).collect(Collectors.toList()); map.put("flatnessList", flatnessList); //总谐波失真 - List harmonicList = groupMap.get("6"); + List harmonicList = list.stream().filter(data->"6".equals(data.getDataType())).collect(Collectors.toList()); map.put("harmonicList", harmonicList); } @@ -189,16 +189,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java index 115263d..8e9573f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java @@ -160,16 +160,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java index d0b58b8..6aaeab4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java @@ -192,22 +192,10 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - readyForMicrowaveParams(map, request.getMeasureDataMicrowaveAttenuationList()); - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java index 9a781a1..85a7c50 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java @@ -139,27 +139,15 @@ log.debug("校验没有原始记录"); return null; } - if (examineOriginalFile(request)) { - log.debug("校验没有原始记录"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataSpectrumAnalyzerList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataSpectrumAnalyzer()); - request.setMeasureDataSpectrumAnalyzerList(list); - } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataOscilloscope oscilloscope : request.getMeasureDataOscilloscopeList()) { BizBusinessDeviceMeasureDataOscilloscope scope = (BizBusinessDeviceMeasureDataOscilloscope) BeanUtils.cloneBean(oscilloscope); scope.applyStrategyBasedOnDataType(request.getItemCategoryName()); list.add(scope); } - switch (request.getItemCategoryName()) { case DIGITAL_OSCILLOSCOPE: readyForDigitalParams(map, list); @@ -168,9 +156,8 @@ readyForImitateParams(map, list); break; default: - throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST); + break; } - //替换/方法 replaceSlash(map); List templateUrls = new ArrayList<>(); @@ -202,28 +189,15 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataSpectrumAnalyzerList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataSpectrumAnalyzer()); - request.setMeasureDataSpectrumAnalyzerList(list); - } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataOscilloscope oscilloscope : request.getMeasureDataOscilloscopeList()) { BizBusinessDeviceMeasureDataOscilloscope scope = (BizBusinessDeviceMeasureDataOscilloscope) BeanUtils.cloneBean(oscilloscope); scope.applyStrategyBasedOnDataType(request.getItemCategoryName()); list.add(scope); } - switch (request.getItemCategoryName()) { case DIGITAL_OSCILLOSCOPE: readyForDigitalParams(map, list); @@ -232,9 +206,8 @@ readyForImitateParams(map, list); break; default: - throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST); + break; } - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); @@ -267,32 +240,26 @@ * @param oscilloscopeList */ private void readyForImitateParams(Map map, List oscilloscopeList) { - if (CollectionUtils.isEmpty(oscilloscopeList)) { - throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_MEASURE_DATA_NOT_EXIST); - } - //根据dataType分组，key为dataType，value为List - Map> groupMap = oscilloscopeList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataOscilloscope::getDataType)); //扫描时间系数及扩展 - List expansionList = groupMap.get(SCAN_TIME_COEFFICIENT_AND_EXPANSION); + List expansionList = oscilloscopeList.stream().filter(o -> "1".equals(o.getDataType())).collect(Collectors.toList()); map.put("expansionList", expansionList); //垂直幅度测量 - List verticalList = groupMap.get(VERTICAL_AMPLITUDE_MEASUREMENT); + List verticalList = oscilloscopeList.stream().filter(o -> "2".equals(o.getDataType())).collect(Collectors.toList()); map.put("verticalList", verticalList); //频带宽度 - List widthList = groupMap.get(FREQUENCY_BAND_WIDTH); + List widthList = oscilloscopeList.stream().filter(o -> "3".equals(o.getDataType())).collect(Collectors.toList()); map.put("widthList", widthList); //触发特性 - List triggerList = groupMap.get(TRIGGER_CHARACTERISTICS); + List triggerList = oscilloscopeList.stream().filter(o -> "4".equals(o.getDataType())).collect(Collectors.toList()); map.put("triggerList", triggerList); //输入电阻 - List resistanceList = groupMap.get(INPUT_RESISTANCE); + List resistanceList = oscilloscopeList.stream().filter(o -> "5".equals(o.getDataType())).collect(Collectors.toList()); map.put("resistanceList", resistanceList); //上升时间 - List riseList = groupMap.get(RISE_TIME); + List riseList = oscilloscopeList.stream().filter(o -> "6".equals(o.getDataType())).collect(Collectors.toList()); map.put("riseList", riseList); //校准信号 - List signalList = groupMap.get(OSCILLOSCOPE_CALIBRATION_SIGNAL); + List signalList = oscilloscopeList.stream().filter(o -> "7".equals(o.getDataType())).collect(Collectors.toList()); map.put("signalList", signalList); } @@ -303,35 +270,28 @@ * @param oscilloscopeList */ private void readyForDigitalParams(Map map, List oscilloscopeList) { - if (CollectionUtils.isEmpty(oscilloscopeList)) { - throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_MEASURE_DATA_NOT_EXIST); - } - //根据dataType分组，key为dataType，value为List - Map> groupMap = oscilloscopeList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataOscilloscope::getDataType)); - - List baseList = groupMap.get(TIME_BASE); + List baseList = oscilloscopeList.stream().filter(o -> "1".equals(o.getDataType())).collect(Collectors.toList()); map.put("baseList", baseList); - List gainList = groupMap.get(DC_GAIN); + List gainList = oscilloscopeList.stream().filter(o -> "2".equals(o.getDataType())).collect(Collectors.toList()); map.put("gainList", gainList); - List offetList = groupMap.get(DC_OFFSET); + List offetList = oscilloscopeList.stream().filter(o -> "3".equals(o.getDataType())).collect(Collectors.toList()); map.put("offsetList", offetList); - List bandwidthList = groupMap.get(OSCILLOSCOPE_FREQUENCY_BAND_WIDTH); + List bandwidthList = oscilloscopeList.stream().filter(o -> "4".equals(o.getDataType())).collect(Collectors.toList()); map.put("bandwidthList", bandwidthList); - List sensitivityList = groupMap.get(TRIGGER_SENSITIVITY); + List sensitivityList = oscilloscopeList.stream().filter(o -> "5".equals(o.getDataType())).collect(Collectors.toList()); map.put("sensitivityList", sensitivityList); - List riseTimeList = groupMap.get(RISE_TIME); + List riseTimeList = oscilloscopeList.stream().filter(o -> "6".equals(o.getDataType())).collect(Collectors.toList()); map.put("timeList", riseTimeList); - List inputList = groupMap.get(OSCILLOSCOPE_INPUT_RESISTANCE); + List inputList = oscilloscopeList.stream().filter(o -> "7".equals(o.getDataType())).collect(Collectors.toList()); map.put("inputList", inputList); - List signalList = groupMap.get(SIGNAL); + List signalList = oscilloscopeList.stream().filter(o -> "8".equals(o.getDataType())).collect(Collectors.toList()); map.put("signalList", signalList); } } 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 8792368..66781e5 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 @@ -84,6 +84,7 @@ /** * 准备核查填充参数 + * * @param thermometerList * @param map */ @@ -185,10 +186,13 @@ request.setMeasureDataResistanceThermometerList(list); } DictCodeUtils.convertDictCodeToName(request); + if (StringUtils.isNotBlank(request.getAngleAdjustError())){ + request.setAngleAdjustError("0".equals(request.getAngleAdjustError()) ? "可用" : "不可用"); + } Map map = BeanUtil.beanToMap(request); mapReplace(map); - readyForCoverParams(map,request.getLabCode()); + readyForCoverParams(map, request.getLabCode()); List resistanceThermometerList = request.getMeasureDataResistanceThermometerList(); @@ -416,17 +420,9 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - - - readyForCoverParams(map,request.getLabCode()); - + readyForCoverParams(map, request.getLabCode()); List thermometerList = request.getMeasureDataResistanceThermometerList(); switch (request.getItemCategoryName()) { case THERMAL_RESISTANCE: @@ -444,8 +440,6 @@ default: break; } - - readyForCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 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 f56749d..162b048 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 @@ -62,7 +62,6 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - List safetyValveList = request.getMeasureDataSafetyValueList(); readyForCoverParams(map,request.getLabCode()); List list = new ArrayList<>(); @@ -125,11 +124,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map,request.getLabCode()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SignalGeneratorHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SignalGeneratorHandler.java index 4697e6d..9682cb6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SignalGeneratorHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SignalGeneratorHandler.java @@ -143,6 +143,7 @@ appendTestValueUnit(s, "dBc"); break; default: + break; } } @@ -220,33 +221,32 @@ } private void readyForSignalGenerator(Map map, List generatorList) { - Map> groupMap = generatorList.stream().collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataSignalGenerator::getDataType)); //频率 - List frequencyList = groupMap.get("1"); + List frequencyList = generatorList.stream().filter(s -> "1".equals(s.getDataType())).collect(Collectors.toList()); map.put("frequencyList", frequencyList); //功率 - List powerList = groupMap.get("2"); + List powerList = generatorList.stream().filter(s -> "2".equals(s.getDataType())).collect(Collectors.toList()); map.put("powerList", powerList); //调幅 - List amplitudeModuList = groupMap.get("3"); + List amplitudeModuList = generatorList.stream().filter(s -> "3".equals(s.getDataType())).collect(Collectors.toList()); map.put("amplitudeModuList", amplitudeModuList); //调频 - List phaseList = groupMap.get("4"); + List phaseList = generatorList.stream().filter(s -> "4".equals(s.getDataType())).collect(Collectors.toList()); map.put("phaseList", phaseList); //剩余调幅 - List lastAmplitudeList = groupMap.get("5"); + List lastAmplitudeList = generatorList.stream().filter(s -> "5".equals(s.getDataType())).collect(Collectors.toList()); map.put("lastAmplitudeList", lastAmplitudeList); //剩余调频 - List lastPhaseList = groupMap.get("6"); + List lastPhaseList = generatorList.stream().filter(s -> "6".equals(s.getDataType())).collect(Collectors.toList()); map.put("lastPhaseList", lastPhaseList); //谐波 - List harmonicList = groupMap.get("7"); + List harmonicList = generatorList.stream().filter(s -> "7".equals(s.getDataType())).collect(Collectors.toList()); map.put("harmonicList", harmonicList); //调相 - List phaseModuList = groupMap.get("8"); + List phaseModuList = generatorList.stream().filter(s -> "8".equals(s.getDataType())).collect(Collectors.toList()); map.put("phaseModuList", phaseModuList); //非谐波 - List nonHarmonicList = groupMap.get("9"); + List nonHarmonicList = generatorList.stream().filter(s -> "9".equals(s.getDataType())).collect(Collectors.toList()); map.put("nonHarmonicList", nonHarmonicList); } @@ -257,16 +257,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java index b2974b4..2b3a3af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java @@ -382,6 +382,10 @@ @TableField(exist = false) private Integer colorMark = 0; + @ApiModelProperty(value = "测量范围",dataType = "String") + @TableField(exist = false) + private String range; + @ApiModelProperty(value = "技术指标", dataType = "List") @TableField(exist = false) private List technicalTargetList; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java index 5e37fa3..d8a97c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java @@ -83,11 +83,9 @@ } } - private void readyForCheckDataParams(Map map, List checkDataCesiumAtomList) { - Map> groupMap = checkDataCesiumAtomList.stream().collect(Collectors.groupingBy(BizEquipmentStandardCheckDataCesiumAtom::getParams)); - + private void readyForCheckDataParams(Map map, List atomList) { //铯原子频标 - List cesiumAtomList = groupMap.get("1").stream().map(atom -> { + List cesiumAtomList = atomList.stream().filter(a -> "1".equals(a.getParams())).map(atom -> { atom.setCheckPoint(StringUtils.isNotBlank(atom.getCheckPoint()) ? atom.getCheckPoint() + atom.getUnit() : ""); atom.setElectricalLevel(StringUtils.isNotBlank(atom.getElectricalLevel()) ? atom.getElectricalLevel() + atom.getElectricalLevelUnit() : ""); atom.setAmplitude(StringUtils.isNotBlank(atom.getAmplitude()) ? atom.getAmplitude() + atom.getAmplitudeUnit() : ""); @@ -109,7 +107,7 @@ map.put(STA_PREFIX + 1 + DATE_PREFIX + 6, atom.getTestValueSixDate()); //函数信号发生器 - List funcationList = groupMap.get("2").stream().map(fun -> { + List funcationList = atomList.stream().filter(a -> "2".equals(a.getParams())).map(fun -> { fun.setCheckPoint(StringUtils.isNotBlank(fun.getCheckPoint()) ? fun.getCheckPoint() + fun.getUnit() : ""); fun.setElectricalLevel(StringUtils.isNotBlank(fun.getElectricalLevel()) ? fun.getElectricalLevel() + fun.getElectricalLevelUnit() : ""); fun.setAmplitude(StringUtils.isNotBlank(fun.getAmplitude()) ? fun.getAmplitude() + fun.getAmplitudeUnit() : ""); @@ -130,7 +128,7 @@ map.put(STA_PREFIX + 2 + DATE_PREFIX + 5, fun.getTestValueFiveDate()); map.put(STA_PREFIX + 2 + DATE_PREFIX + 6, fun.getTestValueSixDate()); - List signalList = groupMap.get("3").stream().map(signal -> { + List signalList = atomList.stream().filter(a -> "3".equals(a.getParams())).map(signal -> { signal.setCheckPoint(StringUtils.isNotBlank(signal.getCheckPoint()) ? signal.getCheckPoint() + signal.getUnit() : ""); signal.setElectricalLevel(StringUtils.isNotBlank(signal.getElectricalLevel()) ? signal.getElectricalLevel() + signal.getElectricalLevelUnit() : ""); signal.setAmplitude(StringUtils.isNotBlank(signal.getAmplitude()) ? signal.getAmplitude() + signal.getAmplitudeUnit() : ""); @@ -163,12 +161,6 @@ log.debug("校验没有原始记录"); return null; } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -220,97 +212,92 @@ } private void readyForMicrowaveCounter(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); //晶振开机特性 - List startupList = groupMap.get("1"); + List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0); map.put("gateTime1", cesiumAtom.getGateTime()); map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency()); map.put("groupNumber1", cesiumAtom.getSampleGroupNumber()); + map.put("startupList", startupList); //晶振1s频率稳定度 - List stabilityList = groupMap.get("2"); + List stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0); map.put("gateTime2", stability.getGateTime()); map.put("multiplyTimes2", stability.getMultiplyFrequency()); map.put("groupNumber2", stability.getSampleGroupNumber()); + map.put("stabilityList", stabilityList); //晶振相对频率偏差 - List deviationList = groupMap.get("3"); + List deviationList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom deviation = deviationList.get(0); map.put("gateTime3", deviation.getGateTime()); map.put("multiplyTimes3", deviation.getMultiplyFrequency()); + map.put("deviationList", deviationList); //晶振频率复现性 - List reproList = groupMap.get("4"); + List reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0); map.put("gateTime4", repro.getGateTime()); map.put("multiplyTimes4", repro.getMultiplyFrequency()); map.put("tOne", repro.getTOne()); map.put("tTwo", repro.getTTwo()); + map.put("reproList", reproList); //晶振日老化率 - List dailyList = groupMap.get("5"); + List dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0); map.put("gateTime5", daily.getGateTime()); map.put("multiplyTimes5", daily.getMultiplyFrequency()); map.put("groupNumber5", daily.getSerialNumber()); - //频率测量范围、输入灵敏度及最大输入电平 - List levelList = groupMap.get("6"); - //频率测量误差 - List errorList = groupMap.get("7"); - - map.put("startupList", startupList); - map.put("stabilityList", stabilityList); - map.put("deviationList", deviationList); - map.put("reproList", reproList); map.put("dailyList", dailyList); + //频率测量范围、输入灵敏度及最大输入电平 + List levelList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); map.put("levelList", levelList); + //频率测量误差 + List errorList = atomList.stream().filter(a -> "7".equals(a.getDataType())).collect(Collectors.toList()); map.put("errorList", errorList); } private void readyForUniversalCounter(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); //晶振开机 - List startupList = groupMap.get("1"); + List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0); map.put("gateTime1", cesiumAtom.getGateTime()); map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency()); map.put("groupNumber1", cesiumAtom.getGroupNumber()); //晶振1s频率稳定度 - List stabilityList = groupMap.get("2"); + List stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0); map.put("gateTime2", stability.getGateTime()); map.put("multiplyTimes2", stability.getMultiplyFrequency()); map.put("groupNumber2", stability.getGroupNumber()); //晶振相对频率偏差 - List relativeList = groupMap.get("3"); + List relativeList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0); map.put("gateTime3", relative.getGateTime()); map.put("multiplyTimes3", relative.getMultiplyFrequency()); //晶振频率复现性 - List reproList = groupMap.get("4"); + List reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0); map.put("gateTime4", repro.getGateTime()); map.put("multiplyTimes4", repro.getMultiplyFrequency()); map.put("tOne", repro.getTOne()); map.put("tTwo", repro.getTTwo()); //晶振日老化率 - List dailyList = groupMap.get("5"); + List dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0); map.put("gateTime5", daily.getGateTime()); map.put("multiplyTimes5", daily.getMultiplyFrequency()); map.put("groupNumber5", daily.getGroupNumber()); //频率测量范围、输入灵敏度 - List freqList = groupMap.get("6"); + List freqList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); //频率测量误差 - List freqErrorList = groupMap.get("7"); + List freqErrorList = atomList.stream().filter(a -> "7".equals(a.getDataType())).collect(Collectors.toList()); //周期测量范围、输入灵敏度 - List cycleList = groupMap.get("8"); + List cycleList = atomList.stream().filter(a -> "8".equals(a.getDataType())).collect(Collectors.toList()); //周期测量误差 - List cycleErrorList = groupMap.get("9"); + List cycleErrorList = atomList.stream().filter(a -> "9".equals(a.getDataType())).collect(Collectors.toList()); //时间间隔测量范围及测量误差 - List timeIntervalList = groupMap.get("10"); + List timeIntervalList = atomList.stream().filter(a -> "10".equals(a.getDataType())).collect(Collectors.toList()); map.put("startupList", startupList); map.put("stabilityList", stabilityList); @@ -325,26 +312,23 @@ } private void readyForRubidiumClock(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); - //输出信号 - List outputList = groupMap.get(FREQUENCY_SIGNAL_OUTPUT_AMPLITUDE); + List outputList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); //开机特性 - List bootList = groupMap.get(SECOND_PULSE_OUTPUT); + List bootList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); //频率稳定度 - List stabilityList = groupMap.get(FREQUENCY_STABILITY); + List stabilityList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); //相对频率偏差 - List relativeList = groupMap.get(RELATIVE_FREQUENCY_DEVIATION); + List relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); //频率复现性 - List reproList = groupMap.get(FREQUENCY_REPRODUCIBILITY); + List reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = reproList.get(0); map.put("tOne", cesiumAtom.getTOne()); map.put("tTwo", cesiumAtom.getTTwo()); map.put("tThree", cesiumAtom.getTThree()); //日频率漂移率 - List dailyList = groupMap.get(DAILY_AGING_RATE_OF_CRYSTAL_OSCILLATOR); + List dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); map.put("outputList", outputList); map.put("bootList", bootList); @@ -354,22 +338,19 @@ map.put("dailyList", dailyList); } - private void readyForCrystalOscillator(Map map, List cesiumAtomList) throws Exception { - //根据dataType进行分组，key为dataType值，value为具体List - Map> groupMap = cesiumAtomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); + private void readyForCrystalOscillator(Map map, List atomList) throws Exception { //频率信号输出幅度 - List outputList = groupMap.get(FREQUENCY_SIGNAL_OUTPUT_AMPLITUDE); + List outputList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); //秒脉冲输出 - List pulseList = groupMap.get(SECOND_PULSE_OUTPUT); + List pulseList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); //频率稳定度 - List stabilityList = groupMap.get(FREQUENCY_STABILITY); + List stabilityList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); //相对频率偏差 - List relativeList = groupMap.get(RELATIVE_FREQUENCY_DEVIATION); + List relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); //频率复现性 - List reproList = groupMap.get(FREQUENCY_REPRODUCIBILITY); + List reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); //晶振日老化率 - List dailyList = groupMap.get(DAILY_AGING_RATE_OF_CRYSTAL_OSCILLATOR); + List dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0); map.put("relativeGateTime", relative.getGateTime()); @@ -401,18 +382,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } - - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -440,7 +409,6 @@ default: throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST); } - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); 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 ab6e2c5..18d5c57 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 @@ -71,9 +71,7 @@ Map map = BeanUtil.beanToMap(request); processCheckAccord(map, request.getLabCode()); List eTwoList = request.getCheckDataETwoList(); - prepareCheckParams(eTwoList, map); - map.put("pdfStatus", 1); //除了选用的模板不一致，模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(ETWO_WEIGHT_CHECK_DATA, "数据打印", null, map, false, null, null); @@ -178,7 +176,6 @@ deltaIotaMap.put("fiveValue", e.getAverageValueFive()); deltaIotaMap.put("sixValue", e.getAverageValueSix()); mapReplace(deltaIotaMap); - ; return deltaIotaMap; }).collect(Collectors.toList()); repList.add(deltaIotaList.get(0)); @@ -469,16 +466,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataDcPower()); - request.setMeasureDataDcPowerList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java index 07c5d96..d42b7f7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java @@ -163,22 +163,22 @@ Map> groupMap = list.stream() .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataLowFrequencySignal::getDataType)); //频率 - List frequencyList = groupMap.get("1"); + List frequencyList = list.stream().filter(data->"1".equals(data.getDataType())).collect(Collectors.toList()); map.put("frequencyList", frequencyList); //交流电压 - List crossList = groupMap.get("2"); + List crossList = list.stream().filter(data->"2".equals(data.getDataType())).collect(Collectors.toList()); map.put("crossList", crossList); //直流电压 - List dcList = groupMap.get("3"); + List dcList = list.stream().filter(data->"3".equals(data.getDataType())).collect(Collectors.toList()); map.put("dcList", dcList); //上升时间 - List riseList = groupMap.get("4"); + List riseList = list.stream().filter(data->"4".equals(data.getDataType())).collect(Collectors.toList()); map.put("riseList", riseList); //正弦信号平坦度 - List flatnessList = groupMap.get("5"); + List flatnessList = list.stream().filter(data->"5".equals(data.getDataType())).collect(Collectors.toList()); map.put("flatnessList", flatnessList); //总谐波失真 - List harmonicList = groupMap.get("6"); + List harmonicList = list.stream().filter(data->"6".equals(data.getDataType())).collect(Collectors.toList()); map.put("harmonicList", harmonicList); } @@ -189,16 +189,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java index 115263d..8e9573f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java @@ -160,16 +160,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java index d0b58b8..6aaeab4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java @@ -192,22 +192,10 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - readyForMicrowaveParams(map, request.getMeasureDataMicrowaveAttenuationList()); - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java index 9a781a1..85a7c50 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java @@ -139,27 +139,15 @@ log.debug("校验没有原始记录"); return null; } - if (examineOriginalFile(request)) { - log.debug("校验没有原始记录"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataSpectrumAnalyzerList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataSpectrumAnalyzer()); - request.setMeasureDataSpectrumAnalyzerList(list); - } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataOscilloscope oscilloscope : request.getMeasureDataOscilloscopeList()) { BizBusinessDeviceMeasureDataOscilloscope scope = (BizBusinessDeviceMeasureDataOscilloscope) BeanUtils.cloneBean(oscilloscope); scope.applyStrategyBasedOnDataType(request.getItemCategoryName()); list.add(scope); } - switch (request.getItemCategoryName()) { case DIGITAL_OSCILLOSCOPE: readyForDigitalParams(map, list); @@ -168,9 +156,8 @@ readyForImitateParams(map, list); break; default: - throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST); + break; } - //替换/方法 replaceSlash(map); List templateUrls = new ArrayList<>(); @@ -202,28 +189,15 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataSpectrumAnalyzerList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataSpectrumAnalyzer()); - request.setMeasureDataSpectrumAnalyzerList(list); - } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataOscilloscope oscilloscope : request.getMeasureDataOscilloscopeList()) { BizBusinessDeviceMeasureDataOscilloscope scope = (BizBusinessDeviceMeasureDataOscilloscope) BeanUtils.cloneBean(oscilloscope); scope.applyStrategyBasedOnDataType(request.getItemCategoryName()); list.add(scope); } - switch (request.getItemCategoryName()) { case DIGITAL_OSCILLOSCOPE: readyForDigitalParams(map, list); @@ -232,9 +206,8 @@ readyForImitateParams(map, list); break; default: - throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST); + break; } - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); @@ -267,32 +240,26 @@ * @param oscilloscopeList */ private void readyForImitateParams(Map map, List oscilloscopeList) { - if (CollectionUtils.isEmpty(oscilloscopeList)) { - throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_MEASURE_DATA_NOT_EXIST); - } - //根据dataType分组，key为dataType，value为List - Map> groupMap = oscilloscopeList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataOscilloscope::getDataType)); //扫描时间系数及扩展 - List expansionList = groupMap.get(SCAN_TIME_COEFFICIENT_AND_EXPANSION); + List expansionList = oscilloscopeList.stream().filter(o -> "1".equals(o.getDataType())).collect(Collectors.toList()); map.put("expansionList", expansionList); //垂直幅度测量 - List verticalList = groupMap.get(VERTICAL_AMPLITUDE_MEASUREMENT); + List verticalList = oscilloscopeList.stream().filter(o -> "2".equals(o.getDataType())).collect(Collectors.toList()); map.put("verticalList", verticalList); //频带宽度 - List widthList = groupMap.get(FREQUENCY_BAND_WIDTH); + List widthList = oscilloscopeList.stream().filter(o -> "3".equals(o.getDataType())).collect(Collectors.toList()); map.put("widthList", widthList); //触发特性 - List triggerList = groupMap.get(TRIGGER_CHARACTERISTICS); + List triggerList = oscilloscopeList.stream().filter(o -> "4".equals(o.getDataType())).collect(Collectors.toList()); map.put("triggerList", triggerList); //输入电阻 - List resistanceList = groupMap.get(INPUT_RESISTANCE); + List resistanceList = oscilloscopeList.stream().filter(o -> "5".equals(o.getDataType())).collect(Collectors.toList()); map.put("resistanceList", resistanceList); //上升时间 - List riseList = groupMap.get(RISE_TIME); + List riseList = oscilloscopeList.stream().filter(o -> "6".equals(o.getDataType())).collect(Collectors.toList()); map.put("riseList", riseList); //校准信号 - List signalList = groupMap.get(OSCILLOSCOPE_CALIBRATION_SIGNAL); + List signalList = oscilloscopeList.stream().filter(o -> "7".equals(o.getDataType())).collect(Collectors.toList()); map.put("signalList", signalList); } @@ -303,35 +270,28 @@ * @param oscilloscopeList */ private void readyForDigitalParams(Map map, List oscilloscopeList) { - if (CollectionUtils.isEmpty(oscilloscopeList)) { - throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_MEASURE_DATA_NOT_EXIST); - } - //根据dataType分组，key为dataType，value为List - Map> groupMap = oscilloscopeList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataOscilloscope::getDataType)); - - List baseList = groupMap.get(TIME_BASE); + List baseList = oscilloscopeList.stream().filter(o -> "1".equals(o.getDataType())).collect(Collectors.toList()); map.put("baseList", baseList); - List gainList = groupMap.get(DC_GAIN); + List gainList = oscilloscopeList.stream().filter(o -> "2".equals(o.getDataType())).collect(Collectors.toList()); map.put("gainList", gainList); - List offetList = groupMap.get(DC_OFFSET); + List offetList = oscilloscopeList.stream().filter(o -> "3".equals(o.getDataType())).collect(Collectors.toList()); map.put("offsetList", offetList); - List bandwidthList = groupMap.get(OSCILLOSCOPE_FREQUENCY_BAND_WIDTH); + List bandwidthList = oscilloscopeList.stream().filter(o -> "4".equals(o.getDataType())).collect(Collectors.toList()); map.put("bandwidthList", bandwidthList); - List sensitivityList = groupMap.get(TRIGGER_SENSITIVITY); + List sensitivityList = oscilloscopeList.stream().filter(o -> "5".equals(o.getDataType())).collect(Collectors.toList()); map.put("sensitivityList", sensitivityList); - List riseTimeList = groupMap.get(RISE_TIME); + List riseTimeList = oscilloscopeList.stream().filter(o -> "6".equals(o.getDataType())).collect(Collectors.toList()); map.put("timeList", riseTimeList); - List inputList = groupMap.get(OSCILLOSCOPE_INPUT_RESISTANCE); + List inputList = oscilloscopeList.stream().filter(o -> "7".equals(o.getDataType())).collect(Collectors.toList()); map.put("inputList", inputList); - List signalList = groupMap.get(SIGNAL); + List signalList = oscilloscopeList.stream().filter(o -> "8".equals(o.getDataType())).collect(Collectors.toList()); map.put("signalList", signalList); } } 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 8792368..66781e5 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 @@ -84,6 +84,7 @@ /** * 准备核查填充参数 + * * @param thermometerList * @param map */ @@ -185,10 +186,13 @@ request.setMeasureDataResistanceThermometerList(list); } DictCodeUtils.convertDictCodeToName(request); + if (StringUtils.isNotBlank(request.getAngleAdjustError())){ + request.setAngleAdjustError("0".equals(request.getAngleAdjustError()) ? "可用" : "不可用"); + } Map map = BeanUtil.beanToMap(request); mapReplace(map); - readyForCoverParams(map,request.getLabCode()); + readyForCoverParams(map, request.getLabCode()); List resistanceThermometerList = request.getMeasureDataResistanceThermometerList(); @@ -416,17 +420,9 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - - - readyForCoverParams(map,request.getLabCode()); - + readyForCoverParams(map, request.getLabCode()); List thermometerList = request.getMeasureDataResistanceThermometerList(); switch (request.getItemCategoryName()) { case THERMAL_RESISTANCE: @@ -444,8 +440,6 @@ default: break; } - - readyForCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 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 f56749d..162b048 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 @@ -62,7 +62,6 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - List safetyValveList = request.getMeasureDataSafetyValueList(); readyForCoverParams(map,request.getLabCode()); List list = new ArrayList<>(); @@ -125,11 +124,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map,request.getLabCode()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SignalGeneratorHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SignalGeneratorHandler.java index 4697e6d..9682cb6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SignalGeneratorHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SignalGeneratorHandler.java @@ -143,6 +143,7 @@ appendTestValueUnit(s, "dBc"); break; default: + break; } } @@ -220,33 +221,32 @@ } private void readyForSignalGenerator(Map map, List generatorList) { - Map> groupMap = generatorList.stream().collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataSignalGenerator::getDataType)); //频率 - List frequencyList = groupMap.get("1"); + List frequencyList = generatorList.stream().filter(s -> "1".equals(s.getDataType())).collect(Collectors.toList()); map.put("frequencyList", frequencyList); //功率 - List powerList = groupMap.get("2"); + List powerList = generatorList.stream().filter(s -> "2".equals(s.getDataType())).collect(Collectors.toList()); map.put("powerList", powerList); //调幅 - List amplitudeModuList = groupMap.get("3"); + List amplitudeModuList = generatorList.stream().filter(s -> "3".equals(s.getDataType())).collect(Collectors.toList()); map.put("amplitudeModuList", amplitudeModuList); //调频 - List phaseList = groupMap.get("4"); + List phaseList = generatorList.stream().filter(s -> "4".equals(s.getDataType())).collect(Collectors.toList()); map.put("phaseList", phaseList); //剩余调幅 - List lastAmplitudeList = groupMap.get("5"); + List lastAmplitudeList = generatorList.stream().filter(s -> "5".equals(s.getDataType())).collect(Collectors.toList()); map.put("lastAmplitudeList", lastAmplitudeList); //剩余调频 - List lastPhaseList = groupMap.get("6"); + List lastPhaseList = generatorList.stream().filter(s -> "6".equals(s.getDataType())).collect(Collectors.toList()); map.put("lastPhaseList", lastPhaseList); //谐波 - List harmonicList = groupMap.get("7"); + List harmonicList = generatorList.stream().filter(s -> "7".equals(s.getDataType())).collect(Collectors.toList()); map.put("harmonicList", harmonicList); //调相 - List phaseModuList = groupMap.get("8"); + List phaseModuList = generatorList.stream().filter(s -> "8".equals(s.getDataType())).collect(Collectors.toList()); map.put("phaseModuList", phaseModuList); //非谐波 - List nonHarmonicList = groupMap.get("9"); + List nonHarmonicList = generatorList.stream().filter(s -> "9".equals(s.getDataType())).collect(Collectors.toList()); map.put("nonHarmonicList", nonHarmonicList); } @@ -257,16 +257,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SpectrumAnalyzerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SpectrumAnalyzerHandler.java index bf1e69c..86d7e1d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SpectrumAnalyzerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SpectrumAnalyzerHandler.java @@ -68,7 +68,7 @@ request.setCheckAccord("无"); } Map map = BeanUtil.beanToMap(request); - processCheckAccord(map,request.getLabCode()); + processCheckAccord(map, request.getLabCode()); readyForCheckParams(map, request.getCheckDataSpectrumAnalyzerList()); replaceSlash(map); @@ -138,12 +138,12 @@ map.put("freRepList", freRepList); map.put("freStaList", freStaList); - map.put("freStaDate"+ 1, oneDate); - map.put("freStaDate"+ 2, twoDate); - map.put("freStaDate"+ 3, threeDate); - map.put("freStaDate"+ 4, fourDate); - map.put("freStaDate"+ 5, fiveDate); - map.put("freStaDate"+ 6, sixDate); + map.put("freStaDate" + 1, oneDate); + map.put("freStaDate" + 2, twoDate); + map.put("freStaDate" + 3, threeDate); + map.put("freStaDate" + 4, fourDate); + map.put("freStaDate" + 5, fiveDate); + map.put("freStaDate" + 6, sixDate); List powerList = groupMap.get(POWER); List powerRepList = powerList.stream() @@ -191,12 +191,12 @@ map.put("powerRepList", powerRepList); map.put("powerStaList", powerStaList); - map.put("powerStaDate"+ 1, powerOneDate); - map.put("powerStaDate"+ 2, powerTwoDate); - map.put("powerStaDate"+ 3, powerThreeDate); - map.put("powerStaDate"+ 4, powerFourDate); - map.put("powerStaDate"+ 5, powerFiveDate); - map.put("powerStaDate"+ 6, powerSixDate); + map.put("powerStaDate" + 1, powerOneDate); + map.put("powerStaDate" + 2, powerTwoDate); + map.put("powerStaDate" + 3, powerThreeDate); + map.put("powerStaDate" + 4, powerFourDate); + map.put("powerStaDate" + 5, powerFiveDate); + map.put("powerStaDate" + 6, powerSixDate); List relativeList = groupMap.get(RELATIVE_LEVEL); List relativeRepList = relativeList.stream() @@ -245,17 +245,17 @@ map.put("relativeRepList", relativeRepList); map.put("relativeStaList", relativeStaList); - map.put("relativeStaDate"+ 1, relativeOneDate); - map.put("relativeStaDate"+ 2, relativeTwoDate); - map.put("relativeStaDate"+ 3, relativeThreeDate); - map.put("relativeStaDate"+ 4, relativeFourDate); - map.put("relativeStaDate"+ 5, relativeFiveDate); - map.put("relativeStaDate"+ 6, relativeSixDate); + map.put("relativeStaDate" + 1, relativeOneDate); + map.put("relativeStaDate" + 2, relativeTwoDate); + map.put("relativeStaDate" + 3, relativeThreeDate); + map.put("relativeStaDate" + 4, relativeFourDate); + map.put("relativeStaDate" + 5, relativeFiveDate); + map.put("relativeStaDate" + 6, relativeSixDate); } private String formatDate(String date) { - if (StringUtils.isNotBlank(date)){ - return DateUtil.format(DateUtil.parseDate(date),"yyyy/MM/dd"); + if (StringUtils.isNotBlank(date)) { + return DateUtil.format(DateUtil.parseDate(date), "yyyy/MM/dd"); } return null; } @@ -311,13 +311,8 @@ private void readyForMeasureParams(Map map, List analyzerList) { - //根据dataType进行分组，key为dataType，value为List - Map> groupMap = analyzerList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataSpectrumAnalyzer::getDataType)); - //频率显示 - List displayList = groupMap.get(FREQUENCY_DISPLAY) - .stream() + List displayList = analyzerList.stream().filter(a -> "1".equals(a.getDataType())) .peek(analyzer -> { analyzer.setNominalValue(REFERENCE_POINT.equals(analyzer.getNominalValue()) || START_POINT.equals(analyzer.getNominalValue()) ? analyzer.getNominalValue() : StringUtils.isNotBlank(analyzer.getNominalValue()) ? analyzer.getNominalValue() + analyzer.getUnit() : ""); analyzer.setSweepWidth(REFERENCE_POINT.equals(analyzer.getSweepWidth()) || START_POINT.equals(analyzer.getSweepWidth()) ? analyzer.getSweepWidth() : StringUtils.isNotBlank(analyzer.getSweepWidth()) ? analyzer.getSweepWidth() + analyzer.getSweepWidthUnit() : ""); @@ -332,8 +327,7 @@ .collect(Collectors.toList()); map.put("displayList", displayList); //扫频宽度 - List sweepList = groupMap.get(SWEEP_WIDTH) - .stream() + List sweepList = analyzerList.stream().filter(a -> "2".equals(a.getDataType())) .peek(analyzer -> { analyzer.setNominalValue(REFERENCE_POINT.equals(analyzer.getNominalValue()) || START_POINT.equals(analyzer.getNominalValue()) ? analyzer.getNominalValue() : StringUtils.isNotBlank(analyzer.getNominalValue()) ? analyzer.getNominalValue() + analyzer.getUnit() : ""); analyzer.setOneValue(REFERENCE_POINT.equals(analyzer.getOneValue()) || START_POINT.equals(analyzer.getOneValue()) ? analyzer.getOneValue() : StringUtils.isNotBlank(analyzer.getOneValue()) ? analyzer.getOneValue() + analyzer.getUnit() : ""); @@ -349,8 +343,7 @@ }).collect(Collectors.toList()); map.put("sweepList", sweepList); //中频带宽 - List bandwidthList = groupMap.get(IF_BANDWIDTH) - .stream() + List bandwidthList = analyzerList.stream().filter(a -> "3".equals(a.getDataType())) .peek(analyzer -> { analyzer.setNominalValue(REFERENCE_POINT.equals(analyzer.getNominalValue()) || START_POINT.equals(analyzer.getNominalValue()) ? analyzer.getNominalValue() : StringUtils.isNotBlank(analyzer.getNominalValue()) ? analyzer.getNominalValue() + analyzer.getUnit() : ""); analyzer.setOneValue(REFERENCE_POINT.equals(analyzer.getOneValue()) || START_POINT.equals(analyzer.getOneValue()) ? analyzer.getOneValue() : StringUtils.isNotBlank(analyzer.getOneValue()) ? analyzer.getOneValue() + analyzer.getUnit() : ""); @@ -367,12 +360,12 @@ .collect(Collectors.toList()); map.put("bandwidthList", bandwidthList); //中频带宽转换偏差 - List conversionList = groupMap.get(IF_BANDWIDTH_CONVERSION_DEVIATION) - .stream().peek(analyzer -> { + List conversionList = analyzerList.stream().filter(a -> "4".equals(a.getDataType())) + .peek(analyzer -> { analyzer.setNominalValue(REFERENCE_POINT.equals(analyzer.getNominalValue()) || START_POINT.equals(analyzer.getNominalValue()) ? analyzer.getNominalValue() : StringUtils.isNotBlank(analyzer.getNominalValue()) ? analyzer.getNominalValue() + analyzer.getUnit() : ""); analyzer.setOneValue(REFERENCE_POINT.equals(analyzer.getOneValue()) || START_POINT.equals(analyzer.getOneValue()) ? analyzer.getOneValue() : StringUtils.isNotBlank(analyzer.getOneValue()) ? analyzer.getOneValue() + "dBm" : ""); analyzer.setLowerConvertDeviation(REFERENCE_POINT.equals(analyzer.getLowerConvertDeviation()) || START_POINT.equals(analyzer.getLowerConvertDeviation()) ? analyzer.getLowerConvertDeviation() : StringUtils.isNotBlank(analyzer.getLowerConvertDeviation()) ? analyzer.getLowerConvertDeviation() + "dB" : ""); - if (!"/".equals(analyzer.getConvertDeviation())){ + if (!"/".equals(analyzer.getConvertDeviation())) { analyzer.setConvertDeviation(REFERENCE_POINT.equals(analyzer.getConvertDeviation()) || START_POINT.equals(analyzer.getConvertDeviation()) ? analyzer.getConvertDeviation() : StringUtils.isNotBlank(analyzer.getConvertDeviation()) ? analyzer.getConvertDeviation() + "dB" : ""); } analyzer.setUpperConvertDeviation(REFERENCE_POINT.equals(analyzer.getUpperConvertDeviation()) || START_POINT.equals(analyzer.getUpperConvertDeviation()) ? analyzer.getUpperConvertDeviation() : StringUtils.isNotBlank(analyzer.getUpperConvertDeviation()) ? analyzer.getUpperConvertDeviation() + "dB" : ""); @@ -380,8 +373,7 @@ }).collect(Collectors.toList()); map.put("conversionList", conversionList); //参考电平 - List referenceList = groupMap.get(REFERENCE_LEVEL) - .stream() + List referenceList = analyzerList.stream().filter(a -> "5".equals(a.getDataType())) .peek(analyzer -> { analyzer.setNominalValue(REFERENCE_POINT.equals(analyzer.getNominalValue()) || START_POINT.equals(analyzer.getNominalValue()) ? analyzer.getNominalValue() : StringUtils.isNotBlank(analyzer.getNominalValue()) ? analyzer.getNominalValue() + analyzer.getUnit() : ""); analyzer.setStandardAttenuatorAttenuation(REFERENCE_POINT.equals(analyzer.getStandardAttenuatorAttenuation()) || START_POINT.equals(analyzer.getStandardAttenuatorAttenuation()) ? analyzer.getStandardAttenuatorAttenuation() : StringUtils.isNotBlank(analyzer.getStandardAttenuatorAttenuation()) ? analyzer.getStandardAttenuatorAttenuation() + analyzer.getStandardAttenuatorAttenuationUnit() : ""); @@ -395,8 +387,7 @@ .collect(Collectors.toList()); map.put("referenceList", referenceList); //垂直刻度 - List verticalList = groupMap.get(VERTICAL_SCALE) - .stream() + List verticalList = analyzerList.stream().filter(a -> "6".equals(a.getDataType())) .peek(analyzer -> { analyzer.setNominalValue(REFERENCE_POINT.equals(analyzer.getNominalValue()) || START_POINT.equals(analyzer.getNominalValue()) ? analyzer.getNominalValue() : StringUtils.isNotBlank(analyzer.getNominalValue()) ? analyzer.getNominalValue() + analyzer.getUnit() : ""); analyzer.setStandardAttenuatorAttenuation(REFERENCE_POINT.equals(analyzer.getStandardAttenuatorAttenuation()) || START_POINT.equals(analyzer.getStandardAttenuatorAttenuation()) ? analyzer.getStandardAttenuatorAttenuation() : StringUtils.isNotBlank(analyzer.getStandardAttenuatorAttenuation()) ? analyzer.getStandardAttenuatorAttenuation() + "dB" : ""); @@ -409,8 +400,7 @@ .collect(Collectors.toList()); map.put("verticalList", verticalList); //输入频响 - List frequencyList = groupMap.get(INPUT_FREQUENCY_RESPONSE) - .stream() + List frequencyList = analyzerList.stream().filter(a -> "7".equals(a.getDataType())) .peek(analyzer -> { analyzer.setFrequency(REFERENCE_POINT.equals(analyzer.getFrequency()) || START_POINT.equals(analyzer.getFrequency()) ? analyzer.getFrequency() : StringUtils.isNotBlank(analyzer.getFrequency()) ? analyzer.getFrequency() + analyzer.getFrequencyUnit() : ""); analyzer.setOneValue(REFERENCE_POINT.equals(analyzer.getOneValue()) || START_POINT.equals(analyzer.getOneValue()) ? analyzer.getOneValue() : StringUtils.isNotBlank(analyzer.getOneValue()) ? analyzer.getOneValue() + "dB" : ""); @@ -424,8 +414,7 @@ .collect(Collectors.toList()); map.put("frequencyList", frequencyList); //平均噪声电平 - List noiseList = groupMap.get(AVERAGE_NOISE_LEVEL) - .stream() + List noiseList = analyzerList.stream().filter(a -> "8".equals(a.getDataType())) .peek(analyzer -> { analyzer.setStartFrequency(REFERENCE_POINT.equals(analyzer.getStartFrequency()) || START_POINT.equals(analyzer.getStartFrequency()) ? analyzer.getStartFrequency() : StringUtils.isNotBlank(analyzer.getStartFrequency()) ? analyzer.getStartFrequency() + analyzer.getStartFrequencyUnit() : ""); analyzer.setEndFrequency(REFERENCE_POINT.equals(analyzer.getEndFrequency()) || START_POINT.equals(analyzer.getEndFrequency()) ? analyzer.getEndFrequency() : StringUtils.isNotBlank(analyzer.getEndFrequency()) ? analyzer.getEndFrequency() + analyzer.getEndFrequencyUnit() : ""); @@ -437,8 +426,7 @@ .collect(Collectors.toList()); map.put("noiseList", noiseList); //谐波失真 - List harmonicList = groupMap.get(HARMONIC_DISTORTION) - .stream() + List harmonicList = analyzerList.stream().filter(a -> "9".equals(a.getDataType())) .peek(analyzer -> { analyzer.setFrequency(REFERENCE_POINT.equals(analyzer.getFrequency()) || START_POINT.equals(analyzer.getFrequency()) ? analyzer.getFrequency() : StringUtils.isNotBlank(analyzer.getFrequency()) ? analyzer.getFrequency() + analyzer.getFrequencyUnit() : ""); analyzer.setOneValue(REFERENCE_POINT.equals(analyzer.getOneValue()) || START_POINT.equals(analyzer.getOneValue()) ? analyzer.getOneValue() : StringUtils.isNotBlank(analyzer.getOneValue()) ? analyzer.getOneValue() + "dBm" : ""); @@ -450,8 +438,7 @@ .collect(Collectors.toList()); map.put("harmonicList", harmonicList); //输入衰减 - List attenuationList = groupMap.get(INPUT_ATTENUATION) - .stream() + List attenuationList = analyzerList.stream().filter(a -> "10".equals(a.getDataType())) .peek(analyzer -> { analyzer.setStandardAttenuatorAttenuation(REFERENCE_POINT.equals(analyzer.getStandardAttenuatorAttenuation()) || START_POINT.equals(analyzer.getStandardAttenuatorAttenuation()) ? analyzer.getStandardAttenuatorAttenuation() : StringUtils.isNotBlank(analyzer.getStandardAttenuatorAttenuation()) ? analyzer.getStandardAttenuatorAttenuation() + analyzer.getStandardAttenuatorAttenuationUnit() : ""); analyzer.setInputAttenuator(REFERENCE_POINT.equals(analyzer.getInputAttenuator()) || START_POINT.equals(analyzer.getInputAttenuator()) ? analyzer.getInputAttenuator() : StringUtils.isNotBlank(analyzer.getInputAttenuator()) ? analyzer.getInputAttenuator() + analyzer.getInputAttenuatorUnit() : ""); @@ -465,8 +452,7 @@ .collect(Collectors.toList()); map.put("attenuationList", attenuationList); //1dB增益压缩点 - List compressionList = groupMap.get(GAIN_COMPRESSION_POINT) - .stream() + List compressionList = analyzerList.stream().filter(a -> "11".equals(a.getDataType())) .peek(analyzer -> { analyzer.setFrequency(REFERENCE_POINT.equals(analyzer.getFrequency()) || START_POINT.equals(analyzer.getFrequency()) ? analyzer.getFrequency() : StringUtils.isNotBlank(analyzer.getFrequency()) ? analyzer.getFrequency() + analyzer.getFrequencyUnit() : ""); analyzer.setInputAttenuator(REFERENCE_POINT.equals(analyzer.getInputAttenuator()) || START_POINT.equals(analyzer.getInputAttenuator()) ? analyzer.getInputAttenuator() : StringUtils.isNotBlank(analyzer.getInputAttenuator()) ? analyzer.getInputAttenuator() + analyzer.getInputAttenuatorUnit() : ""); @@ -478,8 +464,7 @@ .collect(Collectors.toList()); map.put("compressionList", compressionList); //校准信号 - List calibrationList = groupMap.get(CALIBRATION_SIGNAL) - .stream() + List calibrationList = analyzerList.stream().filter(a -> "12".equals(a.getDataType())) .peek(analyzer -> { analyzer.setNominalValue(REFERENCE_POINT.equals(analyzer.getNominalValue()) || START_POINT.equals(analyzer.getNominalValue()) ? analyzer.getNominalValue() : StringUtils.isNotBlank(analyzer.getNominalValue()) ? analyzer.getNominalValue() + analyzer.getUnit() : ""); if (FREQUENCY_CN.equals(analyzer.getTypeValue())) { @@ -494,7 +479,7 @@ analyzer.setMeasureResult(REFERENCE_POINT.equals(analyzer.getMeasureResult()) || START_POINT.equals(analyzer.getMeasureResult()) ? analyzer.getMeasureResult() : StringUtils.isNotBlank(analyzer.getMeasureResult()) ? analyzer.getMeasureResult() + analyzer.getMeasureResultUnit() : ""); analyzer.setLowerIndex(REFERENCE_POINT.equals(analyzer.getLowerIndex()) || START_POINT.equals(analyzer.getLowerIndex()) ? analyzer.getLowerIndex() : StringUtils.isNotBlank(analyzer.getLowerIndex()) ? analyzer.getLowerIndex() + analyzer.getUnit() : ""); analyzer.setUpperIndex(REFERENCE_POINT.equals(analyzer.getUpperIndex()) || START_POINT.equals(analyzer.getUpperIndex()) ? analyzer.getUpperIndex() : StringUtils.isNotBlank(analyzer.getUpperIndex()) ? analyzer.getUpperIndex() + analyzer.getUnit() : ""); - if (StringUtils.isBlank(analyzer.getConclusion())){ + if (StringUtils.isBlank(analyzer.getConclusion())) { analyzer.setConclusion("/"); } analyzer.applyStrategyBasedOnDataType(); @@ -517,12 +502,9 @@ list.add(new BizBusinessDeviceMeasureDataSpectrumAnalyzer()); request.setMeasureDataSpectrumAnalyzerList(list); } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - List analyzerList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataSpectrumAnalyzer spectrumAnalyzer : request.getMeasureDataSpectrumAnalyzerList()) { BizBusinessDeviceMeasureDataSpectrumAnalyzer analyzer = (BizBusinessDeviceMeasureDataSpectrumAnalyzer) BeanUtils.cloneBean(spectrumAnalyzer); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java index b2974b4..2b3a3af 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentInfo.java @@ -382,6 +382,10 @@ @TableField(exist = false) private Integer colorMark = 0; + @ApiModelProperty(value = "测量范围",dataType = "String") + @TableField(exist = false) + private String range; + @ApiModelProperty(value = "技术指标", dataType = "List") @TableField(exist = false) private List technicalTargetList; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java index 5e37fa3..d8a97c9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java @@ -83,11 +83,9 @@ } } - private void readyForCheckDataParams(Map map, List checkDataCesiumAtomList) { - Map> groupMap = checkDataCesiumAtomList.stream().collect(Collectors.groupingBy(BizEquipmentStandardCheckDataCesiumAtom::getParams)); - + private void readyForCheckDataParams(Map map, List atomList) { //铯原子频标 - List cesiumAtomList = groupMap.get("1").stream().map(atom -> { + List cesiumAtomList = atomList.stream().filter(a -> "1".equals(a.getParams())).map(atom -> { atom.setCheckPoint(StringUtils.isNotBlank(atom.getCheckPoint()) ? atom.getCheckPoint() + atom.getUnit() : ""); atom.setElectricalLevel(StringUtils.isNotBlank(atom.getElectricalLevel()) ? atom.getElectricalLevel() + atom.getElectricalLevelUnit() : ""); atom.setAmplitude(StringUtils.isNotBlank(atom.getAmplitude()) ? atom.getAmplitude() + atom.getAmplitudeUnit() : ""); @@ -109,7 +107,7 @@ map.put(STA_PREFIX + 1 + DATE_PREFIX + 6, atom.getTestValueSixDate()); //函数信号发生器 - List funcationList = groupMap.get("2").stream().map(fun -> { + List funcationList = atomList.stream().filter(a -> "2".equals(a.getParams())).map(fun -> { fun.setCheckPoint(StringUtils.isNotBlank(fun.getCheckPoint()) ? fun.getCheckPoint() + fun.getUnit() : ""); fun.setElectricalLevel(StringUtils.isNotBlank(fun.getElectricalLevel()) ? fun.getElectricalLevel() + fun.getElectricalLevelUnit() : ""); fun.setAmplitude(StringUtils.isNotBlank(fun.getAmplitude()) ? fun.getAmplitude() + fun.getAmplitudeUnit() : ""); @@ -130,7 +128,7 @@ map.put(STA_PREFIX + 2 + DATE_PREFIX + 5, fun.getTestValueFiveDate()); map.put(STA_PREFIX + 2 + DATE_PREFIX + 6, fun.getTestValueSixDate()); - List signalList = groupMap.get("3").stream().map(signal -> { + List signalList = atomList.stream().filter(a -> "3".equals(a.getParams())).map(signal -> { signal.setCheckPoint(StringUtils.isNotBlank(signal.getCheckPoint()) ? signal.getCheckPoint() + signal.getUnit() : ""); signal.setElectricalLevel(StringUtils.isNotBlank(signal.getElectricalLevel()) ? signal.getElectricalLevel() + signal.getElectricalLevelUnit() : ""); signal.setAmplitude(StringUtils.isNotBlank(signal.getAmplitude()) ? signal.getAmplitude() + signal.getAmplitudeUnit() : ""); @@ -163,12 +161,6 @@ log.debug("校验没有原始记录"); return null; } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -220,97 +212,92 @@ } private void readyForMicrowaveCounter(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); //晶振开机特性 - List startupList = groupMap.get("1"); + List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0); map.put("gateTime1", cesiumAtom.getGateTime()); map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency()); map.put("groupNumber1", cesiumAtom.getSampleGroupNumber()); + map.put("startupList", startupList); //晶振1s频率稳定度 - List stabilityList = groupMap.get("2"); + List stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0); map.put("gateTime2", stability.getGateTime()); map.put("multiplyTimes2", stability.getMultiplyFrequency()); map.put("groupNumber2", stability.getSampleGroupNumber()); + map.put("stabilityList", stabilityList); //晶振相对频率偏差 - List deviationList = groupMap.get("3"); + List deviationList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom deviation = deviationList.get(0); map.put("gateTime3", deviation.getGateTime()); map.put("multiplyTimes3", deviation.getMultiplyFrequency()); + map.put("deviationList", deviationList); //晶振频率复现性 - List reproList = groupMap.get("4"); + List reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0); map.put("gateTime4", repro.getGateTime()); map.put("multiplyTimes4", repro.getMultiplyFrequency()); map.put("tOne", repro.getTOne()); map.put("tTwo", repro.getTTwo()); + map.put("reproList", reproList); //晶振日老化率 - List dailyList = groupMap.get("5"); + List dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0); map.put("gateTime5", daily.getGateTime()); map.put("multiplyTimes5", daily.getMultiplyFrequency()); map.put("groupNumber5", daily.getSerialNumber()); - //频率测量范围、输入灵敏度及最大输入电平 - List levelList = groupMap.get("6"); - //频率测量误差 - List errorList = groupMap.get("7"); - - map.put("startupList", startupList); - map.put("stabilityList", stabilityList); - map.put("deviationList", deviationList); - map.put("reproList", reproList); map.put("dailyList", dailyList); + //频率测量范围、输入灵敏度及最大输入电平 + List levelList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); map.put("levelList", levelList); + //频率测量误差 + List errorList = atomList.stream().filter(a -> "7".equals(a.getDataType())).collect(Collectors.toList()); map.put("errorList", errorList); } private void readyForUniversalCounter(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); //晶振开机 - List startupList = groupMap.get("1"); + List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = startupList.get(0); map.put("gateTime1", cesiumAtom.getGateTime()); map.put("multiplyTimes1", cesiumAtom.getMultiplyFrequency()); map.put("groupNumber1", cesiumAtom.getGroupNumber()); //晶振1s频率稳定度 - List stabilityList = groupMap.get("2"); + List stabilityList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom stability = stabilityList.get(0); map.put("gateTime2", stability.getGateTime()); map.put("multiplyTimes2", stability.getMultiplyFrequency()); map.put("groupNumber2", stability.getGroupNumber()); //晶振相对频率偏差 - List relativeList = groupMap.get("3"); + List relativeList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0); map.put("gateTime3", relative.getGateTime()); map.put("multiplyTimes3", relative.getMultiplyFrequency()); //晶振频率复现性 - List reproList = groupMap.get("4"); + List reproList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom repro = reproList.get(0); map.put("gateTime4", repro.getGateTime()); map.put("multiplyTimes4", repro.getMultiplyFrequency()); map.put("tOne", repro.getTOne()); map.put("tTwo", repro.getTTwo()); //晶振日老化率 - List dailyList = groupMap.get("5"); + List dailyList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom daily = dailyList.get(0); map.put("gateTime5", daily.getGateTime()); map.put("multiplyTimes5", daily.getMultiplyFrequency()); map.put("groupNumber5", daily.getGroupNumber()); //频率测量范围、输入灵敏度 - List freqList = groupMap.get("6"); + List freqList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); //频率测量误差 - List freqErrorList = groupMap.get("7"); + List freqErrorList = atomList.stream().filter(a -> "7".equals(a.getDataType())).collect(Collectors.toList()); //周期测量范围、输入灵敏度 - List cycleList = groupMap.get("8"); + List cycleList = atomList.stream().filter(a -> "8".equals(a.getDataType())).collect(Collectors.toList()); //周期测量误差 - List cycleErrorList = groupMap.get("9"); + List cycleErrorList = atomList.stream().filter(a -> "9".equals(a.getDataType())).collect(Collectors.toList()); //时间间隔测量范围及测量误差 - List timeIntervalList = groupMap.get("10"); + List timeIntervalList = atomList.stream().filter(a -> "10".equals(a.getDataType())).collect(Collectors.toList()); map.put("startupList", startupList); map.put("stabilityList", stabilityList); @@ -325,26 +312,23 @@ } private void readyForRubidiumClock(Map map, List atomList) { - Map> groupMap = atomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); - //输出信号 - List outputList = groupMap.get(FREQUENCY_SIGNAL_OUTPUT_AMPLITUDE); + List outputList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); //开机特性 - List bootList = groupMap.get(SECOND_PULSE_OUTPUT); + List bootList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); //频率稳定度 - List stabilityList = groupMap.get(FREQUENCY_STABILITY); + List stabilityList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); //相对频率偏差 - List relativeList = groupMap.get(RELATIVE_FREQUENCY_DEVIATION); + List relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); //频率复现性 - List reproList = groupMap.get(FREQUENCY_REPRODUCIBILITY); + List reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom = reproList.get(0); map.put("tOne", cesiumAtom.getTOne()); map.put("tTwo", cesiumAtom.getTTwo()); map.put("tThree", cesiumAtom.getTThree()); //日频率漂移率 - List dailyList = groupMap.get(DAILY_AGING_RATE_OF_CRYSTAL_OSCILLATOR); + List dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); map.put("outputList", outputList); map.put("bootList", bootList); @@ -354,22 +338,19 @@ map.put("dailyList", dailyList); } - private void readyForCrystalOscillator(Map map, List cesiumAtomList) throws Exception { - //根据dataType进行分组，key为dataType值，value为具体List - Map> groupMap = cesiumAtomList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataCesiumAtom::getDataType)); + private void readyForCrystalOscillator(Map map, List atomList) throws Exception { //频率信号输出幅度 - List outputList = groupMap.get(FREQUENCY_SIGNAL_OUTPUT_AMPLITUDE); + List outputList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); //秒脉冲输出 - List pulseList = groupMap.get(SECOND_PULSE_OUTPUT); + List pulseList = atomList.stream().filter(a -> "2".equals(a.getDataType())).collect(Collectors.toList()); //频率稳定度 - List stabilityList = groupMap.get(FREQUENCY_STABILITY); + List stabilityList = atomList.stream().filter(a -> "3".equals(a.getDataType())).collect(Collectors.toList()); //相对频率偏差 - List relativeList = groupMap.get(RELATIVE_FREQUENCY_DEVIATION); + List relativeList = atomList.stream().filter(a -> "4".equals(a.getDataType())).collect(Collectors.toList()); //频率复现性 - List reproList = groupMap.get(FREQUENCY_REPRODUCIBILITY); + List reproList = atomList.stream().filter(a -> "5".equals(a.getDataType())).collect(Collectors.toList()); //晶振日老化率 - List dailyList = groupMap.get(DAILY_AGING_RATE_OF_CRYSTAL_OSCILLATOR); + List dailyList = atomList.stream().filter(a -> "6".equals(a.getDataType())).collect(Collectors.toList()); BizBusinessDeviceMeasureDataCesiumAtom relative = relativeList.get(0); map.put("relativeGateTime", relative.getGateTime()); @@ -401,18 +382,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } - - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); @@ -440,7 +409,6 @@ default: throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST); } - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); 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 ab6e2c5..18d5c57 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 @@ -71,9 +71,7 @@ Map map = BeanUtil.beanToMap(request); processCheckAccord(map, request.getLabCode()); List eTwoList = request.getCheckDataETwoList(); - prepareCheckParams(eTwoList, map); - map.put("pdfStatus", 1); //除了选用的模板不一致，模板配置流程是一致的 String wordUrl = printFileRegister.registerPrintFile(ETWO_WEIGHT_CHECK_DATA, "数据打印", null, map, false, null, null); @@ -178,7 +176,6 @@ deltaIotaMap.put("fiveValue", e.getAverageValueFive()); deltaIotaMap.put("sixValue", e.getAverageValueSix()); mapReplace(deltaIotaMap); - ; return deltaIotaMap; }).collect(Collectors.toList()); repList.add(deltaIotaList.get(0)); @@ -469,16 +466,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataDcPower()); - request.setMeasureDataDcPowerList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java index 07c5d96..d42b7f7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowFrequencySignalHandler.java @@ -163,22 +163,22 @@ Map> groupMap = list.stream() .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataLowFrequencySignal::getDataType)); //频率 - List frequencyList = groupMap.get("1"); + List frequencyList = list.stream().filter(data->"1".equals(data.getDataType())).collect(Collectors.toList()); map.put("frequencyList", frequencyList); //交流电压 - List crossList = groupMap.get("2"); + List crossList = list.stream().filter(data->"2".equals(data.getDataType())).collect(Collectors.toList()); map.put("crossList", crossList); //直流电压 - List dcList = groupMap.get("3"); + List dcList = list.stream().filter(data->"3".equals(data.getDataType())).collect(Collectors.toList()); map.put("dcList", dcList); //上升时间 - List riseList = groupMap.get("4"); + List riseList = list.stream().filter(data->"4".equals(data.getDataType())).collect(Collectors.toList()); map.put("riseList", riseList); //正弦信号平坦度 - List flatnessList = groupMap.get("5"); + List flatnessList = list.stream().filter(data->"5".equals(data.getDataType())).collect(Collectors.toList()); map.put("flatnessList", flatnessList); //总谐波失真 - List harmonicList = groupMap.get("6"); + List harmonicList = list.stream().filter(data->"6".equals(data.getDataType())).collect(Collectors.toList()); map.put("harmonicList", harmonicList); } @@ -189,16 +189,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java index 115263d..8e9573f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java @@ -160,16 +160,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java index d0b58b8..6aaeab4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java @@ -192,22 +192,10 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - readyForMicrowaveParams(map, request.getMeasureDataMicrowaveAttenuationList()); - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java index 9a781a1..85a7c50 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java @@ -139,27 +139,15 @@ log.debug("校验没有原始记录"); return null; } - if (examineOriginalFile(request)) { - log.debug("校验没有原始记录"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataSpectrumAnalyzerList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataSpectrumAnalyzer()); - request.setMeasureDataSpectrumAnalyzerList(list); - } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataOscilloscope oscilloscope : request.getMeasureDataOscilloscopeList()) { BizBusinessDeviceMeasureDataOscilloscope scope = (BizBusinessDeviceMeasureDataOscilloscope) BeanUtils.cloneBean(oscilloscope); scope.applyStrategyBasedOnDataType(request.getItemCategoryName()); list.add(scope); } - switch (request.getItemCategoryName()) { case DIGITAL_OSCILLOSCOPE: readyForDigitalParams(map, list); @@ -168,9 +156,8 @@ readyForImitateParams(map, list); break; default: - throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST); + break; } - //替换/方法 replaceSlash(map); List templateUrls = new ArrayList<>(); @@ -202,28 +189,15 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataSpectrumAnalyzerList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataSpectrumAnalyzer()); - request.setMeasureDataSpectrumAnalyzerList(list); - } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataOscilloscope oscilloscope : request.getMeasureDataOscilloscopeList()) { BizBusinessDeviceMeasureDataOscilloscope scope = (BizBusinessDeviceMeasureDataOscilloscope) BeanUtils.cloneBean(oscilloscope); scope.applyStrategyBasedOnDataType(request.getItemCategoryName()); list.add(scope); } - switch (request.getItemCategoryName()) { case DIGITAL_OSCILLOSCOPE: readyForDigitalParams(map, list); @@ -232,9 +206,8 @@ readyForImitateParams(map, list); break; default: - throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_ITEM_CATEGORY_NAME_NOT_EXIST); + break; } - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); @@ -267,32 +240,26 @@ * @param oscilloscopeList */ private void readyForImitateParams(Map map, List oscilloscopeList) { - if (CollectionUtils.isEmpty(oscilloscopeList)) { - throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_MEASURE_DATA_NOT_EXIST); - } - //根据dataType分组，key为dataType，value为List - Map> groupMap = oscilloscopeList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataOscilloscope::getDataType)); //扫描时间系数及扩展 - List expansionList = groupMap.get(SCAN_TIME_COEFFICIENT_AND_EXPANSION); + List expansionList = oscilloscopeList.stream().filter(o -> "1".equals(o.getDataType())).collect(Collectors.toList()); map.put("expansionList", expansionList); //垂直幅度测量 - List verticalList = groupMap.get(VERTICAL_AMPLITUDE_MEASUREMENT); + List verticalList = oscilloscopeList.stream().filter(o -> "2".equals(o.getDataType())).collect(Collectors.toList()); map.put("verticalList", verticalList); //频带宽度 - List widthList = groupMap.get(FREQUENCY_BAND_WIDTH); + List widthList = oscilloscopeList.stream().filter(o -> "3".equals(o.getDataType())).collect(Collectors.toList()); map.put("widthList", widthList); //触发特性 - List triggerList = groupMap.get(TRIGGER_CHARACTERISTICS); + List triggerList = oscilloscopeList.stream().filter(o -> "4".equals(o.getDataType())).collect(Collectors.toList()); map.put("triggerList", triggerList); //输入电阻 - List resistanceList = groupMap.get(INPUT_RESISTANCE); + List resistanceList = oscilloscopeList.stream().filter(o -> "5".equals(o.getDataType())).collect(Collectors.toList()); map.put("resistanceList", resistanceList); //上升时间 - List riseList = groupMap.get(RISE_TIME); + List riseList = oscilloscopeList.stream().filter(o -> "6".equals(o.getDataType())).collect(Collectors.toList()); map.put("riseList", riseList); //校准信号 - List signalList = groupMap.get(OSCILLOSCOPE_CALIBRATION_SIGNAL); + List signalList = oscilloscopeList.stream().filter(o -> "7".equals(o.getDataType())).collect(Collectors.toList()); map.put("signalList", signalList); } @@ -303,35 +270,28 @@ * @param oscilloscopeList */ private void readyForDigitalParams(Map map, List oscilloscopeList) { - if (CollectionUtils.isEmpty(oscilloscopeList)) { - throw new BusinessException(BusinessExceptionEnum.EQUIPMENT_MEASURE_DATA_NOT_EXIST); - } - //根据dataType分组，key为dataType，value为List - Map> groupMap = oscilloscopeList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataOscilloscope::getDataType)); - - List baseList = groupMap.get(TIME_BASE); + List baseList = oscilloscopeList.stream().filter(o -> "1".equals(o.getDataType())).collect(Collectors.toList()); map.put("baseList", baseList); - List gainList = groupMap.get(DC_GAIN); + List gainList = oscilloscopeList.stream().filter(o -> "2".equals(o.getDataType())).collect(Collectors.toList()); map.put("gainList", gainList); - List offetList = groupMap.get(DC_OFFSET); + List offetList = oscilloscopeList.stream().filter(o -> "3".equals(o.getDataType())).collect(Collectors.toList()); map.put("offsetList", offetList); - List bandwidthList = groupMap.get(OSCILLOSCOPE_FREQUENCY_BAND_WIDTH); + List bandwidthList = oscilloscopeList.stream().filter(o -> "4".equals(o.getDataType())).collect(Collectors.toList()); map.put("bandwidthList", bandwidthList); - List sensitivityList = groupMap.get(TRIGGER_SENSITIVITY); + List sensitivityList = oscilloscopeList.stream().filter(o -> "5".equals(o.getDataType())).collect(Collectors.toList()); map.put("sensitivityList", sensitivityList); - List riseTimeList = groupMap.get(RISE_TIME); + List riseTimeList = oscilloscopeList.stream().filter(o -> "6".equals(o.getDataType())).collect(Collectors.toList()); map.put("timeList", riseTimeList); - List inputList = groupMap.get(OSCILLOSCOPE_INPUT_RESISTANCE); + List inputList = oscilloscopeList.stream().filter(o -> "7".equals(o.getDataType())).collect(Collectors.toList()); map.put("inputList", inputList); - List signalList = groupMap.get(SIGNAL); + List signalList = oscilloscopeList.stream().filter(o -> "8".equals(o.getDataType())).collect(Collectors.toList()); map.put("signalList", signalList); } } 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 8792368..66781e5 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 @@ -84,6 +84,7 @@ /** * 准备核查填充参数 + * * @param thermometerList * @param map */ @@ -185,10 +186,13 @@ request.setMeasureDataResistanceThermometerList(list); } DictCodeUtils.convertDictCodeToName(request); + if (StringUtils.isNotBlank(request.getAngleAdjustError())){ + request.setAngleAdjustError("0".equals(request.getAngleAdjustError()) ? "可用" : "不可用"); + } Map map = BeanUtil.beanToMap(request); mapReplace(map); - readyForCoverParams(map,request.getLabCode()); + readyForCoverParams(map, request.getLabCode()); List resistanceThermometerList = request.getMeasureDataResistanceThermometerList(); @@ -416,17 +420,9 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - - - readyForCoverParams(map,request.getLabCode()); - + readyForCoverParams(map, request.getLabCode()); List thermometerList = request.getMeasureDataResistanceThermometerList(); switch (request.getItemCategoryName()) { case THERMAL_RESISTANCE: @@ -444,8 +440,6 @@ default: break; } - - readyForCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 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 f56749d..162b048 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 @@ -62,7 +62,6 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - List safetyValveList = request.getMeasureDataSafetyValueList(); readyForCoverParams(map,request.getLabCode()); List list = new ArrayList<>(); @@ -125,11 +124,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map,request.getLabCode()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SignalGeneratorHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SignalGeneratorHandler.java index 4697e6d..9682cb6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SignalGeneratorHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SignalGeneratorHandler.java @@ -143,6 +143,7 @@ appendTestValueUnit(s, "dBc"); break; default: + break; } } @@ -220,33 +221,32 @@ } private void readyForSignalGenerator(Map map, List generatorList) { - Map> groupMap = generatorList.stream().collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataSignalGenerator::getDataType)); //频率 - List frequencyList = groupMap.get("1"); + List frequencyList = generatorList.stream().filter(s -> "1".equals(s.getDataType())).collect(Collectors.toList()); map.put("frequencyList", frequencyList); //功率 - List powerList = groupMap.get("2"); + List powerList = generatorList.stream().filter(s -> "2".equals(s.getDataType())).collect(Collectors.toList()); map.put("powerList", powerList); //调幅 - List amplitudeModuList = groupMap.get("3"); + List amplitudeModuList = generatorList.stream().filter(s -> "3".equals(s.getDataType())).collect(Collectors.toList()); map.put("amplitudeModuList", amplitudeModuList); //调频 - List phaseList = groupMap.get("4"); + List phaseList = generatorList.stream().filter(s -> "4".equals(s.getDataType())).collect(Collectors.toList()); map.put("phaseList", phaseList); //剩余调幅 - List lastAmplitudeList = groupMap.get("5"); + List lastAmplitudeList = generatorList.stream().filter(s -> "5".equals(s.getDataType())).collect(Collectors.toList()); map.put("lastAmplitudeList", lastAmplitudeList); //剩余调频 - List lastPhaseList = groupMap.get("6"); + List lastPhaseList = generatorList.stream().filter(s -> "6".equals(s.getDataType())).collect(Collectors.toList()); map.put("lastPhaseList", lastPhaseList); //谐波 - List harmonicList = groupMap.get("7"); + List harmonicList = generatorList.stream().filter(s -> "7".equals(s.getDataType())).collect(Collectors.toList()); map.put("harmonicList", harmonicList); //调相 - List phaseModuList = groupMap.get("8"); + List phaseModuList = generatorList.stream().filter(s -> "8".equals(s.getDataType())).collect(Collectors.toList()); map.put("phaseModuList", phaseModuList); //非谐波 - List nonHarmonicList = groupMap.get("9"); + List nonHarmonicList = generatorList.stream().filter(s -> "9".equals(s.getDataType())).collect(Collectors.toList()); map.put("nonHarmonicList", nonHarmonicList); } @@ -257,16 +257,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SpectrumAnalyzerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SpectrumAnalyzerHandler.java index bf1e69c..86d7e1d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SpectrumAnalyzerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SpectrumAnalyzerHandler.java @@ -68,7 +68,7 @@ request.setCheckAccord("无"); } Map map = BeanUtil.beanToMap(request); - processCheckAccord(map,request.getLabCode()); + processCheckAccord(map, request.getLabCode()); readyForCheckParams(map, request.getCheckDataSpectrumAnalyzerList()); replaceSlash(map); @@ -138,12 +138,12 @@ map.put("freRepList", freRepList); map.put("freStaList", freStaList); - map.put("freStaDate"+ 1, oneDate); - map.put("freStaDate"+ 2, twoDate); - map.put("freStaDate"+ 3, threeDate); - map.put("freStaDate"+ 4, fourDate); - map.put("freStaDate"+ 5, fiveDate); - map.put("freStaDate"+ 6, sixDate); + map.put("freStaDate" + 1, oneDate); + map.put("freStaDate" + 2, twoDate); + map.put("freStaDate" + 3, threeDate); + map.put("freStaDate" + 4, fourDate); + map.put("freStaDate" + 5, fiveDate); + map.put("freStaDate" + 6, sixDate); List powerList = groupMap.get(POWER); List powerRepList = powerList.stream() @@ -191,12 +191,12 @@ map.put("powerRepList", powerRepList); map.put("powerStaList", powerStaList); - map.put("powerStaDate"+ 1, powerOneDate); - map.put("powerStaDate"+ 2, powerTwoDate); - map.put("powerStaDate"+ 3, powerThreeDate); - map.put("powerStaDate"+ 4, powerFourDate); - map.put("powerStaDate"+ 5, powerFiveDate); - map.put("powerStaDate"+ 6, powerSixDate); + map.put("powerStaDate" + 1, powerOneDate); + map.put("powerStaDate" + 2, powerTwoDate); + map.put("powerStaDate" + 3, powerThreeDate); + map.put("powerStaDate" + 4, powerFourDate); + map.put("powerStaDate" + 5, powerFiveDate); + map.put("powerStaDate" + 6, powerSixDate); List relativeList = groupMap.get(RELATIVE_LEVEL); List relativeRepList = relativeList.stream() @@ -245,17 +245,17 @@ map.put("relativeRepList", relativeRepList); map.put("relativeStaList", relativeStaList); - map.put("relativeStaDate"+ 1, relativeOneDate); - map.put("relativeStaDate"+ 2, relativeTwoDate); - map.put("relativeStaDate"+ 3, relativeThreeDate); - map.put("relativeStaDate"+ 4, relativeFourDate); - map.put("relativeStaDate"+ 5, relativeFiveDate); - map.put("relativeStaDate"+ 6, relativeSixDate); + map.put("relativeStaDate" + 1, relativeOneDate); + map.put("relativeStaDate" + 2, relativeTwoDate); + map.put("relativeStaDate" + 3, relativeThreeDate); + map.put("relativeStaDate" + 4, relativeFourDate); + map.put("relativeStaDate" + 5, relativeFiveDate); + map.put("relativeStaDate" + 6, relativeSixDate); } private String formatDate(String date) { - if (StringUtils.isNotBlank(date)){ - return DateUtil.format(DateUtil.parseDate(date),"yyyy/MM/dd"); + if (StringUtils.isNotBlank(date)) { + return DateUtil.format(DateUtil.parseDate(date), "yyyy/MM/dd"); } return null; } @@ -311,13 +311,8 @@ private void readyForMeasureParams(Map map, List analyzerList) { - //根据dataType进行分组，key为dataType，value为List - Map> groupMap = analyzerList.stream() - .collect(Collectors.groupingBy(BizBusinessDeviceMeasureDataSpectrumAnalyzer::getDataType)); - //频率显示 - List displayList = groupMap.get(FREQUENCY_DISPLAY) - .stream() + List displayList = analyzerList.stream().filter(a -> "1".equals(a.getDataType())) .peek(analyzer -> { analyzer.setNominalValue(REFERENCE_POINT.equals(analyzer.getNominalValue()) || START_POINT.equals(analyzer.getNominalValue()) ? analyzer.getNominalValue() : StringUtils.isNotBlank(analyzer.getNominalValue()) ? analyzer.getNominalValue() + analyzer.getUnit() : ""); analyzer.setSweepWidth(REFERENCE_POINT.equals(analyzer.getSweepWidth()) || START_POINT.equals(analyzer.getSweepWidth()) ? analyzer.getSweepWidth() : StringUtils.isNotBlank(analyzer.getSweepWidth()) ? analyzer.getSweepWidth() + analyzer.getSweepWidthUnit() : ""); @@ -332,8 +327,7 @@ .collect(Collectors.toList()); map.put("displayList", displayList); //扫频宽度 - List sweepList = groupMap.get(SWEEP_WIDTH) - .stream() + List sweepList = analyzerList.stream().filter(a -> "2".equals(a.getDataType())) .peek(analyzer -> { analyzer.setNominalValue(REFERENCE_POINT.equals(analyzer.getNominalValue()) || START_POINT.equals(analyzer.getNominalValue()) ? analyzer.getNominalValue() : StringUtils.isNotBlank(analyzer.getNominalValue()) ? analyzer.getNominalValue() + analyzer.getUnit() : ""); analyzer.setOneValue(REFERENCE_POINT.equals(analyzer.getOneValue()) || START_POINT.equals(analyzer.getOneValue()) ? analyzer.getOneValue() : StringUtils.isNotBlank(analyzer.getOneValue()) ? analyzer.getOneValue() + analyzer.getUnit() : ""); @@ -349,8 +343,7 @@ }).collect(Collectors.toList()); map.put("sweepList", sweepList); //中频带宽 - List bandwidthList = groupMap.get(IF_BANDWIDTH) - .stream() + List bandwidthList = analyzerList.stream().filter(a -> "3".equals(a.getDataType())) .peek(analyzer -> { analyzer.setNominalValue(REFERENCE_POINT.equals(analyzer.getNominalValue()) || START_POINT.equals(analyzer.getNominalValue()) ? analyzer.getNominalValue() : StringUtils.isNotBlank(analyzer.getNominalValue()) ? analyzer.getNominalValue() + analyzer.getUnit() : ""); analyzer.setOneValue(REFERENCE_POINT.equals(analyzer.getOneValue()) || START_POINT.equals(analyzer.getOneValue()) ? analyzer.getOneValue() : StringUtils.isNotBlank(analyzer.getOneValue()) ? analyzer.getOneValue() + analyzer.getUnit() : ""); @@ -367,12 +360,12 @@ .collect(Collectors.toList()); map.put("bandwidthList", bandwidthList); //中频带宽转换偏差 - List conversionList = groupMap.get(IF_BANDWIDTH_CONVERSION_DEVIATION) - .stream().peek(analyzer -> { + List conversionList = analyzerList.stream().filter(a -> "4".equals(a.getDataType())) + .peek(analyzer -> { analyzer.setNominalValue(REFERENCE_POINT.equals(analyzer.getNominalValue()) || START_POINT.equals(analyzer.getNominalValue()) ? analyzer.getNominalValue() : StringUtils.isNotBlank(analyzer.getNominalValue()) ? analyzer.getNominalValue() + analyzer.getUnit() : ""); analyzer.setOneValue(REFERENCE_POINT.equals(analyzer.getOneValue()) || START_POINT.equals(analyzer.getOneValue()) ? analyzer.getOneValue() : StringUtils.isNotBlank(analyzer.getOneValue()) ? analyzer.getOneValue() + "dBm" : ""); analyzer.setLowerConvertDeviation(REFERENCE_POINT.equals(analyzer.getLowerConvertDeviation()) || START_POINT.equals(analyzer.getLowerConvertDeviation()) ? analyzer.getLowerConvertDeviation() : StringUtils.isNotBlank(analyzer.getLowerConvertDeviation()) ? analyzer.getLowerConvertDeviation() + "dB" : ""); - if (!"/".equals(analyzer.getConvertDeviation())){ + if (!"/".equals(analyzer.getConvertDeviation())) { analyzer.setConvertDeviation(REFERENCE_POINT.equals(analyzer.getConvertDeviation()) || START_POINT.equals(analyzer.getConvertDeviation()) ? analyzer.getConvertDeviation() : StringUtils.isNotBlank(analyzer.getConvertDeviation()) ? analyzer.getConvertDeviation() + "dB" : ""); } analyzer.setUpperConvertDeviation(REFERENCE_POINT.equals(analyzer.getUpperConvertDeviation()) || START_POINT.equals(analyzer.getUpperConvertDeviation()) ? analyzer.getUpperConvertDeviation() : StringUtils.isNotBlank(analyzer.getUpperConvertDeviation()) ? analyzer.getUpperConvertDeviation() + "dB" : ""); @@ -380,8 +373,7 @@ }).collect(Collectors.toList()); map.put("conversionList", conversionList); //参考电平 - List referenceList = groupMap.get(REFERENCE_LEVEL) - .stream() + List referenceList = analyzerList.stream().filter(a -> "5".equals(a.getDataType())) .peek(analyzer -> { analyzer.setNominalValue(REFERENCE_POINT.equals(analyzer.getNominalValue()) || START_POINT.equals(analyzer.getNominalValue()) ? analyzer.getNominalValue() : StringUtils.isNotBlank(analyzer.getNominalValue()) ? analyzer.getNominalValue() + analyzer.getUnit() : ""); analyzer.setStandardAttenuatorAttenuation(REFERENCE_POINT.equals(analyzer.getStandardAttenuatorAttenuation()) || START_POINT.equals(analyzer.getStandardAttenuatorAttenuation()) ? analyzer.getStandardAttenuatorAttenuation() : StringUtils.isNotBlank(analyzer.getStandardAttenuatorAttenuation()) ? analyzer.getStandardAttenuatorAttenuation() + analyzer.getStandardAttenuatorAttenuationUnit() : ""); @@ -395,8 +387,7 @@ .collect(Collectors.toList()); map.put("referenceList", referenceList); //垂直刻度 - List verticalList = groupMap.get(VERTICAL_SCALE) - .stream() + List verticalList = analyzerList.stream().filter(a -> "6".equals(a.getDataType())) .peek(analyzer -> { analyzer.setNominalValue(REFERENCE_POINT.equals(analyzer.getNominalValue()) || START_POINT.equals(analyzer.getNominalValue()) ? analyzer.getNominalValue() : StringUtils.isNotBlank(analyzer.getNominalValue()) ? analyzer.getNominalValue() + analyzer.getUnit() : ""); analyzer.setStandardAttenuatorAttenuation(REFERENCE_POINT.equals(analyzer.getStandardAttenuatorAttenuation()) || START_POINT.equals(analyzer.getStandardAttenuatorAttenuation()) ? analyzer.getStandardAttenuatorAttenuation() : StringUtils.isNotBlank(analyzer.getStandardAttenuatorAttenuation()) ? analyzer.getStandardAttenuatorAttenuation() + "dB" : ""); @@ -409,8 +400,7 @@ .collect(Collectors.toList()); map.put("verticalList", verticalList); //输入频响 - List frequencyList = groupMap.get(INPUT_FREQUENCY_RESPONSE) - .stream() + List frequencyList = analyzerList.stream().filter(a -> "7".equals(a.getDataType())) .peek(analyzer -> { analyzer.setFrequency(REFERENCE_POINT.equals(analyzer.getFrequency()) || START_POINT.equals(analyzer.getFrequency()) ? analyzer.getFrequency() : StringUtils.isNotBlank(analyzer.getFrequency()) ? analyzer.getFrequency() + analyzer.getFrequencyUnit() : ""); analyzer.setOneValue(REFERENCE_POINT.equals(analyzer.getOneValue()) || START_POINT.equals(analyzer.getOneValue()) ? analyzer.getOneValue() : StringUtils.isNotBlank(analyzer.getOneValue()) ? analyzer.getOneValue() + "dB" : ""); @@ -424,8 +414,7 @@ .collect(Collectors.toList()); map.put("frequencyList", frequencyList); //平均噪声电平 - List noiseList = groupMap.get(AVERAGE_NOISE_LEVEL) - .stream() + List noiseList = analyzerList.stream().filter(a -> "8".equals(a.getDataType())) .peek(analyzer -> { analyzer.setStartFrequency(REFERENCE_POINT.equals(analyzer.getStartFrequency()) || START_POINT.equals(analyzer.getStartFrequency()) ? analyzer.getStartFrequency() : StringUtils.isNotBlank(analyzer.getStartFrequency()) ? analyzer.getStartFrequency() + analyzer.getStartFrequencyUnit() : ""); analyzer.setEndFrequency(REFERENCE_POINT.equals(analyzer.getEndFrequency()) || START_POINT.equals(analyzer.getEndFrequency()) ? analyzer.getEndFrequency() : StringUtils.isNotBlank(analyzer.getEndFrequency()) ? analyzer.getEndFrequency() + analyzer.getEndFrequencyUnit() : ""); @@ -437,8 +426,7 @@ .collect(Collectors.toList()); map.put("noiseList", noiseList); //谐波失真 - List harmonicList = groupMap.get(HARMONIC_DISTORTION) - .stream() + List harmonicList = analyzerList.stream().filter(a -> "9".equals(a.getDataType())) .peek(analyzer -> { analyzer.setFrequency(REFERENCE_POINT.equals(analyzer.getFrequency()) || START_POINT.equals(analyzer.getFrequency()) ? analyzer.getFrequency() : StringUtils.isNotBlank(analyzer.getFrequency()) ? analyzer.getFrequency() + analyzer.getFrequencyUnit() : ""); analyzer.setOneValue(REFERENCE_POINT.equals(analyzer.getOneValue()) || START_POINT.equals(analyzer.getOneValue()) ? analyzer.getOneValue() : StringUtils.isNotBlank(analyzer.getOneValue()) ? analyzer.getOneValue() + "dBm" : ""); @@ -450,8 +438,7 @@ .collect(Collectors.toList()); map.put("harmonicList", harmonicList); //输入衰减 - List attenuationList = groupMap.get(INPUT_ATTENUATION) - .stream() + List attenuationList = analyzerList.stream().filter(a -> "10".equals(a.getDataType())) .peek(analyzer -> { analyzer.setStandardAttenuatorAttenuation(REFERENCE_POINT.equals(analyzer.getStandardAttenuatorAttenuation()) || START_POINT.equals(analyzer.getStandardAttenuatorAttenuation()) ? analyzer.getStandardAttenuatorAttenuation() : StringUtils.isNotBlank(analyzer.getStandardAttenuatorAttenuation()) ? analyzer.getStandardAttenuatorAttenuation() + analyzer.getStandardAttenuatorAttenuationUnit() : ""); analyzer.setInputAttenuator(REFERENCE_POINT.equals(analyzer.getInputAttenuator()) || START_POINT.equals(analyzer.getInputAttenuator()) ? analyzer.getInputAttenuator() : StringUtils.isNotBlank(analyzer.getInputAttenuator()) ? analyzer.getInputAttenuator() + analyzer.getInputAttenuatorUnit() : ""); @@ -465,8 +452,7 @@ .collect(Collectors.toList()); map.put("attenuationList", attenuationList); //1dB增益压缩点 - List compressionList = groupMap.get(GAIN_COMPRESSION_POINT) - .stream() + List compressionList = analyzerList.stream().filter(a -> "11".equals(a.getDataType())) .peek(analyzer -> { analyzer.setFrequency(REFERENCE_POINT.equals(analyzer.getFrequency()) || START_POINT.equals(analyzer.getFrequency()) ? analyzer.getFrequency() : StringUtils.isNotBlank(analyzer.getFrequency()) ? analyzer.getFrequency() + analyzer.getFrequencyUnit() : ""); analyzer.setInputAttenuator(REFERENCE_POINT.equals(analyzer.getInputAttenuator()) || START_POINT.equals(analyzer.getInputAttenuator()) ? analyzer.getInputAttenuator() : StringUtils.isNotBlank(analyzer.getInputAttenuator()) ? analyzer.getInputAttenuator() + analyzer.getInputAttenuatorUnit() : ""); @@ -478,8 +464,7 @@ .collect(Collectors.toList()); map.put("compressionList", compressionList); //校准信号 - List calibrationList = groupMap.get(CALIBRATION_SIGNAL) - .stream() + List calibrationList = analyzerList.stream().filter(a -> "12".equals(a.getDataType())) .peek(analyzer -> { analyzer.setNominalValue(REFERENCE_POINT.equals(analyzer.getNominalValue()) || START_POINT.equals(analyzer.getNominalValue()) ? analyzer.getNominalValue() : StringUtils.isNotBlank(analyzer.getNominalValue()) ? analyzer.getNominalValue() + analyzer.getUnit() : ""); if (FREQUENCY_CN.equals(analyzer.getTypeValue())) { @@ -494,7 +479,7 @@ analyzer.setMeasureResult(REFERENCE_POINT.equals(analyzer.getMeasureResult()) || START_POINT.equals(analyzer.getMeasureResult()) ? analyzer.getMeasureResult() : StringUtils.isNotBlank(analyzer.getMeasureResult()) ? analyzer.getMeasureResult() + analyzer.getMeasureResultUnit() : ""); analyzer.setLowerIndex(REFERENCE_POINT.equals(analyzer.getLowerIndex()) || START_POINT.equals(analyzer.getLowerIndex()) ? analyzer.getLowerIndex() : StringUtils.isNotBlank(analyzer.getLowerIndex()) ? analyzer.getLowerIndex() + analyzer.getUnit() : ""); analyzer.setUpperIndex(REFERENCE_POINT.equals(analyzer.getUpperIndex()) || START_POINT.equals(analyzer.getUpperIndex()) ? analyzer.getUpperIndex() : StringUtils.isNotBlank(analyzer.getUpperIndex()) ? analyzer.getUpperIndex() + analyzer.getUnit() : ""); - if (StringUtils.isBlank(analyzer.getConclusion())){ + if (StringUtils.isBlank(analyzer.getConclusion())) { analyzer.setConclusion("/"); } analyzer.applyStrategyBasedOnDataType(); @@ -517,12 +502,9 @@ list.add(new BizBusinessDeviceMeasureDataSpectrumAnalyzer()); request.setMeasureDataSpectrumAnalyzerList(list); } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - List analyzerList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataSpectrumAnalyzer spectrumAnalyzer : request.getMeasureDataSpectrumAnalyzerList()) { BizBusinessDeviceMeasureDataSpectrumAnalyzer analyzer = (BizBusinessDeviceMeasureDataSpectrumAnalyzer) BeanUtils.cloneBean(spectrumAnalyzer); 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 3c4e58d..bae3bb5 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 @@ -147,9 +147,9 @@ miniName = createResponseFileInput(printDocUrl, registerParameters.getResponse()); } //删除无效的文件 - File invalidFile = new File(tempLocalFileDir); - // 删除运行空间下的文件 - deleteFile(invalidFile); +// File invalidFile = new File(tempLocalFileDir); +// // 删除运行空间下的文件 +// deleteFile(invalidFile); log.info("证书打印完成......，证书名称为{}", miniName); } return miniName;