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 ad84cbc..72ed386 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 @@ -421,7 +421,6 @@ } private void readyForUniversalCounter(Map map, List atomList) { - //晶振开机 List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); 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 ad84cbc..72ed386 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 @@ -421,7 +421,6 @@ } private void readyForUniversalCounter(Map map, List atomList) { - //晶振开机 List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); 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 f51deb9..96867a7 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 @@ -96,49 +96,71 @@ private List removeCheckItem(BizEquipmentStandardCheckRecordApproval request, int startIndex, Map map) { List dataItems = new ArrayList<>(); - int repIndex = 1, staIndex = 7; - 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.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")) { + 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("2")) { + 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("3")) { + addDataRemoveItem(dataItems, startIndex + 3, "直流电压"); } else { map.put("secondRepSeq", (repIndex++) + "、"); - map.put("secondStaSeq", (staIndex++) + "、"); } - if (!dataMap.containsKey("4")) { - addDataRemoveItem(dataItems, startIndex + repIndex + 3, "上升时间"); - addDataRemoveItem(dataItems, startIndex + staIndex + 3, "上升时间"); + if (!repMap.containsKey("4")) { + addDataRemoveItem(dataItems, startIndex + 4, "上升时间"); } else { map.put("thirdRepSeq", (repIndex++) + "、"); - map.put("thirdStaSeq", (staIndex++) + "、"); } - if (!dataMap.containsKey("5")) { - addDataRemoveItem(dataItems, startIndex + repIndex + 4, "平坦度"); - addDataRemoveItem(dataItems, startIndex + staIndex + 4, "平坦度"); + if (!repMap.containsKey("5")) { + addDataRemoveItem(dataItems, startIndex + 5, "平坦度"); } else { map.put("fourthRepSeq", (repIndex++) + "、"); - map.put("fourthStaSeq", (staIndex++) + "、"); } - if (!dataMap.containsKey("6")) { - addDataRemoveItem(dataItems, startIndex + repIndex + 5, "失真"); - addDataRemoveItem(dataItems, startIndex + staIndex + 5, "失真"); + if (!repMap.containsKey("6")) { + addDataRemoveItem(dataItems, startIndex + 6, "失真"); } else { map.put("fifthRepSeq", (repIndex++) + "、"); - map.put("fifthStaSeq", (staIndex++) + "、"); + } + List staList = typeMap.get(STABILITY); + Map> staMap = staList.stream().collect(Collectors.groupingBy(BizEquipmentStandardCheckDataLowFrequencySignal::getParams)); + if (!staMap.containsKey("1")) { + addDataRemoveItem(dataItems, startIndex + 7, "频率"); + } else { + map.put("zeroStaSeq", (repIndex++) + "、"); + } + if (!staMap.containsKey("2")) { + addDataRemoveItem(dataItems, startIndex + 8, "交流电压"); + } else { + map.put("firstStaSeq", (repIndex++) + "、"); + } + if (!staMap.containsKey("3")) { + addDataRemoveItem(dataItems, startIndex + 9, "直流电压"); + } else { + map.put("secondStaSeq", (repIndex++) + "、"); + } + if (!staMap.containsKey("4")) { + addDataRemoveItem(dataItems, startIndex + 10, "上升时间"); + } else { + map.put("thirdStaSeq", (repIndex++) + "、"); + } + if (!staMap.containsKey("5")) { + addDataRemoveItem(dataItems, startIndex + 11, "平坦度"); + } else { + map.put("fourthStaSeq", (repIndex++) + "、"); + } + if (!staMap.containsKey("6")) { + addDataRemoveItem(dataItems, startIndex + 12, "失真"); + } else { + map.put("fifthStaSeq", (repIndex++) + "、"); } return dataItems; } 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 ad84cbc..72ed386 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 @@ -421,7 +421,6 @@ } private void readyForUniversalCounter(Map map, List atomList) { - //晶振开机 List startupList = atomList.stream().filter(a -> "1".equals(a.getDataType())).collect(Collectors.toList()); 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 f51deb9..96867a7 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 @@ -96,49 +96,71 @@ private List removeCheckItem(BizEquipmentStandardCheckRecordApproval request, int startIndex, Map map) { List dataItems = new ArrayList<>(); - int repIndex = 1, staIndex = 7; - 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.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")) { + 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("2")) { + 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("3")) { + addDataRemoveItem(dataItems, startIndex + 3, "直流电压"); } else { map.put("secondRepSeq", (repIndex++) + "、"); - map.put("secondStaSeq", (staIndex++) + "、"); } - if (!dataMap.containsKey("4")) { - addDataRemoveItem(dataItems, startIndex + repIndex + 3, "上升时间"); - addDataRemoveItem(dataItems, startIndex + staIndex + 3, "上升时间"); + if (!repMap.containsKey("4")) { + addDataRemoveItem(dataItems, startIndex + 4, "上升时间"); } else { map.put("thirdRepSeq", (repIndex++) + "、"); - map.put("thirdStaSeq", (staIndex++) + "、"); } - if (!dataMap.containsKey("5")) { - addDataRemoveItem(dataItems, startIndex + repIndex + 4, "平坦度"); - addDataRemoveItem(dataItems, startIndex + staIndex + 4, "平坦度"); + if (!repMap.containsKey("5")) { + addDataRemoveItem(dataItems, startIndex + 5, "平坦度"); } else { map.put("fourthRepSeq", (repIndex++) + "、"); - map.put("fourthStaSeq", (staIndex++) + "、"); } - if (!dataMap.containsKey("6")) { - addDataRemoveItem(dataItems, startIndex + repIndex + 5, "失真"); - addDataRemoveItem(dataItems, startIndex + staIndex + 5, "失真"); + if (!repMap.containsKey("6")) { + addDataRemoveItem(dataItems, startIndex + 6, "失真"); } else { map.put("fifthRepSeq", (repIndex++) + "、"); - map.put("fifthStaSeq", (staIndex++) + "、"); + } + List staList = typeMap.get(STABILITY); + Map> staMap = staList.stream().collect(Collectors.groupingBy(BizEquipmentStandardCheckDataLowFrequencySignal::getParams)); + if (!staMap.containsKey("1")) { + addDataRemoveItem(dataItems, startIndex + 7, "频率"); + } else { + map.put("zeroStaSeq", (repIndex++) + "、"); + } + if (!staMap.containsKey("2")) { + addDataRemoveItem(dataItems, startIndex + 8, "交流电压"); + } else { + map.put("firstStaSeq", (repIndex++) + "、"); + } + if (!staMap.containsKey("3")) { + addDataRemoveItem(dataItems, startIndex + 9, "直流电压"); + } else { + map.put("secondStaSeq", (repIndex++) + "、"); + } + if (!staMap.containsKey("4")) { + addDataRemoveItem(dataItems, startIndex + 10, "上升时间"); + } else { + map.put("thirdStaSeq", (repIndex++) + "、"); + } + if (!staMap.containsKey("5")) { + addDataRemoveItem(dataItems, startIndex + 11, "平坦度"); + } else { + map.put("fourthStaSeq", (repIndex++) + "、"); + } + if (!staMap.containsKey("6")) { + addDataRemoveItem(dataItems, startIndex + 12, "失真"); + } else { + map.put("fifthStaSeq", (repIndex++) + "、"); } return dataItems; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java index 0aed230..267759a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardInfoServiceImpl.java @@ -638,7 +638,7 @@ List standardInfoList = entry.getValue(); List equipmentInfos = null; for (BizEquipmentStandardInfo standardInfo : standardInfoList) { - //测量标准装置及其配套设备一览表(西昌实验室) + //测量标准装置及其配套设备一览表(海口实验室) standardInfo.setCreateTime(DateUtil.format(DateUtil.parse(standardInfo.getCreateTime()), "yyyy.MM.dd")); standardInfo.setLastReviewDate(DateUtil.format(DateUtil.parse(standardInfo.getLastReviewDate()), "yyyy.MM.dd")); equipmentInfos = standardEquipmentRelationMapper.selectEquipmentAndTechnologyList(standardInfo.getId());