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 8e994b3..70c3d4e 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 @@ -71,8 +71,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - prepareCoverParams(map, request.getLabCode()); - prepareCustomCoverParams(map); + readyForCoverParams(map,request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom : cesiumAtomList) { @@ -316,7 +315,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - prepareCoverParams(map, request.getLabCode()); + readyForCoverParams(map,request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); 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 8e994b3..70c3d4e 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 @@ -71,8 +71,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - prepareCoverParams(map, request.getLabCode()); - prepareCustomCoverParams(map); + readyForCoverParams(map,request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom : cesiumAtomList) { @@ -316,7 +315,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - prepareCoverParams(map, request.getLabCode()); + readyForCoverParams(map,request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java index 6d0825a..4e03e75 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java @@ -247,6 +247,10 @@ if (ObjectUtil.isEmpty(request)) { return null; } + if (examineOriginalFile(request)) { + log.debug("校验没有原始记录"); + return null; + } if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { List list = Collections.emptyList(); request.setMeasureDataDcPowerList(list); @@ -254,7 +258,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - prepareCustomCoverParams(map, request.getMeasureDataElectricalSafetyList()); + readyForCoverParams(map,request.getLabCode()); List dcPowerList = request.getMeasureDataDcPowerList(); List powerList = new ArrayList<>(); @@ -393,6 +397,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); + readyForCoverParams(map,request.getLabCode()); List dcPowerList = request.getMeasureDataDcPowerList(); List powerList = new ArrayList<>(); 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 8e994b3..70c3d4e 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 @@ -71,8 +71,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - prepareCoverParams(map, request.getLabCode()); - prepareCustomCoverParams(map); + readyForCoverParams(map,request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom : cesiumAtomList) { @@ -316,7 +315,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - prepareCoverParams(map, request.getLabCode()); + readyForCoverParams(map,request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java index 6d0825a..4e03e75 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java @@ -247,6 +247,10 @@ if (ObjectUtil.isEmpty(request)) { return null; } + if (examineOriginalFile(request)) { + log.debug("校验没有原始记录"); + return null; + } if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { List list = Collections.emptyList(); request.setMeasureDataDcPowerList(list); @@ -254,7 +258,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - prepareCustomCoverParams(map, request.getMeasureDataElectricalSafetyList()); + readyForCoverParams(map,request.getLabCode()); List dcPowerList = request.getMeasureDataDcPowerList(); List powerList = new ArrayList<>(); @@ -393,6 +397,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); + readyForCoverParams(map,request.getLabCode()); List dcPowerList = request.getMeasureDataDcPowerList(); List powerList = new ArrayList<>(); 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 747f1bf..36e322e 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 @@ -274,6 +274,10 @@ if (ObjectUtil.isEmpty(request)) { return null; } + if (examineOriginalFile(request)) { + log.debug("校验没有原始记录"); + return null; + } if (CollectionUtils.isEmpty(request.getMeasureDataETwoList())) { List list = new ArrayList<>(); list.add(new BizBusinessDeviceMeasureDataETwo()); @@ -282,6 +286,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); + readyForCoverParams(map,request.getLabCode()); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); if (CollectionUtils.isEmpty(equipmentList)) { @@ -508,7 +513,7 @@ prepareCertificateParams(map, request.getMeasureDataETwoList()); // prepareParams(map, request.getMeasureDataETwoList()); - prepareCoverParams(map, request.getLabCode()); + 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/CesiumAtomHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/CesiumAtomHandler.java index 8e994b3..70c3d4e 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 @@ -71,8 +71,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - prepareCoverParams(map, request.getLabCode()); - prepareCustomCoverParams(map); + readyForCoverParams(map,request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom : cesiumAtomList) { @@ -316,7 +315,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - prepareCoverParams(map, request.getLabCode()); + readyForCoverParams(map,request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java index 6d0825a..4e03e75 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java @@ -247,6 +247,10 @@ if (ObjectUtil.isEmpty(request)) { return null; } + if (examineOriginalFile(request)) { + log.debug("校验没有原始记录"); + return null; + } if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { List list = Collections.emptyList(); request.setMeasureDataDcPowerList(list); @@ -254,7 +258,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - prepareCustomCoverParams(map, request.getMeasureDataElectricalSafetyList()); + readyForCoverParams(map,request.getLabCode()); List dcPowerList = request.getMeasureDataDcPowerList(); List powerList = new ArrayList<>(); @@ -393,6 +397,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); + readyForCoverParams(map,request.getLabCode()); List dcPowerList = request.getMeasureDataDcPowerList(); List powerList = new ArrayList<>(); 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 747f1bf..36e322e 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 @@ -274,6 +274,10 @@ if (ObjectUtil.isEmpty(request)) { return null; } + if (examineOriginalFile(request)) { + log.debug("校验没有原始记录"); + return null; + } if (CollectionUtils.isEmpty(request.getMeasureDataETwoList())) { List list = new ArrayList<>(); list.add(new BizBusinessDeviceMeasureDataETwo()); @@ -282,6 +286,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); + readyForCoverParams(map,request.getLabCode()); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); if (CollectionUtils.isEmpty(equipmentList)) { @@ -508,7 +513,7 @@ prepareCertificateParams(map, request.getMeasureDataETwoList()); // prepareParams(map, request.getMeasureDataETwoList()); - prepareCoverParams(map, request.getLabCode()); + 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/OscilloScopeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java index f8e4f04..bf72fba 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 @@ -141,6 +141,10 @@ log.debug("校验没有原始记录"); return null; } + if (examineOriginalFile(request)) { + log.debug("校验没有原始记录"); + return null; + } if (CollectionUtils.isEmpty(request.getMeasureDataSpectrumAnalyzerList())) { List list = new ArrayList<>(); list.add(new BizBusinessDeviceMeasureDataSpectrumAnalyzer()); @@ -149,6 +153,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); + readyForCoverParams(map,request.getLabCode()); switch (request.getItemCategoryName()) { case DIGITAL_OSCILLOSCOPE: @@ -397,6 +402,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); + readyForCoverParams(map,request.getLabCode()); switch (request.getItemCategoryName()) { case DIGITAL_OSCILLOSCOPE: 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 8e994b3..70c3d4e 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 @@ -71,8 +71,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - prepareCoverParams(map, request.getLabCode()); - prepareCustomCoverParams(map); + readyForCoverParams(map,request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom : cesiumAtomList) { @@ -316,7 +315,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - prepareCoverParams(map, request.getLabCode()); + readyForCoverParams(map,request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java index 6d0825a..4e03e75 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java @@ -247,6 +247,10 @@ if (ObjectUtil.isEmpty(request)) { return null; } + if (examineOriginalFile(request)) { + log.debug("校验没有原始记录"); + return null; + } if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { List list = Collections.emptyList(); request.setMeasureDataDcPowerList(list); @@ -254,7 +258,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - prepareCustomCoverParams(map, request.getMeasureDataElectricalSafetyList()); + readyForCoverParams(map,request.getLabCode()); List dcPowerList = request.getMeasureDataDcPowerList(); List powerList = new ArrayList<>(); @@ -393,6 +397,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); + readyForCoverParams(map,request.getLabCode()); List dcPowerList = request.getMeasureDataDcPowerList(); List powerList = new ArrayList<>(); 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 747f1bf..36e322e 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 @@ -274,6 +274,10 @@ if (ObjectUtil.isEmpty(request)) { return null; } + if (examineOriginalFile(request)) { + log.debug("校验没有原始记录"); + return null; + } if (CollectionUtils.isEmpty(request.getMeasureDataETwoList())) { List list = new ArrayList<>(); list.add(new BizBusinessDeviceMeasureDataETwo()); @@ -282,6 +286,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); + readyForCoverParams(map,request.getLabCode()); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); if (CollectionUtils.isEmpty(equipmentList)) { @@ -508,7 +513,7 @@ prepareCertificateParams(map, request.getMeasureDataETwoList()); // prepareParams(map, request.getMeasureDataETwoList()); - prepareCoverParams(map, request.getLabCode()); + 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/OscilloScopeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java index f8e4f04..bf72fba 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 @@ -141,6 +141,10 @@ log.debug("校验没有原始记录"); return null; } + if (examineOriginalFile(request)) { + log.debug("校验没有原始记录"); + return null; + } if (CollectionUtils.isEmpty(request.getMeasureDataSpectrumAnalyzerList())) { List list = new ArrayList<>(); list.add(new BizBusinessDeviceMeasureDataSpectrumAnalyzer()); @@ -149,6 +153,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); + readyForCoverParams(map,request.getLabCode()); switch (request.getItemCategoryName()) { case DIGITAL_OSCILLOSCOPE: @@ -397,6 +402,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); + readyForCoverParams(map,request.getLabCode()); switch (request.getItemCategoryName()) { case DIGITAL_OSCILLOSCOPE: 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 f39e377..4afd900 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 @@ -182,6 +182,10 @@ if (ObjectUtil.isEmpty(request)) { return null; } + if (examineOriginalFile(request)) { + log.debug("校验没有原始记录"); + return null; + } if (CollectionUtils.isEmpty(request.getMeasureDataResistanceThermometerList())) { List list = Collections.emptyList(); request.setMeasureDataResistanceThermometerList(list); @@ -196,7 +200,7 @@ } map.put("equipmentList", equipmentList); - prepareCustomCoverParams(map, request.getMeasureDataResistanceThermometerList()); + readyForCoverParams(map,request.getLabCode()); List resistanceThermometerList = request.getMeasureDataResistanceThermometerList(); @@ -473,7 +477,7 @@ } map.put("equipmentList", equipmentList); - prepareCustomCoverParams(map, request.getMeasureDataResistanceThermometerList()); + readyForCoverParams(map,request.getLabCode()); List thermometerList = request.getMeasureDataResistanceThermometerList(); switch (request.getItemCategoryName()) { 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 8e994b3..70c3d4e 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 @@ -71,8 +71,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - prepareCoverParams(map, request.getLabCode()); - prepareCustomCoverParams(map); + readyForCoverParams(map,request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom : cesiumAtomList) { @@ -316,7 +315,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - prepareCoverParams(map, request.getLabCode()); + readyForCoverParams(map,request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java index 6d0825a..4e03e75 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java @@ -247,6 +247,10 @@ if (ObjectUtil.isEmpty(request)) { return null; } + if (examineOriginalFile(request)) { + log.debug("校验没有原始记录"); + return null; + } if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { List list = Collections.emptyList(); request.setMeasureDataDcPowerList(list); @@ -254,7 +258,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - prepareCustomCoverParams(map, request.getMeasureDataElectricalSafetyList()); + readyForCoverParams(map,request.getLabCode()); List dcPowerList = request.getMeasureDataDcPowerList(); List powerList = new ArrayList<>(); @@ -393,6 +397,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); + readyForCoverParams(map,request.getLabCode()); List dcPowerList = request.getMeasureDataDcPowerList(); List powerList = new ArrayList<>(); 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 747f1bf..36e322e 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 @@ -274,6 +274,10 @@ if (ObjectUtil.isEmpty(request)) { return null; } + if (examineOriginalFile(request)) { + log.debug("校验没有原始记录"); + return null; + } if (CollectionUtils.isEmpty(request.getMeasureDataETwoList())) { List list = new ArrayList<>(); list.add(new BizBusinessDeviceMeasureDataETwo()); @@ -282,6 +286,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); + readyForCoverParams(map,request.getLabCode()); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); if (CollectionUtils.isEmpty(equipmentList)) { @@ -508,7 +513,7 @@ prepareCertificateParams(map, request.getMeasureDataETwoList()); // prepareParams(map, request.getMeasureDataETwoList()); - prepareCoverParams(map, request.getLabCode()); + 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/OscilloScopeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java index f8e4f04..bf72fba 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 @@ -141,6 +141,10 @@ log.debug("校验没有原始记录"); return null; } + if (examineOriginalFile(request)) { + log.debug("校验没有原始记录"); + return null; + } if (CollectionUtils.isEmpty(request.getMeasureDataSpectrumAnalyzerList())) { List list = new ArrayList<>(); list.add(new BizBusinessDeviceMeasureDataSpectrumAnalyzer()); @@ -149,6 +153,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); + readyForCoverParams(map,request.getLabCode()); switch (request.getItemCategoryName()) { case DIGITAL_OSCILLOSCOPE: @@ -397,6 +402,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); + readyForCoverParams(map,request.getLabCode()); switch (request.getItemCategoryName()) { case DIGITAL_OSCILLOSCOPE: 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 f39e377..4afd900 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 @@ -182,6 +182,10 @@ if (ObjectUtil.isEmpty(request)) { return null; } + if (examineOriginalFile(request)) { + log.debug("校验没有原始记录"); + return null; + } if (CollectionUtils.isEmpty(request.getMeasureDataResistanceThermometerList())) { List list = Collections.emptyList(); request.setMeasureDataResistanceThermometerList(list); @@ -196,7 +200,7 @@ } map.put("equipmentList", equipmentList); - prepareCustomCoverParams(map, request.getMeasureDataResistanceThermometerList()); + readyForCoverParams(map,request.getLabCode()); List resistanceThermometerList = request.getMeasureDataResistanceThermometerList(); @@ -473,7 +477,7 @@ } map.put("equipmentList", equipmentList); - prepareCustomCoverParams(map, request.getMeasureDataResistanceThermometerList()); + readyForCoverParams(map,request.getLabCode()); List thermometerList = request.getMeasureDataResistanceThermometerList(); switch (request.getItemCategoryName()) { 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 ef9c629..04f5876 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,6 +62,7 @@ } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); + readyForCoverParams(map,request.getLabCode()); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); map.put("equipmentList", equipmentList); @@ -128,6 +129,7 @@ } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); + readyForCoverParams(map,request.getLabCode()); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); map.put("equipmentList", equipmentList); 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 8e994b3..70c3d4e 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 @@ -71,8 +71,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - prepareCoverParams(map, request.getLabCode()); - prepareCustomCoverParams(map); + readyForCoverParams(map,request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom : cesiumAtomList) { @@ -316,7 +315,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - prepareCoverParams(map, request.getLabCode()); + readyForCoverParams(map,request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java index 6d0825a..4e03e75 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java @@ -247,6 +247,10 @@ if (ObjectUtil.isEmpty(request)) { return null; } + if (examineOriginalFile(request)) { + log.debug("校验没有原始记录"); + return null; + } if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { List list = Collections.emptyList(); request.setMeasureDataDcPowerList(list); @@ -254,7 +258,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - prepareCustomCoverParams(map, request.getMeasureDataElectricalSafetyList()); + readyForCoverParams(map,request.getLabCode()); List dcPowerList = request.getMeasureDataDcPowerList(); List powerList = new ArrayList<>(); @@ -393,6 +397,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); + readyForCoverParams(map,request.getLabCode()); List dcPowerList = request.getMeasureDataDcPowerList(); List powerList = new ArrayList<>(); 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 747f1bf..36e322e 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 @@ -274,6 +274,10 @@ if (ObjectUtil.isEmpty(request)) { return null; } + if (examineOriginalFile(request)) { + log.debug("校验没有原始记录"); + return null; + } if (CollectionUtils.isEmpty(request.getMeasureDataETwoList())) { List list = new ArrayList<>(); list.add(new BizBusinessDeviceMeasureDataETwo()); @@ -282,6 +286,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); + readyForCoverParams(map,request.getLabCode()); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); if (CollectionUtils.isEmpty(equipmentList)) { @@ -508,7 +513,7 @@ prepareCertificateParams(map, request.getMeasureDataETwoList()); // prepareParams(map, request.getMeasureDataETwoList()); - prepareCoverParams(map, request.getLabCode()); + 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/OscilloScopeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/OscilloScopeHandler.java index f8e4f04..bf72fba 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 @@ -141,6 +141,10 @@ log.debug("校验没有原始记录"); return null; } + if (examineOriginalFile(request)) { + log.debug("校验没有原始记录"); + return null; + } if (CollectionUtils.isEmpty(request.getMeasureDataSpectrumAnalyzerList())) { List list = new ArrayList<>(); list.add(new BizBusinessDeviceMeasureDataSpectrumAnalyzer()); @@ -149,6 +153,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); + readyForCoverParams(map,request.getLabCode()); switch (request.getItemCategoryName()) { case DIGITAL_OSCILLOSCOPE: @@ -397,6 +402,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); + readyForCoverParams(map,request.getLabCode()); switch (request.getItemCategoryName()) { case DIGITAL_OSCILLOSCOPE: 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 f39e377..4afd900 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 @@ -182,6 +182,10 @@ if (ObjectUtil.isEmpty(request)) { return null; } + if (examineOriginalFile(request)) { + log.debug("校验没有原始记录"); + return null; + } if (CollectionUtils.isEmpty(request.getMeasureDataResistanceThermometerList())) { List list = Collections.emptyList(); request.setMeasureDataResistanceThermometerList(list); @@ -196,7 +200,7 @@ } map.put("equipmentList", equipmentList); - prepareCustomCoverParams(map, request.getMeasureDataResistanceThermometerList()); + readyForCoverParams(map,request.getLabCode()); List resistanceThermometerList = request.getMeasureDataResistanceThermometerList(); @@ -473,7 +477,7 @@ } map.put("equipmentList", equipmentList); - prepareCustomCoverParams(map, request.getMeasureDataResistanceThermometerList()); + readyForCoverParams(map,request.getLabCode()); List thermometerList = request.getMeasureDataResistanceThermometerList(); switch (request.getItemCategoryName()) { 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 ef9c629..04f5876 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,6 +62,7 @@ } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); + readyForCoverParams(map,request.getLabCode()); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); map.put("equipmentList", equipmentList); @@ -128,6 +129,7 @@ } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); + readyForCoverParams(map,request.getLabCode()); List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); map.put("equipmentList", equipmentList); 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 889a2f9..d572f9c 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 @@ -278,6 +278,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); + readyForCoverParams(map,request.getLabCode()); //准备填充参数 @@ -556,7 +557,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - prepareCoverParams(map, request.getLabCode()); + readyForCoverParams(map,request.getLabCode()); String jsonList = JSONArray.toJSONString(request.getMeasureDataSpectrumAnalyzerList()); List list1 = JSONArray.parseArray(jsonList, BizBusinessDeviceMeasureDataSpectrumAnalyzer.class); readyForCertificateFillParams(map, list1);