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 8172cc9..f70b873 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 @@ -102,64 +102,64 @@ Map> typeMap = request.getCheckDataLowFrequencySignalList().stream().collect(Collectors.groupingBy(BizEquipmentStandardCheckDataLowFrequencySignal::getCheckType)); List repList = typeMap.get(REPEATABILITY); Map> repMap = repList.stream().collect(Collectors.groupingBy(BizEquipmentStandardCheckDataLowFrequencySignal::getParams)); - if (!repMap.containsKey("1")) { + if (!repMap.containsKey(FREQUENCY_CN)) { addDataRemoveItem(dataItems, startIndex + 1, "频率"); } else { map.put("zeroRepSeq", (repIndex++) + "、"); } - if (!repMap.containsKey("2")) { + if (!repMap.containsKey(AC_VOLTAGE)) { addDataRemoveItem(dataItems, startIndex + 2, "交流电压"); } else { map.put("firstRepSeq", (repIndex++) + "、"); } - if (!repMap.containsKey("3")) { + if (!repMap.containsKey(DC_VOLTAGE)) { addDataRemoveItem(dataItems, startIndex + 3, "直流电压"); } else { map.put("secondRepSeq", (repIndex++) + "、"); } - if (!repMap.containsKey("4")) { + if (!repMap.containsKey(RISE_AND_FALL_TIME)) { addDataRemoveItem(dataItems, startIndex + 4, "上升时间"); } else { map.put("thirdRepSeq", (repIndex++) + "、"); } - if (!repMap.containsKey("5")) { + if (!repMap.containsKey(FLATNESS)) { addDataRemoveItem(dataItems, startIndex + 5, "平坦度"); } else { map.put("fourthRepSeq", (repIndex++) + "、"); } - if (!repMap.containsKey("6")) { + if (!repMap.containsKey(DISTORTION)) { addDataRemoveItem(dataItems, startIndex + 6, "失真"); } else { map.put("fifthRepSeq", (repIndex++) + "、"); } List staList = typeMap.get(STABILITY); Map> staMap = staList.stream().collect(Collectors.groupingBy(BizEquipmentStandardCheckDataLowFrequencySignal::getParams)); - if (!staMap.containsKey("1")) { + if (!staMap.containsKey(FREQUENCY_CN)) { addDataRemoveItem(dataItems, startIndex + 7, "频率"); } else { map.put("zeroStaSeq", (repIndex++) + "、"); } - if (!staMap.containsKey("2")) { + if (!staMap.containsKey(AC_VOLTAGE)) { addDataRemoveItem(dataItems, startIndex + 8, "交流电压"); } else { map.put("firstStaSeq", (repIndex++) + "、"); } - if (!staMap.containsKey("3")) { + if (!staMap.containsKey(DC_VOLTAGE)) { addDataRemoveItem(dataItems, startIndex + 9, "直流电压"); } else { map.put("secondStaSeq", (repIndex++) + "、"); } - if (!staMap.containsKey("4")) { + if (!staMap.containsKey(RISE_AND_FALL_TIME)) { addDataRemoveItem(dataItems, startIndex + 10, "上升时间"); } else { map.put("thirdStaSeq", (repIndex++) + "、"); } - if (!staMap.containsKey("5")) { + if (!staMap.containsKey(FLATNESS)) { addDataRemoveItem(dataItems, startIndex + 11, "平坦度"); } else { map.put("fourthStaSeq", (repIndex++) + "、"); } - if (!staMap.containsKey("6")) { + if (!staMap.containsKey(DISTORTION)) { addDataRemoveItem(dataItems, startIndex + 12, "失真"); } else { map.put("fifthStaSeq", (repIndex++) + "、");