diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java index 6742cbc..ad4f1ea 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java @@ -30,7 +30,6 @@ import org.springframework.util.CollectionUtils; import java.util.*; -import java.util.stream.Collector; import java.util.stream.Collectors; /** @@ -104,14 +103,32 @@ public List doCreateOriginalFile(BizBusinessDeviceMeasureApproval measureItemInfo) { //作为分发点 try { - if(examineOriginalFile(measureItemInfo)){ + if (examineOriginalFile(measureItemInfo)) { log.debug("校验没有原始记录"); return null; } + List resultList = new ArrayList<>(); + //过滤不能生成证书的 if (CollectionUtil.isEmpty(measureItemInfo.getMeasureDataPistonGaugeList())) { List bizBusinessDeviceMeasureDataPistonGaugeList = new ArrayList<>(); bizBusinessDeviceMeasureDataPistonGaugeList.add(new BizBusinessDeviceMeasureDataPistonGauge()); measureItemInfo.setMeasureDataPistonGaugeList(bizBusinessDeviceMeasureDataPistonGaugeList); + resultList.add(new BizBusinessDeviceMeasureDataPistonGauge()); + } else { + resultList = measureItemInfo.getMeasureDataPistonGaugeList().stream() + .filter(e -> "2".equals(e.getDataCategory())) + .collect(Collectors.toList()); + if (CollectionUtil.isEmpty(measureItemInfo.getMeasureDataPistonGaugeList())) { + resultList.add(new BizBusinessDeviceMeasureDataPistonGauge()); + } + measureItemInfo.setMeasureDataPistonGaugeList(measureItemInfo.getMeasureDataPistonGaugeList().stream() + .filter(e -> !"2".equals(e.getDataCategory())) + .collect(Collectors.toList())); + if (CollectionUtil.isEmpty(measureItemInfo.getMeasureDataPistonGaugeList())) { + List bizBusinessDeviceMeasureDataPistonGaugeList = new ArrayList<>(); + bizBusinessDeviceMeasureDataPistonGaugeList.add(new BizBusinessDeviceMeasureDataPistonGauge()); + measureItemInfo.setMeasureDataPistonGaugeList(bizBusinessDeviceMeasureDataPistonGaugeList); + } } Map map = BeanUtil.beanToMap(measureItemInfo); List customTemplateUrls = new ArrayList<>(); @@ -126,6 +143,7 @@ equipmentList.add(new MeasureEquipmentInfoDTO()); } map.put("equipmentList", equipmentList); + map.put("resultList", resultList); //检定数据 measuredDataParam(map, measureItemInfo.getMeasureDataPistonGaugeList()); //这一块逻辑比较复杂 @@ -149,13 +167,29 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval measureItemInfo) { try { + List resultList = new ArrayList<>(); //过滤不能生成证书的 if (CollectionUtil.isEmpty(measureItemInfo.getMeasureDataPistonGaugeList())) { List bizBusinessDeviceMeasureDataPistonGaugeList = new ArrayList<>(); bizBusinessDeviceMeasureDataPistonGaugeList.add(new BizBusinessDeviceMeasureDataPistonGauge()); measureItemInfo.setMeasureDataPistonGaugeList(bizBusinessDeviceMeasureDataPistonGaugeList); + resultList.add(new BizBusinessDeviceMeasureDataPistonGauge()); + } else { + resultList = measureItemInfo.getMeasureDataPistonGaugeList().stream() + .filter(e -> "2".equals(e.getDataCategory())) + .collect(Collectors.toList()); + if (CollectionUtil.isEmpty(measureItemInfo.getMeasureDataPistonGaugeList())) { + resultList.add(new BizBusinessDeviceMeasureDataPistonGauge()); + } + measureItemInfo.setMeasureDataPistonGaugeList(measureItemInfo.getMeasureDataPistonGaugeList().stream() + .filter(e -> !"2".equals(e.getDataCategory())) + .collect(Collectors.toList())); + if (CollectionUtil.isEmpty(measureItemInfo.getMeasureDataPistonGaugeList())) { + List bizBusinessDeviceMeasureDataPistonGaugeList = new ArrayList<>(); + bizBusinessDeviceMeasureDataPistonGaugeList.add(new BizBusinessDeviceMeasureDataPistonGauge()); + measureItemInfo.setMeasureDataPistonGaugeList(bizBusinessDeviceMeasureDataPistonGaugeList); + } } - Map map = BeanUtil.beanToMap(measureItemInfo); //准备封面参数 prepareCoverParams(map, measureItemInfo.getLabCode()); @@ -167,6 +201,7 @@ equipmentList.add(new MeasureEquipmentInfoDTO()); } map.put("equipmentList", equipmentList); + map.put("resultList", resultList); List customTemplateUrls = new ArrayList<>(); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", measureItemInfo.getMeasureCategoryName())); @@ -256,13 +291,13 @@ e -> e.getParams().contains("电压") ).sorted((e1, e2) -> Integer.valueOf(e1.getCheckPoint()) - Integer.valueOf(e2.getCheckPoint())) .collect(Collectors.toList()); - populateCheckData(map, voltageList, "voltages", "maxs1", UNIT_V,"1"); + populateCheckData(map, voltageList, "voltages", "maxs1", UNIT_V, "1"); //直流电流 List electricityList = request.getCheckDataPistonGaugeList().stream().filter( e -> e.getParams().contains("电流") ).sorted((e1, e2) -> Integer.valueOf(e1.getCheckPoint()) - Integer.valueOf(e2.getCheckPoint())) .collect(Collectors.toList()); - populateCheckData(map, electricityList, "electricitys", "maxs2", UNIT_I,"2"); + populateCheckData(map, electricityList, "electricitys", "maxs2", UNIT_I, "2"); } /** @@ -271,7 +306,7 @@ * @param maximumKey */ private void populateCheckData(Map map, List dataPistonGaugeList, - String paramKey, String maximumKey, String unitParam,String index) { + String paramKey, String maximumKey, String unitParam, String index) { if (CollectionUtils.isEmpty(dataPistonGaugeList)) { return; } @@ -303,7 +338,7 @@ checkPointMapList.add(checkPointMap); } } - map.put("checkPoints"+index, checkPointMapList); + map.put("checkPoints" + index, checkPointMapList); } /**