diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java index 2133dbd..1d32895 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java @@ -105,7 +105,7 @@ BigDecimal rippleVoltage = new BigDecimal(dcPower.getRippleVoltage()); int compare = rippleVoltage.compareTo(technicalIndex); dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex()); - dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "mV"); + dcPower.setRippleVoltage(dcPower.getRippleVoltage() + dcPower.getUnit()); if (compare > 0) { dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "*"); } @@ -119,7 +119,7 @@ public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataDcPower dcPower) { if (StringUtils.isNotBlank(dcPower.getTechnicalIndex()) && StringUtils.isNotBlank(dcPower.getShortTermStability()) && !"/".equals(dcPower.getShortTermStability()) && "/".equals(dcPower.getTechnicalIndex())) { int digit = dcPower.getTechnicalIndexDigit(); - BigDecimal shortTermStability = new BigDecimal(dcPower.getShortTermStability()).setScale(digit + 1); + BigDecimal shortTermStability = new BigDecimal(dcPower.getShortTermStability()).setScale(digit); BigDecimal technicalIndex = new BigDecimal(dcPower.getTechnicalIndex()); int compare = shortTermStability.compareTo(technicalIndex); dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java index 2133dbd..1d32895 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/strategy/impl/DcPowerStrategyType.java @@ -105,7 +105,7 @@ BigDecimal rippleVoltage = new BigDecimal(dcPower.getRippleVoltage()); int compare = rippleVoltage.compareTo(technicalIndex); dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex()); - dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "mV"); + dcPower.setRippleVoltage(dcPower.getRippleVoltage() + dcPower.getUnit()); if (compare > 0) { dcPower.setRippleVoltage(dcPower.getRippleVoltage() + "*"); } @@ -119,7 +119,7 @@ public void appendAsterisksIfNeeded(BizBusinessDeviceMeasureDataDcPower dcPower) { if (StringUtils.isNotBlank(dcPower.getTechnicalIndex()) && StringUtils.isNotBlank(dcPower.getShortTermStability()) && !"/".equals(dcPower.getShortTermStability()) && "/".equals(dcPower.getTechnicalIndex())) { int digit = dcPower.getTechnicalIndexDigit(); - BigDecimal shortTermStability = new BigDecimal(dcPower.getShortTermStability()).setScale(digit + 1); + BigDecimal shortTermStability = new BigDecimal(dcPower.getShortTermStability()).setScale(digit); BigDecimal technicalIndex = new BigDecimal(dcPower.getTechnicalIndex()); int compare = shortTermStability.compareTo(technicalIndex); dcPower.setTechnicalIndex(dcPower.getTechnicalIndexSymbol() + dcPower.getTechnicalIndex() + "%"); 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 5017c56..ad84cbc 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 @@ -25,6 +25,7 @@ import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.Arrays; @@ -97,35 +98,48 @@ private List removeCheckItem(BizEquipmentStandardCheckRecordApproval request, int startIndex, Map map) { List dataItems = new ArrayList<>(); - int repIndex = 1, staIndex = 4; - Map> dataMap = request.getCheckDataSpectrumAnalyzerList().stream().collect(Collectors.groupingBy(BizEquipmentStandardCheckDataSpectrumAnalyzer::getParams)); - if (!dataMap.containsKey("1")) { - addDataRemoveItem(dataItems, startIndex + repIndex, "铯原子频标核查"); - addDataRemoveItem(dataItems, startIndex + staIndex, "铯原子频标核查"); + int repIndex = 1; + Map> typeMap = request.getCheckDataCesiumAtomList().stream().collect(Collectors.groupingBy(BizEquipmentStandardCheckDataCesiumAtom::getCheckType)); + List repList = typeMap.get(REPEATABILITY); + Map> repMap = repList.stream().collect(Collectors.groupingBy(BizEquipmentStandardCheckDataCesiumAtom::getParams)); + if (!repMap.containsKey("铯原子频标核查")) { + addDataRemoveItem(dataItems, startIndex + 1, "铯原子频标核查"); } else { map.put("zeroRepSeq", (repIndex++) + "、"); - map.put("zeroStaSeq", (staIndex++) + "、"); } - if (!dataMap.containsKey("2")) { - addDataRemoveItem(dataItems, startIndex + repIndex + 1, "函数信号发生器核查"); - addDataRemoveItem(dataItems, startIndex + staIndex + 1, "函数信号发生器核查"); + if (!repMap.containsKey("函数信号发生器核查")) { + addDataRemoveItem(dataItems, startIndex + 2, "函数信号发生器核查"); } else { map.put("firstRepSeq", (repIndex++) + "、"); - map.put("firstStaSeq", (staIndex++) + "、"); } - if (!dataMap.containsKey("3")) { - addDataRemoveItem(dataItems, startIndex + repIndex + 2, "信号源核查"); - addDataRemoveItem(dataItems, startIndex + staIndex + 2, "信号源核查"); + if (!repMap.containsKey("信号源核查")) { + addDataRemoveItem(dataItems, startIndex + 2, "信号源核查"); } else { map.put("secondRepSeq", (repIndex++) + "、"); - map.put("secondStaSeq", (staIndex++) + "、"); + } + List staList = typeMap.get(STABILITY); + Map> staMap = staList.stream().collect(Collectors.groupingBy(BizEquipmentStandardCheckDataCesiumAtom::getParams)); + if (!staMap.containsKey("铯原子频标核查")) { + addDataRemoveItem(dataItems, startIndex + 3, "铯原子频标核查"); + } else { + map.put("zeroStaSeq", (repIndex++) + "、"); + } + if (!staMap.containsKey("函数信号发生器核查")) { + addDataRemoveItem(dataItems, startIndex + 4, "函数信号发生器核查"); + } else { + map.put("firstStaSeq", (repIndex++) + "、"); + } + if (!staMap.containsKey("信号源核查")) { + addDataRemoveItem(dataItems, startIndex + 5, "信号源核查"); + } else { + map.put("secondStaSeq", (repIndex++) + "、"); } return dataItems; } private void readyForCheckDataParams(Map map, List atomList) { //铯原子频标 - List cesiumAtomList = atomList.stream().filter(a -> "1".equals(a.getParams())).map(atom -> { + List cesiumAtomList = atomList.stream().filter(a -> "铯原子频标核查".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() : ""); @@ -138,16 +152,18 @@ map.put("atomList", repAtomList); List staAtomList = cesiumAtomList.stream().filter(atom -> STABILITY.equals(atom.getCheckType())).collect(Collectors.toList()); map.put("staAtom", staAtomList); - BizEquipmentStandardCheckDataCesiumAtom atom = staAtomList.get(0); - map.put(STA_PREFIX + 1 + DATE_PREFIX + 1, atom.getTestValueOneDate()); - map.put(STA_PREFIX + 1 + DATE_PREFIX + 2, atom.getTestValueTwoDate()); - map.put(STA_PREFIX + 1 + DATE_PREFIX + 3, atom.getTestValueThreeDate()); - map.put(STA_PREFIX + 1 + DATE_PREFIX + 4, atom.getTestValueFourDate()); - map.put(STA_PREFIX + 1 + DATE_PREFIX + 5, atom.getTestValueFiveDate()); - map.put(STA_PREFIX + 1 + DATE_PREFIX + 6, atom.getTestValueSixDate()); + if (!CollectionUtils.isEmpty(staAtomList)) { + BizEquipmentStandardCheckDataCesiumAtom atom = staAtomList.get(0); + map.put(STA_PREFIX + 1 + DATE_PREFIX + 1, atom.getTestValueOneDate()); + map.put(STA_PREFIX + 1 + DATE_PREFIX + 2, atom.getTestValueTwoDate()); + map.put(STA_PREFIX + 1 + DATE_PREFIX + 3, atom.getTestValueThreeDate()); + map.put(STA_PREFIX + 1 + DATE_PREFIX + 4, atom.getTestValueFourDate()); + map.put(STA_PREFIX + 1 + DATE_PREFIX + 5, atom.getTestValueFiveDate()); + map.put(STA_PREFIX + 1 + DATE_PREFIX + 6, atom.getTestValueSixDate()); + } //函数信号发生器 - List funcationList = atomList.stream().filter(a -> "2".equals(a.getParams())).map(fun -> { + List funcationList = atomList.stream().filter(a -> "函数信号发生器核查".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() : ""); @@ -160,15 +176,17 @@ map.put("funcationList", funList); List staFunList = funcationList.stream().filter(fun -> STABILITY.equals(fun.getCheckType())).collect(Collectors.toList()); map.put("stafun", staFunList); - BizEquipmentStandardCheckDataCesiumAtom fun = staFunList.get(0); - map.put(STA_PREFIX + 2 + DATE_PREFIX + 1, fun.getTestValueOneDate()); - map.put(STA_PREFIX + 2 + DATE_PREFIX + 2, fun.getTestValueTwoDate()); - map.put(STA_PREFIX + 2 + DATE_PREFIX + 3, fun.getTestValueThreeDate()); - map.put(STA_PREFIX + 2 + DATE_PREFIX + 4, fun.getTestValueFourDate()); - map.put(STA_PREFIX + 2 + DATE_PREFIX + 5, fun.getTestValueFiveDate()); - map.put(STA_PREFIX + 2 + DATE_PREFIX + 6, fun.getTestValueSixDate()); + if (!CollectionUtils.isEmpty(staFunList)) { + BizEquipmentStandardCheckDataCesiumAtom fun = staFunList.get(0); + map.put(STA_PREFIX + 2 + DATE_PREFIX + 1, fun.getTestValueOneDate()); + map.put(STA_PREFIX + 2 + DATE_PREFIX + 2, fun.getTestValueTwoDate()); + map.put(STA_PREFIX + 2 + DATE_PREFIX + 3, fun.getTestValueThreeDate()); + map.put(STA_PREFIX + 2 + DATE_PREFIX + 4, fun.getTestValueFourDate()); + map.put(STA_PREFIX + 2 + DATE_PREFIX + 5, fun.getTestValueFiveDate()); + map.put(STA_PREFIX + 2 + DATE_PREFIX + 6, fun.getTestValueSixDate()); + } - List signalList = atomList.stream().filter(a -> "3".equals(a.getParams())).map(signal -> { + List signalList = atomList.stream().filter(a -> "信号源核查".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() : ""); @@ -181,13 +199,15 @@ map.put("signalList", repSignalList); List staSignalList = signalList.stream().filter(signal -> STABILITY.equals(signal.getCheckType())).collect(Collectors.toList()); map.put("staSignal", staSignalList); - BizEquipmentStandardCheckDataCesiumAtom signal = staSignalList.get(0); - map.put(STA_PREFIX + 3 + DATE_PREFIX + 1, signal.getTestValueOneDate()); - map.put(STA_PREFIX + 3 + DATE_PREFIX + 2, signal.getTestValueTwoDate()); - map.put(STA_PREFIX + 3 + DATE_PREFIX + 3, signal.getTestValueThreeDate()); - map.put(STA_PREFIX + 3 + DATE_PREFIX + 4, signal.getTestValueFourDate()); - map.put(STA_PREFIX + 3 + DATE_PREFIX + 5, signal.getTestValueFiveDate()); - map.put(STA_PREFIX + 3 + DATE_PREFIX + 6, signal.getTestValueSixDate()); + if (!CollectionUtils.isEmpty(staSignalList)) { + BizEquipmentStandardCheckDataCesiumAtom signal = staSignalList.get(0); + map.put(STA_PREFIX + 3 + DATE_PREFIX + 1, signal.getTestValueOneDate()); + map.put(STA_PREFIX + 3 + DATE_PREFIX + 2, signal.getTestValueTwoDate()); + map.put(STA_PREFIX + 3 + DATE_PREFIX + 3, signal.getTestValueThreeDate()); + map.put(STA_PREFIX + 3 + DATE_PREFIX + 4, signal.getTestValueFourDate()); + map.put(STA_PREFIX + 3 + DATE_PREFIX + 5, signal.getTestValueFiveDate()); + map.put(STA_PREFIX + 3 + DATE_PREFIX + 6, signal.getTestValueSixDate()); + } } /**