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 a126a9e..cc3e25c 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 @@ -201,6 +201,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(request.getItemCategoryName(), "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -385,8 +388,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom : cesiumAtomList) { @@ -414,7 +416,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(CESIUM_ATOMIC_FREQUENCY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -423,6 +426,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 a126a9e..cc3e25c 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 @@ -201,6 +201,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(request.getItemCategoryName(), "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -385,8 +388,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom : cesiumAtomList) { @@ -414,7 +416,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(CESIUM_ATOMIC_FREQUENCY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -423,6 +426,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 93477f8..fe41d80 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 @@ -280,6 +280,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(DC_POWER_SUPPLY, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -345,21 +348,14 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { List list = new ArrayList<>(); list.add(new BizBusinessDeviceMeasureDataDcPower()); request.setMeasureDataDcPowerList(list); } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map,request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List dcPowerList = request.getMeasureDataDcPowerList(); List powerList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataDcPower measureDataDcPower : dcPowerList) { @@ -373,7 +369,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(DC_POWER_SUPPLY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -382,6 +379,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 a126a9e..cc3e25c 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 @@ -201,6 +201,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(request.getItemCategoryName(), "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -385,8 +388,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom : cesiumAtomList) { @@ -414,7 +416,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(CESIUM_ATOMIC_FREQUENCY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -423,6 +426,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 93477f8..fe41d80 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 @@ -280,6 +280,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(DC_POWER_SUPPLY, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -345,21 +348,14 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { List list = new ArrayList<>(); list.add(new BizBusinessDeviceMeasureDataDcPower()); request.setMeasureDataDcPowerList(list); } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map,request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List dcPowerList = request.getMeasureDataDcPowerList(); List powerList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataDcPower measureDataDcPower : dcPowerList) { @@ -373,7 +369,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(DC_POWER_SUPPLY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -382,6 +379,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 375c6b6..08fc352 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 @@ -4,22 +4,23 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.PrintFileModuleNameEnum; +import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureEquipmentMapper; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; import com.casic.missiles.mapper.equipment.BizEquipmentTechnicalTargetMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataDcPower; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataETwo; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.service.listeners.register.PrintFileRegister; -import com.casic.missiles.utils.DictCodeUtils; - -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataETwo; +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataETwo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; +import com.casic.missiles.model.equipment.BizEquipmentTechnicalTarget; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentSupport; +import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.SnowflakeUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -27,7 +28,10 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -273,7 +277,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); - map.put("appearance","1".equals(request.getAppearance()) ? "合格" : "不合格"); + map.put("appearance", "1".equals(request.getAppearance()) ? "合格" : "不合格"); //准备填充参数 prepareParams(map, request.getMeasureDataETwoList()); readyForCoverParams(map, request.getLabCode()); @@ -289,6 +293,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(ETWO_WEIGHT, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -471,15 +478,15 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); - map.put("appearance","1".equals(request.getAppearance()) ? "合格" : "不合格"); + map.put("appearance", "1".equals(request.getAppearance()) ? "合格" : "不合格"); + String customUrl = readyForCoverParams(map, request.getLabCode()); mapReplace(map); - prepareCertificateParams(map, request.getMeasureDataETwoList()); - readyForCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(ETWO_WEIGHT, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -488,6 +495,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(ETWO_WEIGHT, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 a126a9e..cc3e25c 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 @@ -201,6 +201,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(request.getItemCategoryName(), "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -385,8 +388,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom : cesiumAtomList) { @@ -414,7 +416,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(CESIUM_ATOMIC_FREQUENCY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -423,6 +426,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 93477f8..fe41d80 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 @@ -280,6 +280,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(DC_POWER_SUPPLY, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -345,21 +348,14 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { List list = new ArrayList<>(); list.add(new BizBusinessDeviceMeasureDataDcPower()); request.setMeasureDataDcPowerList(list); } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map,request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List dcPowerList = request.getMeasureDataDcPowerList(); List powerList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataDcPower measureDataDcPower : dcPowerList) { @@ -373,7 +369,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(DC_POWER_SUPPLY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -382,6 +379,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 375c6b6..08fc352 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 @@ -4,22 +4,23 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.PrintFileModuleNameEnum; +import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureEquipmentMapper; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; import com.casic.missiles.mapper.equipment.BizEquipmentTechnicalTargetMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataDcPower; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataETwo; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.service.listeners.register.PrintFileRegister; -import com.casic.missiles.utils.DictCodeUtils; - -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataETwo; +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataETwo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; +import com.casic.missiles.model.equipment.BizEquipmentTechnicalTarget; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentSupport; +import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.SnowflakeUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -27,7 +28,10 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -273,7 +277,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); - map.put("appearance","1".equals(request.getAppearance()) ? "合格" : "不合格"); + map.put("appearance", "1".equals(request.getAppearance()) ? "合格" : "不合格"); //准备填充参数 prepareParams(map, request.getMeasureDataETwoList()); readyForCoverParams(map, request.getLabCode()); @@ -289,6 +293,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(ETWO_WEIGHT, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -471,15 +478,15 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); - map.put("appearance","1".equals(request.getAppearance()) ? "合格" : "不合格"); + map.put("appearance", "1".equals(request.getAppearance()) ? "合格" : "不合格"); + String customUrl = readyForCoverParams(map, request.getLabCode()); mapReplace(map); - prepareCertificateParams(map, request.getMeasureDataETwoList()); - readyForCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(ETWO_WEIGHT, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -488,6 +495,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(ETWO_WEIGHT, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 1d4794d..9b0b134 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 @@ -150,6 +150,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -193,7 +196,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowFrequencySignal lowFrequencySignal : request.getMeasureDataLowFrequencySignalList()) { BizBusinessDeviceMeasureDataLowFrequencySignal signal = (BizBusinessDeviceMeasureDataLowFrequencySignal) BeanUtils.cloneBean(lowFrequencySignal); @@ -205,7 +208,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_FREQUENCY_SIGNAL_SOURCE, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -214,6 +218,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 a126a9e..cc3e25c 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 @@ -201,6 +201,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(request.getItemCategoryName(), "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -385,8 +388,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom : cesiumAtomList) { @@ -414,7 +416,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(CESIUM_ATOMIC_FREQUENCY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -423,6 +426,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 93477f8..fe41d80 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 @@ -280,6 +280,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(DC_POWER_SUPPLY, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -345,21 +348,14 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { List list = new ArrayList<>(); list.add(new BizBusinessDeviceMeasureDataDcPower()); request.setMeasureDataDcPowerList(list); } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map,request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List dcPowerList = request.getMeasureDataDcPowerList(); List powerList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataDcPower measureDataDcPower : dcPowerList) { @@ -373,7 +369,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(DC_POWER_SUPPLY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -382,6 +379,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 375c6b6..08fc352 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 @@ -4,22 +4,23 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.PrintFileModuleNameEnum; +import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureEquipmentMapper; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; import com.casic.missiles.mapper.equipment.BizEquipmentTechnicalTargetMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataDcPower; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataETwo; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.service.listeners.register.PrintFileRegister; -import com.casic.missiles.utils.DictCodeUtils; - -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataETwo; +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataETwo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; +import com.casic.missiles.model.equipment.BizEquipmentTechnicalTarget; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentSupport; +import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.SnowflakeUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -27,7 +28,10 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -273,7 +277,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); - map.put("appearance","1".equals(request.getAppearance()) ? "合格" : "不合格"); + map.put("appearance", "1".equals(request.getAppearance()) ? "合格" : "不合格"); //准备填充参数 prepareParams(map, request.getMeasureDataETwoList()); readyForCoverParams(map, request.getLabCode()); @@ -289,6 +293,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(ETWO_WEIGHT, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -471,15 +478,15 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); - map.put("appearance","1".equals(request.getAppearance()) ? "合格" : "不合格"); + map.put("appearance", "1".equals(request.getAppearance()) ? "合格" : "不合格"); + String customUrl = readyForCoverParams(map, request.getLabCode()); mapReplace(map); - prepareCertificateParams(map, request.getMeasureDataETwoList()); - readyForCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(ETWO_WEIGHT, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -488,6 +495,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(ETWO_WEIGHT, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 1d4794d..9b0b134 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 @@ -150,6 +150,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -193,7 +196,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowFrequencySignal lowFrequencySignal : request.getMeasureDataLowFrequencySignalList()) { BizBusinessDeviceMeasureDataLowFrequencySignal signal = (BizBusinessDeviceMeasureDataLowFrequencySignal) BeanUtils.cloneBean(lowFrequencySignal); @@ -205,7 +208,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_FREQUENCY_SIGNAL_SOURCE, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -214,6 +218,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java index 556f01b..f1ae409 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java @@ -117,20 +117,16 @@ log.debug("校验没有原始记录"); return null; } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowPower lowPower : request.getMeasureDataLowPowerList()) { BizBusinessDeviceMeasureDataLowPower power = (BizBusinessDeviceMeasureDataLowPower) BeanUtils.cloneBean(lowPower); power.applyStrategyBasedOnDataType(); list.add(power); } - map.put("powerList", list); - replaceSlash(map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_POWER, "1", request.getItemCategoryName())); @@ -143,6 +139,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(LOW_POWER, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -164,22 +163,20 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowPower lowPower : request.getMeasureDataLowPowerList()) { BizBusinessDeviceMeasureDataLowPower power = (BizBusinessDeviceMeasureDataLowPower) BeanUtils.cloneBean(lowPower); power.applyStrategyBasedOnDataType(); list.add(power); } - map.put("powerList", list); - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_POWER, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -188,6 +185,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(LOW_POWER, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 a126a9e..cc3e25c 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 @@ -201,6 +201,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(request.getItemCategoryName(), "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -385,8 +388,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom : cesiumAtomList) { @@ -414,7 +416,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(CESIUM_ATOMIC_FREQUENCY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -423,6 +426,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 93477f8..fe41d80 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 @@ -280,6 +280,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(DC_POWER_SUPPLY, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -345,21 +348,14 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { List list = new ArrayList<>(); list.add(new BizBusinessDeviceMeasureDataDcPower()); request.setMeasureDataDcPowerList(list); } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map,request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List dcPowerList = request.getMeasureDataDcPowerList(); List powerList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataDcPower measureDataDcPower : dcPowerList) { @@ -373,7 +369,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(DC_POWER_SUPPLY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -382,6 +379,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 375c6b6..08fc352 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 @@ -4,22 +4,23 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.PrintFileModuleNameEnum; +import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureEquipmentMapper; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; import com.casic.missiles.mapper.equipment.BizEquipmentTechnicalTargetMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataDcPower; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataETwo; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.service.listeners.register.PrintFileRegister; -import com.casic.missiles.utils.DictCodeUtils; - -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataETwo; +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataETwo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; +import com.casic.missiles.model.equipment.BizEquipmentTechnicalTarget; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentSupport; +import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.SnowflakeUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -27,7 +28,10 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -273,7 +277,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); - map.put("appearance","1".equals(request.getAppearance()) ? "合格" : "不合格"); + map.put("appearance", "1".equals(request.getAppearance()) ? "合格" : "不合格"); //准备填充参数 prepareParams(map, request.getMeasureDataETwoList()); readyForCoverParams(map, request.getLabCode()); @@ -289,6 +293,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(ETWO_WEIGHT, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -471,15 +478,15 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); - map.put("appearance","1".equals(request.getAppearance()) ? "合格" : "不合格"); + map.put("appearance", "1".equals(request.getAppearance()) ? "合格" : "不合格"); + String customUrl = readyForCoverParams(map, request.getLabCode()); mapReplace(map); - prepareCertificateParams(map, request.getMeasureDataETwoList()); - readyForCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(ETWO_WEIGHT, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -488,6 +495,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(ETWO_WEIGHT, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 1d4794d..9b0b134 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 @@ -150,6 +150,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -193,7 +196,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowFrequencySignal lowFrequencySignal : request.getMeasureDataLowFrequencySignalList()) { BizBusinessDeviceMeasureDataLowFrequencySignal signal = (BizBusinessDeviceMeasureDataLowFrequencySignal) BeanUtils.cloneBean(lowFrequencySignal); @@ -205,7 +208,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_FREQUENCY_SIGNAL_SOURCE, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -214,6 +218,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java index 556f01b..f1ae409 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java @@ -117,20 +117,16 @@ log.debug("校验没有原始记录"); return null; } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowPower lowPower : request.getMeasureDataLowPowerList()) { BizBusinessDeviceMeasureDataLowPower power = (BizBusinessDeviceMeasureDataLowPower) BeanUtils.cloneBean(lowPower); power.applyStrategyBasedOnDataType(); list.add(power); } - map.put("powerList", list); - replaceSlash(map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_POWER, "1", request.getItemCategoryName())); @@ -143,6 +139,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(LOW_POWER, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -164,22 +163,20 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowPower lowPower : request.getMeasureDataLowPowerList()) { BizBusinessDeviceMeasureDataLowPower power = (BizBusinessDeviceMeasureDataLowPower) BeanUtils.cloneBean(lowPower); power.applyStrategyBasedOnDataType(); list.add(power); } - map.put("powerList", list); - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_POWER, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -188,6 +185,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(LOW_POWER, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java index 0da809e..77c877c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java @@ -142,9 +142,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - readyForMicrowaveParams(map, request.getMeasureDataMicrowaveAttenuationList()); - replaceSlash(map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MICROWAVE_ATTENUATION, "1", request.getItemCategoryName())); @@ -157,6 +155,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(MICROWAVE_ATTENUATION, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -196,13 +197,14 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); readyForMicrowaveParams(map, request.getMeasureDataMicrowaveAttenuationList()); replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MICROWAVE_ATTENUATION, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -211,6 +213,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(MICROWAVE_ATTENUATION, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 a126a9e..cc3e25c 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 @@ -201,6 +201,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(request.getItemCategoryName(), "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -385,8 +388,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom : cesiumAtomList) { @@ -414,7 +416,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(CESIUM_ATOMIC_FREQUENCY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -423,6 +426,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 93477f8..fe41d80 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 @@ -280,6 +280,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(DC_POWER_SUPPLY, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -345,21 +348,14 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { List list = new ArrayList<>(); list.add(new BizBusinessDeviceMeasureDataDcPower()); request.setMeasureDataDcPowerList(list); } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map,request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List dcPowerList = request.getMeasureDataDcPowerList(); List powerList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataDcPower measureDataDcPower : dcPowerList) { @@ -373,7 +369,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(DC_POWER_SUPPLY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -382,6 +379,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 375c6b6..08fc352 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 @@ -4,22 +4,23 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.PrintFileModuleNameEnum; +import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureEquipmentMapper; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; import com.casic.missiles.mapper.equipment.BizEquipmentTechnicalTargetMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataDcPower; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataETwo; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.service.listeners.register.PrintFileRegister; -import com.casic.missiles.utils.DictCodeUtils; - -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataETwo; +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataETwo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; +import com.casic.missiles.model.equipment.BizEquipmentTechnicalTarget; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentSupport; +import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.SnowflakeUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -27,7 +28,10 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -273,7 +277,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); - map.put("appearance","1".equals(request.getAppearance()) ? "合格" : "不合格"); + map.put("appearance", "1".equals(request.getAppearance()) ? "合格" : "不合格"); //准备填充参数 prepareParams(map, request.getMeasureDataETwoList()); readyForCoverParams(map, request.getLabCode()); @@ -289,6 +293,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(ETWO_WEIGHT, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -471,15 +478,15 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); - map.put("appearance","1".equals(request.getAppearance()) ? "合格" : "不合格"); + map.put("appearance", "1".equals(request.getAppearance()) ? "合格" : "不合格"); + String customUrl = readyForCoverParams(map, request.getLabCode()); mapReplace(map); - prepareCertificateParams(map, request.getMeasureDataETwoList()); - readyForCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(ETWO_WEIGHT, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -488,6 +495,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(ETWO_WEIGHT, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 1d4794d..9b0b134 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 @@ -150,6 +150,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -193,7 +196,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowFrequencySignal lowFrequencySignal : request.getMeasureDataLowFrequencySignalList()) { BizBusinessDeviceMeasureDataLowFrequencySignal signal = (BizBusinessDeviceMeasureDataLowFrequencySignal) BeanUtils.cloneBean(lowFrequencySignal); @@ -205,7 +208,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_FREQUENCY_SIGNAL_SOURCE, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -214,6 +218,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java index 556f01b..f1ae409 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java @@ -117,20 +117,16 @@ log.debug("校验没有原始记录"); return null; } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowPower lowPower : request.getMeasureDataLowPowerList()) { BizBusinessDeviceMeasureDataLowPower power = (BizBusinessDeviceMeasureDataLowPower) BeanUtils.cloneBean(lowPower); power.applyStrategyBasedOnDataType(); list.add(power); } - map.put("powerList", list); - replaceSlash(map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_POWER, "1", request.getItemCategoryName())); @@ -143,6 +139,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(LOW_POWER, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -164,22 +163,20 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowPower lowPower : request.getMeasureDataLowPowerList()) { BizBusinessDeviceMeasureDataLowPower power = (BizBusinessDeviceMeasureDataLowPower) BeanUtils.cloneBean(lowPower); power.applyStrategyBasedOnDataType(); list.add(power); } - map.put("powerList", list); - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_POWER, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -188,6 +185,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(LOW_POWER, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java index 0da809e..77c877c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java @@ -142,9 +142,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - readyForMicrowaveParams(map, request.getMeasureDataMicrowaveAttenuationList()); - replaceSlash(map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MICROWAVE_ATTENUATION, "1", request.getItemCategoryName())); @@ -157,6 +155,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(MICROWAVE_ATTENUATION, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -196,13 +197,14 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); readyForMicrowaveParams(map, request.getMeasureDataMicrowaveAttenuationList()); replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MICROWAVE_ATTENUATION, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -211,6 +213,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(MICROWAVE_ATTENUATION, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java index a9d9c02..4eb6cbe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java @@ -192,10 +192,8 @@ List list = Collections.emptyList(); request.setMeasureDataElectricalSafetyList(list); } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); List electricalSafetyList = request.getMeasureDataElectricalSafetyList(); List safetyList = new ArrayList<>(); @@ -227,6 +225,9 @@ .build()); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -254,7 +255,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List electricalSafetyList = request.getMeasureDataElectricalSafetyList(); List safetyList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataElectricalSafety electricalSafety : electricalSafetyList) { @@ -271,7 +272,8 @@ BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MULTI_ELECTRICAL_SAFETY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -287,6 +289,9 @@ .pdf(false) .customTemplateUrls(customTemplateUrls) .build()); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 a126a9e..cc3e25c 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 @@ -201,6 +201,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(request.getItemCategoryName(), "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -385,8 +388,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom : cesiumAtomList) { @@ -414,7 +416,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(CESIUM_ATOMIC_FREQUENCY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -423,6 +426,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 93477f8..fe41d80 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 @@ -280,6 +280,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(DC_POWER_SUPPLY, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -345,21 +348,14 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { List list = new ArrayList<>(); list.add(new BizBusinessDeviceMeasureDataDcPower()); request.setMeasureDataDcPowerList(list); } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map,request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List dcPowerList = request.getMeasureDataDcPowerList(); List powerList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataDcPower measureDataDcPower : dcPowerList) { @@ -373,7 +369,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(DC_POWER_SUPPLY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -382,6 +379,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 375c6b6..08fc352 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 @@ -4,22 +4,23 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.PrintFileModuleNameEnum; +import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureEquipmentMapper; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; import com.casic.missiles.mapper.equipment.BizEquipmentTechnicalTargetMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataDcPower; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataETwo; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.service.listeners.register.PrintFileRegister; -import com.casic.missiles.utils.DictCodeUtils; - -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataETwo; +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataETwo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; +import com.casic.missiles.model.equipment.BizEquipmentTechnicalTarget; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentSupport; +import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.SnowflakeUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -27,7 +28,10 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -273,7 +277,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); - map.put("appearance","1".equals(request.getAppearance()) ? "合格" : "不合格"); + map.put("appearance", "1".equals(request.getAppearance()) ? "合格" : "不合格"); //准备填充参数 prepareParams(map, request.getMeasureDataETwoList()); readyForCoverParams(map, request.getLabCode()); @@ -289,6 +293,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(ETWO_WEIGHT, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -471,15 +478,15 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); - map.put("appearance","1".equals(request.getAppearance()) ? "合格" : "不合格"); + map.put("appearance", "1".equals(request.getAppearance()) ? "合格" : "不合格"); + String customUrl = readyForCoverParams(map, request.getLabCode()); mapReplace(map); - prepareCertificateParams(map, request.getMeasureDataETwoList()); - readyForCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(ETWO_WEIGHT, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -488,6 +495,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(ETWO_WEIGHT, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 1d4794d..9b0b134 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 @@ -150,6 +150,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -193,7 +196,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowFrequencySignal lowFrequencySignal : request.getMeasureDataLowFrequencySignalList()) { BizBusinessDeviceMeasureDataLowFrequencySignal signal = (BizBusinessDeviceMeasureDataLowFrequencySignal) BeanUtils.cloneBean(lowFrequencySignal); @@ -205,7 +208,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_FREQUENCY_SIGNAL_SOURCE, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -214,6 +218,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java index 556f01b..f1ae409 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java @@ -117,20 +117,16 @@ log.debug("校验没有原始记录"); return null; } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowPower lowPower : request.getMeasureDataLowPowerList()) { BizBusinessDeviceMeasureDataLowPower power = (BizBusinessDeviceMeasureDataLowPower) BeanUtils.cloneBean(lowPower); power.applyStrategyBasedOnDataType(); list.add(power); } - map.put("powerList", list); - replaceSlash(map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_POWER, "1", request.getItemCategoryName())); @@ -143,6 +139,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(LOW_POWER, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -164,22 +163,20 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowPower lowPower : request.getMeasureDataLowPowerList()) { BizBusinessDeviceMeasureDataLowPower power = (BizBusinessDeviceMeasureDataLowPower) BeanUtils.cloneBean(lowPower); power.applyStrategyBasedOnDataType(); list.add(power); } - map.put("powerList", list); - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_POWER, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -188,6 +185,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(LOW_POWER, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java index 0da809e..77c877c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java @@ -142,9 +142,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - readyForMicrowaveParams(map, request.getMeasureDataMicrowaveAttenuationList()); - replaceSlash(map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MICROWAVE_ATTENUATION, "1", request.getItemCategoryName())); @@ -157,6 +155,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(MICROWAVE_ATTENUATION, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -196,13 +197,14 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); readyForMicrowaveParams(map, request.getMeasureDataMicrowaveAttenuationList()); replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MICROWAVE_ATTENUATION, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -211,6 +213,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(MICROWAVE_ATTENUATION, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java index a9d9c02..4eb6cbe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java @@ -192,10 +192,8 @@ List list = Collections.emptyList(); request.setMeasureDataElectricalSafetyList(list); } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); List electricalSafetyList = request.getMeasureDataElectricalSafetyList(); List safetyList = new ArrayList<>(); @@ -227,6 +225,9 @@ .build()); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -254,7 +255,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List electricalSafetyList = request.getMeasureDataElectricalSafetyList(); List safetyList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataElectricalSafety electricalSafety : electricalSafetyList) { @@ -271,7 +272,8 @@ BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MULTI_ELECTRICAL_SAFETY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -287,6 +289,9 @@ .pdf(false) .customTemplateUrls(customTemplateUrls) .build()); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 5315a40..8d6b2ff 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 @@ -173,6 +173,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(request.getItemCategoryName(), "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -193,7 +196,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataOscilloscope oscilloscope : request.getMeasureDataOscilloscopeList()) { BizBusinessDeviceMeasureDataOscilloscope scope = (BizBusinessDeviceMeasureDataOscilloscope) BeanUtils.cloneBean(oscilloscope); @@ -214,7 +217,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(OSCILLOSCOPE, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -223,6 +227,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 a126a9e..cc3e25c 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 @@ -201,6 +201,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(request.getItemCategoryName(), "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -385,8 +388,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom : cesiumAtomList) { @@ -414,7 +416,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(CESIUM_ATOMIC_FREQUENCY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -423,6 +426,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 93477f8..fe41d80 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 @@ -280,6 +280,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(DC_POWER_SUPPLY, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -345,21 +348,14 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { List list = new ArrayList<>(); list.add(new BizBusinessDeviceMeasureDataDcPower()); request.setMeasureDataDcPowerList(list); } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map,request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List dcPowerList = request.getMeasureDataDcPowerList(); List powerList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataDcPower measureDataDcPower : dcPowerList) { @@ -373,7 +369,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(DC_POWER_SUPPLY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -382,6 +379,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 375c6b6..08fc352 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 @@ -4,22 +4,23 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.PrintFileModuleNameEnum; +import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureEquipmentMapper; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; import com.casic.missiles.mapper.equipment.BizEquipmentTechnicalTargetMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataDcPower; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataETwo; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.service.listeners.register.PrintFileRegister; -import com.casic.missiles.utils.DictCodeUtils; - -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataETwo; +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataETwo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; +import com.casic.missiles.model.equipment.BizEquipmentTechnicalTarget; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentSupport; +import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.SnowflakeUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -27,7 +28,10 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -273,7 +277,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); - map.put("appearance","1".equals(request.getAppearance()) ? "合格" : "不合格"); + map.put("appearance", "1".equals(request.getAppearance()) ? "合格" : "不合格"); //准备填充参数 prepareParams(map, request.getMeasureDataETwoList()); readyForCoverParams(map, request.getLabCode()); @@ -289,6 +293,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(ETWO_WEIGHT, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -471,15 +478,15 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); - map.put("appearance","1".equals(request.getAppearance()) ? "合格" : "不合格"); + map.put("appearance", "1".equals(request.getAppearance()) ? "合格" : "不合格"); + String customUrl = readyForCoverParams(map, request.getLabCode()); mapReplace(map); - prepareCertificateParams(map, request.getMeasureDataETwoList()); - readyForCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(ETWO_WEIGHT, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -488,6 +495,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(ETWO_WEIGHT, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 1d4794d..9b0b134 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 @@ -150,6 +150,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -193,7 +196,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowFrequencySignal lowFrequencySignal : request.getMeasureDataLowFrequencySignalList()) { BizBusinessDeviceMeasureDataLowFrequencySignal signal = (BizBusinessDeviceMeasureDataLowFrequencySignal) BeanUtils.cloneBean(lowFrequencySignal); @@ -205,7 +208,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_FREQUENCY_SIGNAL_SOURCE, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -214,6 +218,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java index 556f01b..f1ae409 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java @@ -117,20 +117,16 @@ log.debug("校验没有原始记录"); return null; } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowPower lowPower : request.getMeasureDataLowPowerList()) { BizBusinessDeviceMeasureDataLowPower power = (BizBusinessDeviceMeasureDataLowPower) BeanUtils.cloneBean(lowPower); power.applyStrategyBasedOnDataType(); list.add(power); } - map.put("powerList", list); - replaceSlash(map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_POWER, "1", request.getItemCategoryName())); @@ -143,6 +139,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(LOW_POWER, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -164,22 +163,20 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowPower lowPower : request.getMeasureDataLowPowerList()) { BizBusinessDeviceMeasureDataLowPower power = (BizBusinessDeviceMeasureDataLowPower) BeanUtils.cloneBean(lowPower); power.applyStrategyBasedOnDataType(); list.add(power); } - map.put("powerList", list); - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_POWER, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -188,6 +185,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(LOW_POWER, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java index 0da809e..77c877c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java @@ -142,9 +142,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - readyForMicrowaveParams(map, request.getMeasureDataMicrowaveAttenuationList()); - replaceSlash(map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MICROWAVE_ATTENUATION, "1", request.getItemCategoryName())); @@ -157,6 +155,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(MICROWAVE_ATTENUATION, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -196,13 +197,14 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); readyForMicrowaveParams(map, request.getMeasureDataMicrowaveAttenuationList()); replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MICROWAVE_ATTENUATION, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -211,6 +213,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(MICROWAVE_ATTENUATION, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java index a9d9c02..4eb6cbe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java @@ -192,10 +192,8 @@ List list = Collections.emptyList(); request.setMeasureDataElectricalSafetyList(list); } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); List electricalSafetyList = request.getMeasureDataElectricalSafetyList(); List safetyList = new ArrayList<>(); @@ -227,6 +225,9 @@ .build()); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -254,7 +255,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List electricalSafetyList = request.getMeasureDataElectricalSafetyList(); List safetyList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataElectricalSafety electricalSafety : electricalSafetyList) { @@ -271,7 +272,8 @@ BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MULTI_ELECTRICAL_SAFETY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -287,6 +289,9 @@ .pdf(false) .customTemplateUrls(customTemplateUrls) .build()); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 5315a40..8d6b2ff 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 @@ -173,6 +173,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(request.getItemCategoryName(), "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -193,7 +196,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataOscilloscope oscilloscope : request.getMeasureDataOscilloscopeList()) { BizBusinessDeviceMeasureDataOscilloscope scope = (BizBusinessDeviceMeasureDataOscilloscope) BeanUtils.cloneBean(oscilloscope); @@ -214,7 +217,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(OSCILLOSCOPE, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -223,6 +227,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 43e3b66..ca10021 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 @@ -229,6 +229,9 @@ String originalUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalUrlFile)) { + return urlList; + } urlList.add(originalUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -424,7 +427,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List thermometerList = request.getMeasureDataResistanceThermometerList(); switch (request.getItemCategoryName()) { case THERMAL_RESISTANCE: @@ -445,7 +448,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(RESISTANCE_THERMOMETER, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -454,6 +458,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 a126a9e..cc3e25c 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 @@ -201,6 +201,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(request.getItemCategoryName(), "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -385,8 +388,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom : cesiumAtomList) { @@ -414,7 +416,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(CESIUM_ATOMIC_FREQUENCY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -423,6 +426,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 93477f8..fe41d80 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 @@ -280,6 +280,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(DC_POWER_SUPPLY, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -345,21 +348,14 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { List list = new ArrayList<>(); list.add(new BizBusinessDeviceMeasureDataDcPower()); request.setMeasureDataDcPowerList(list); } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map,request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List dcPowerList = request.getMeasureDataDcPowerList(); List powerList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataDcPower measureDataDcPower : dcPowerList) { @@ -373,7 +369,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(DC_POWER_SUPPLY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -382,6 +379,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 375c6b6..08fc352 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 @@ -4,22 +4,23 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.PrintFileModuleNameEnum; +import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureEquipmentMapper; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; import com.casic.missiles.mapper.equipment.BizEquipmentTechnicalTargetMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataDcPower; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataETwo; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.service.listeners.register.PrintFileRegister; -import com.casic.missiles.utils.DictCodeUtils; - -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataETwo; +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataETwo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; +import com.casic.missiles.model.equipment.BizEquipmentTechnicalTarget; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentSupport; +import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.SnowflakeUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -27,7 +28,10 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -273,7 +277,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); - map.put("appearance","1".equals(request.getAppearance()) ? "合格" : "不合格"); + map.put("appearance", "1".equals(request.getAppearance()) ? "合格" : "不合格"); //准备填充参数 prepareParams(map, request.getMeasureDataETwoList()); readyForCoverParams(map, request.getLabCode()); @@ -289,6 +293,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(ETWO_WEIGHT, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -471,15 +478,15 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); - map.put("appearance","1".equals(request.getAppearance()) ? "合格" : "不合格"); + map.put("appearance", "1".equals(request.getAppearance()) ? "合格" : "不合格"); + String customUrl = readyForCoverParams(map, request.getLabCode()); mapReplace(map); - prepareCertificateParams(map, request.getMeasureDataETwoList()); - readyForCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(ETWO_WEIGHT, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -488,6 +495,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(ETWO_WEIGHT, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 1d4794d..9b0b134 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 @@ -150,6 +150,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -193,7 +196,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowFrequencySignal lowFrequencySignal : request.getMeasureDataLowFrequencySignalList()) { BizBusinessDeviceMeasureDataLowFrequencySignal signal = (BizBusinessDeviceMeasureDataLowFrequencySignal) BeanUtils.cloneBean(lowFrequencySignal); @@ -205,7 +208,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_FREQUENCY_SIGNAL_SOURCE, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -214,6 +218,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java index 556f01b..f1ae409 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java @@ -117,20 +117,16 @@ log.debug("校验没有原始记录"); return null; } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowPower lowPower : request.getMeasureDataLowPowerList()) { BizBusinessDeviceMeasureDataLowPower power = (BizBusinessDeviceMeasureDataLowPower) BeanUtils.cloneBean(lowPower); power.applyStrategyBasedOnDataType(); list.add(power); } - map.put("powerList", list); - replaceSlash(map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_POWER, "1", request.getItemCategoryName())); @@ -143,6 +139,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(LOW_POWER, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -164,22 +163,20 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowPower lowPower : request.getMeasureDataLowPowerList()) { BizBusinessDeviceMeasureDataLowPower power = (BizBusinessDeviceMeasureDataLowPower) BeanUtils.cloneBean(lowPower); power.applyStrategyBasedOnDataType(); list.add(power); } - map.put("powerList", list); - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_POWER, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -188,6 +185,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(LOW_POWER, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java index 0da809e..77c877c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java @@ -142,9 +142,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - readyForMicrowaveParams(map, request.getMeasureDataMicrowaveAttenuationList()); - replaceSlash(map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MICROWAVE_ATTENUATION, "1", request.getItemCategoryName())); @@ -157,6 +155,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(MICROWAVE_ATTENUATION, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -196,13 +197,14 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); readyForMicrowaveParams(map, request.getMeasureDataMicrowaveAttenuationList()); replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MICROWAVE_ATTENUATION, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -211,6 +213,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(MICROWAVE_ATTENUATION, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java index a9d9c02..4eb6cbe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java @@ -192,10 +192,8 @@ List list = Collections.emptyList(); request.setMeasureDataElectricalSafetyList(list); } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); List electricalSafetyList = request.getMeasureDataElectricalSafetyList(); List safetyList = new ArrayList<>(); @@ -227,6 +225,9 @@ .build()); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -254,7 +255,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List electricalSafetyList = request.getMeasureDataElectricalSafetyList(); List safetyList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataElectricalSafety electricalSafety : electricalSafetyList) { @@ -271,7 +272,8 @@ BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MULTI_ELECTRICAL_SAFETY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -287,6 +289,9 @@ .pdf(false) .customTemplateUrls(customTemplateUrls) .build()); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 5315a40..8d6b2ff 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 @@ -173,6 +173,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(request.getItemCategoryName(), "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -193,7 +196,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataOscilloscope oscilloscope : request.getMeasureDataOscilloscopeList()) { BizBusinessDeviceMeasureDataOscilloscope scope = (BizBusinessDeviceMeasureDataOscilloscope) BeanUtils.cloneBean(oscilloscope); @@ -214,7 +217,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(OSCILLOSCOPE, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -223,6 +227,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 43e3b66..ca10021 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 @@ -229,6 +229,9 @@ String originalUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalUrlFile)) { + return urlList; + } urlList.add(originalUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -424,7 +427,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List thermometerList = request.getMeasureDataResistanceThermometerList(); switch (request.getItemCategoryName()) { case THERMAL_RESISTANCE: @@ -445,7 +448,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(RESISTANCE_THERMOMETER, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -454,6 +458,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SParameterHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SParameterHandler.java index d92a249..de3b58b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SParameterHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SParameterHandler.java @@ -8,7 +8,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCesiumAtom; import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataSParam; import com.casic.missiles.model.equipment.BizEquipmentInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataSParam; @@ -23,7 +22,6 @@ 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.List; @@ -211,6 +209,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(itemCategoryName, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -320,20 +321,9 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); String itemCategoryName = request.getItemCategoryName(); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataSParam sParam : request.getMeasureDataSParamList()) { @@ -351,12 +341,12 @@ default: break; } - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(S_PARAM, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -365,6 +355,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(itemCategoryName, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 a126a9e..cc3e25c 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 @@ -201,6 +201,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(request.getItemCategoryName(), "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -385,8 +388,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom : cesiumAtomList) { @@ -414,7 +416,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(CESIUM_ATOMIC_FREQUENCY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -423,6 +426,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 93477f8..fe41d80 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 @@ -280,6 +280,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(DC_POWER_SUPPLY, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -345,21 +348,14 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { List list = new ArrayList<>(); list.add(new BizBusinessDeviceMeasureDataDcPower()); request.setMeasureDataDcPowerList(list); } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map,request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List dcPowerList = request.getMeasureDataDcPowerList(); List powerList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataDcPower measureDataDcPower : dcPowerList) { @@ -373,7 +369,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(DC_POWER_SUPPLY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -382,6 +379,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 375c6b6..08fc352 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 @@ -4,22 +4,23 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.PrintFileModuleNameEnum; +import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureEquipmentMapper; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; import com.casic.missiles.mapper.equipment.BizEquipmentTechnicalTargetMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataDcPower; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataETwo; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.service.listeners.register.PrintFileRegister; -import com.casic.missiles.utils.DictCodeUtils; - -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataETwo; +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataETwo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; +import com.casic.missiles.model.equipment.BizEquipmentTechnicalTarget; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentSupport; +import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.SnowflakeUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -27,7 +28,10 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -273,7 +277,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); - map.put("appearance","1".equals(request.getAppearance()) ? "合格" : "不合格"); + map.put("appearance", "1".equals(request.getAppearance()) ? "合格" : "不合格"); //准备填充参数 prepareParams(map, request.getMeasureDataETwoList()); readyForCoverParams(map, request.getLabCode()); @@ -289,6 +293,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(ETWO_WEIGHT, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -471,15 +478,15 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); - map.put("appearance","1".equals(request.getAppearance()) ? "合格" : "不合格"); + map.put("appearance", "1".equals(request.getAppearance()) ? "合格" : "不合格"); + String customUrl = readyForCoverParams(map, request.getLabCode()); mapReplace(map); - prepareCertificateParams(map, request.getMeasureDataETwoList()); - readyForCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(ETWO_WEIGHT, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -488,6 +495,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(ETWO_WEIGHT, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 1d4794d..9b0b134 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 @@ -150,6 +150,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -193,7 +196,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowFrequencySignal lowFrequencySignal : request.getMeasureDataLowFrequencySignalList()) { BizBusinessDeviceMeasureDataLowFrequencySignal signal = (BizBusinessDeviceMeasureDataLowFrequencySignal) BeanUtils.cloneBean(lowFrequencySignal); @@ -205,7 +208,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_FREQUENCY_SIGNAL_SOURCE, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -214,6 +218,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java index 556f01b..f1ae409 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java @@ -117,20 +117,16 @@ log.debug("校验没有原始记录"); return null; } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowPower lowPower : request.getMeasureDataLowPowerList()) { BizBusinessDeviceMeasureDataLowPower power = (BizBusinessDeviceMeasureDataLowPower) BeanUtils.cloneBean(lowPower); power.applyStrategyBasedOnDataType(); list.add(power); } - map.put("powerList", list); - replaceSlash(map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_POWER, "1", request.getItemCategoryName())); @@ -143,6 +139,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(LOW_POWER, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -164,22 +163,20 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowPower lowPower : request.getMeasureDataLowPowerList()) { BizBusinessDeviceMeasureDataLowPower power = (BizBusinessDeviceMeasureDataLowPower) BeanUtils.cloneBean(lowPower); power.applyStrategyBasedOnDataType(); list.add(power); } - map.put("powerList", list); - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_POWER, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -188,6 +185,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(LOW_POWER, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java index 0da809e..77c877c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java @@ -142,9 +142,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - readyForMicrowaveParams(map, request.getMeasureDataMicrowaveAttenuationList()); - replaceSlash(map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MICROWAVE_ATTENUATION, "1", request.getItemCategoryName())); @@ -157,6 +155,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(MICROWAVE_ATTENUATION, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -196,13 +197,14 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); readyForMicrowaveParams(map, request.getMeasureDataMicrowaveAttenuationList()); replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MICROWAVE_ATTENUATION, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -211,6 +213,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(MICROWAVE_ATTENUATION, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java index a9d9c02..4eb6cbe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java @@ -192,10 +192,8 @@ List list = Collections.emptyList(); request.setMeasureDataElectricalSafetyList(list); } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); List electricalSafetyList = request.getMeasureDataElectricalSafetyList(); List safetyList = new ArrayList<>(); @@ -227,6 +225,9 @@ .build()); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -254,7 +255,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List electricalSafetyList = request.getMeasureDataElectricalSafetyList(); List safetyList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataElectricalSafety electricalSafety : electricalSafetyList) { @@ -271,7 +272,8 @@ BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MULTI_ELECTRICAL_SAFETY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -287,6 +289,9 @@ .pdf(false) .customTemplateUrls(customTemplateUrls) .build()); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 5315a40..8d6b2ff 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 @@ -173,6 +173,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(request.getItemCategoryName(), "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -193,7 +196,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataOscilloscope oscilloscope : request.getMeasureDataOscilloscopeList()) { BizBusinessDeviceMeasureDataOscilloscope scope = (BizBusinessDeviceMeasureDataOscilloscope) BeanUtils.cloneBean(oscilloscope); @@ -214,7 +217,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(OSCILLOSCOPE, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -223,6 +227,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 43e3b66..ca10021 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 @@ -229,6 +229,9 @@ String originalUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalUrlFile)) { + return urlList; + } urlList.add(originalUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -424,7 +427,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List thermometerList = request.getMeasureDataResistanceThermometerList(); switch (request.getItemCategoryName()) { case THERMAL_RESISTANCE: @@ -445,7 +448,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(RESISTANCE_THERMOMETER, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -454,6 +458,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SParameterHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SParameterHandler.java index d92a249..de3b58b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SParameterHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SParameterHandler.java @@ -8,7 +8,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCesiumAtom; import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataSParam; import com.casic.missiles.model.equipment.BizEquipmentInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataSParam; @@ -23,7 +22,6 @@ 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.List; @@ -211,6 +209,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(itemCategoryName, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -320,20 +321,9 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); String itemCategoryName = request.getItemCategoryName(); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataSParam sParam : request.getMeasureDataSParamList()) { @@ -351,12 +341,12 @@ default: break; } - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(S_PARAM, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -365,6 +355,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(itemCategoryName, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 162b048..7d6ec7b 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 @@ -61,7 +61,6 @@ } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - List safetyValveList = request.getMeasureDataSafetyValueList(); readyForCoverParams(map,request.getLabCode()); List list = new ArrayList<>(); @@ -71,7 +70,6 @@ list.add(value); } assblemParams(list, map); - List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(SAFETY_VALVE, "1", request.getItemCategoryName())); //与证书模板区分 @@ -83,6 +81,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(SAFETY_VALVE, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -126,8 +127,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map,request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List safetyValveList = request.getMeasureDataSafetyValueList(); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataSafetyValue safetyValue : safetyValveList) { @@ -136,12 +136,12 @@ list.add(value); } assblemParams(list, map); - readyForCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(SAFETY_VALVE, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -150,6 +150,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(SAFETY_VALVE, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 a126a9e..cc3e25c 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 @@ -201,6 +201,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(request.getItemCategoryName(), "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -385,8 +388,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom : cesiumAtomList) { @@ -414,7 +416,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(CESIUM_ATOMIC_FREQUENCY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -423,6 +426,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 93477f8..fe41d80 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 @@ -280,6 +280,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(DC_POWER_SUPPLY, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -345,21 +348,14 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { List list = new ArrayList<>(); list.add(new BizBusinessDeviceMeasureDataDcPower()); request.setMeasureDataDcPowerList(list); } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map,request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List dcPowerList = request.getMeasureDataDcPowerList(); List powerList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataDcPower measureDataDcPower : dcPowerList) { @@ -373,7 +369,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(DC_POWER_SUPPLY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -382,6 +379,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 375c6b6..08fc352 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 @@ -4,22 +4,23 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.PrintFileModuleNameEnum; +import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureEquipmentMapper; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; import com.casic.missiles.mapper.equipment.BizEquipmentTechnicalTargetMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataDcPower; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataETwo; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.service.listeners.register.PrintFileRegister; -import com.casic.missiles.utils.DictCodeUtils; - -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataETwo; +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataETwo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; +import com.casic.missiles.model.equipment.BizEquipmentTechnicalTarget; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentSupport; +import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.SnowflakeUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -27,7 +28,10 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -273,7 +277,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); - map.put("appearance","1".equals(request.getAppearance()) ? "合格" : "不合格"); + map.put("appearance", "1".equals(request.getAppearance()) ? "合格" : "不合格"); //准备填充参数 prepareParams(map, request.getMeasureDataETwoList()); readyForCoverParams(map, request.getLabCode()); @@ -289,6 +293,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(ETWO_WEIGHT, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -471,15 +478,15 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); - map.put("appearance","1".equals(request.getAppearance()) ? "合格" : "不合格"); + map.put("appearance", "1".equals(request.getAppearance()) ? "合格" : "不合格"); + String customUrl = readyForCoverParams(map, request.getLabCode()); mapReplace(map); - prepareCertificateParams(map, request.getMeasureDataETwoList()); - readyForCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(ETWO_WEIGHT, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -488,6 +495,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(ETWO_WEIGHT, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 1d4794d..9b0b134 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 @@ -150,6 +150,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -193,7 +196,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowFrequencySignal lowFrequencySignal : request.getMeasureDataLowFrequencySignalList()) { BizBusinessDeviceMeasureDataLowFrequencySignal signal = (BizBusinessDeviceMeasureDataLowFrequencySignal) BeanUtils.cloneBean(lowFrequencySignal); @@ -205,7 +208,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_FREQUENCY_SIGNAL_SOURCE, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -214,6 +218,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java index 556f01b..f1ae409 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java @@ -117,20 +117,16 @@ log.debug("校验没有原始记录"); return null; } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowPower lowPower : request.getMeasureDataLowPowerList()) { BizBusinessDeviceMeasureDataLowPower power = (BizBusinessDeviceMeasureDataLowPower) BeanUtils.cloneBean(lowPower); power.applyStrategyBasedOnDataType(); list.add(power); } - map.put("powerList", list); - replaceSlash(map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_POWER, "1", request.getItemCategoryName())); @@ -143,6 +139,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(LOW_POWER, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -164,22 +163,20 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowPower lowPower : request.getMeasureDataLowPowerList()) { BizBusinessDeviceMeasureDataLowPower power = (BizBusinessDeviceMeasureDataLowPower) BeanUtils.cloneBean(lowPower); power.applyStrategyBasedOnDataType(); list.add(power); } - map.put("powerList", list); - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_POWER, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -188,6 +185,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(LOW_POWER, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java index 0da809e..77c877c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java @@ -142,9 +142,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - readyForMicrowaveParams(map, request.getMeasureDataMicrowaveAttenuationList()); - replaceSlash(map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MICROWAVE_ATTENUATION, "1", request.getItemCategoryName())); @@ -157,6 +155,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(MICROWAVE_ATTENUATION, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -196,13 +197,14 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); readyForMicrowaveParams(map, request.getMeasureDataMicrowaveAttenuationList()); replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MICROWAVE_ATTENUATION, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -211,6 +213,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(MICROWAVE_ATTENUATION, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java index a9d9c02..4eb6cbe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java @@ -192,10 +192,8 @@ List list = Collections.emptyList(); request.setMeasureDataElectricalSafetyList(list); } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); List electricalSafetyList = request.getMeasureDataElectricalSafetyList(); List safetyList = new ArrayList<>(); @@ -227,6 +225,9 @@ .build()); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -254,7 +255,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List electricalSafetyList = request.getMeasureDataElectricalSafetyList(); List safetyList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataElectricalSafety electricalSafety : electricalSafetyList) { @@ -271,7 +272,8 @@ BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MULTI_ELECTRICAL_SAFETY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -287,6 +289,9 @@ .pdf(false) .customTemplateUrls(customTemplateUrls) .build()); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 5315a40..8d6b2ff 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 @@ -173,6 +173,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(request.getItemCategoryName(), "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -193,7 +196,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataOscilloscope oscilloscope : request.getMeasureDataOscilloscopeList()) { BizBusinessDeviceMeasureDataOscilloscope scope = (BizBusinessDeviceMeasureDataOscilloscope) BeanUtils.cloneBean(oscilloscope); @@ -214,7 +217,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(OSCILLOSCOPE, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -223,6 +227,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 43e3b66..ca10021 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 @@ -229,6 +229,9 @@ String originalUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalUrlFile)) { + return urlList; + } urlList.add(originalUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -424,7 +427,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List thermometerList = request.getMeasureDataResistanceThermometerList(); switch (request.getItemCategoryName()) { case THERMAL_RESISTANCE: @@ -445,7 +448,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(RESISTANCE_THERMOMETER, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -454,6 +458,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SParameterHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SParameterHandler.java index d92a249..de3b58b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SParameterHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SParameterHandler.java @@ -8,7 +8,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCesiumAtom; import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataSParam; import com.casic.missiles.model.equipment.BizEquipmentInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataSParam; @@ -23,7 +22,6 @@ 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.List; @@ -211,6 +209,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(itemCategoryName, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -320,20 +321,9 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); String itemCategoryName = request.getItemCategoryName(); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataSParam sParam : request.getMeasureDataSParamList()) { @@ -351,12 +341,12 @@ default: break; } - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(S_PARAM, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -365,6 +355,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(itemCategoryName, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 162b048..7d6ec7b 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 @@ -61,7 +61,6 @@ } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - List safetyValveList = request.getMeasureDataSafetyValueList(); readyForCoverParams(map,request.getLabCode()); List list = new ArrayList<>(); @@ -71,7 +70,6 @@ list.add(value); } assblemParams(list, map); - List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(SAFETY_VALVE, "1", request.getItemCategoryName())); //与证书模板区分 @@ -83,6 +81,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(SAFETY_VALVE, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -126,8 +127,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map,request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List safetyValveList = request.getMeasureDataSafetyValueList(); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataSafetyValue safetyValue : safetyValveList) { @@ -136,12 +136,12 @@ list.add(value); } assblemParams(list, map); - readyForCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(SAFETY_VALVE, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -150,6 +150,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(SAFETY_VALVE, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SignalGeneratorHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SignalGeneratorHandler.java index 88354ec..bdb6540 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SignalGeneratorHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SignalGeneratorHandler.java @@ -189,16 +189,13 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - List generatorList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataSignalGenerator signalGenerator : request.getMeasureDataSignalGeneratorList()) { BizBusinessDeviceMeasureDataSignalGenerator generator = (BizBusinessDeviceMeasureDataSignalGenerator) BeanUtils.cloneBean(signalGenerator); generator.applyStrategyBasedOnDataType(); generatorList.add(generator); } - readyForSignalGenerator(map, generatorList); - replaceSlash(map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(SIGNAL_GENERATOR, "1", request.getItemCategoryName())); @@ -211,6 +208,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(SIGNAL_GENERATOR, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -261,8 +261,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataSignalGenerator signalGenerator : request.getMeasureDataSignalGeneratorList()) { BizBusinessDeviceMeasureDataSignalGenerator generator = (BizBusinessDeviceMeasureDataSignalGenerator) BeanUtils.cloneBean(signalGenerator); @@ -270,12 +269,12 @@ list.add(generator); } readyForSignalGenerator(map, list); - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(SIGNAL_GENERATOR, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -285,6 +284,9 @@ log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(SIGNAL_GENERATOR, "证书打印", null, map, false, null, customTemplateUrls); urlList.add(wordUrl); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); } 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 a126a9e..cc3e25c 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 @@ -201,6 +201,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(request.getItemCategoryName(), "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -385,8 +388,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List cesiumAtomList = request.getMeasureDataCesiumAtomList(); List atomList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataCesiumAtom cesiumAtom : cesiumAtomList) { @@ -414,7 +416,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(CESIUM_ATOMIC_FREQUENCY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -423,6 +426,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 93477f8..fe41d80 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 @@ -280,6 +280,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(DC_POWER_SUPPLY, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -345,21 +348,14 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { List list = new ArrayList<>(); list.add(new BizBusinessDeviceMeasureDataDcPower()); request.setMeasureDataDcPowerList(list); } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map,request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List dcPowerList = request.getMeasureDataDcPowerList(); List powerList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataDcPower measureDataDcPower : dcPowerList) { @@ -373,7 +369,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(DC_POWER_SUPPLY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -382,6 +379,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(DC_POWER_SUPPLY, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 375c6b6..08fc352 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 @@ -4,22 +4,23 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.PrintFileModuleNameEnum; +import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureEquipmentMapper; import com.casic.missiles.mapper.equipment.BizEquipmentInfoMapper; import com.casic.missiles.mapper.equipment.BizEquipmentTechnicalTargetMapper; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataDcPower; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataETwo; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.service.listeners.register.PrintFileRegister; -import com.casic.missiles.utils.DictCodeUtils; - -import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataETwo; +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataETwo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; +import com.casic.missiles.model.equipment.BizEquipmentTechnicalTarget; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentSupport; +import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.SnowflakeUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -27,7 +28,10 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -273,7 +277,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); - map.put("appearance","1".equals(request.getAppearance()) ? "合格" : "不合格"); + map.put("appearance", "1".equals(request.getAppearance()) ? "合格" : "不合格"); //准备填充参数 prepareParams(map, request.getMeasureDataETwoList()); readyForCoverParams(map, request.getLabCode()); @@ -289,6 +293,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(ETWO_WEIGHT, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -471,15 +478,15 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); map.put("actualDivisionValue", StringUtils.isNotBlank(request.getActualDivisionValue()) ? request.getActualDivisionValue() : "/"); - map.put("appearance","1".equals(request.getAppearance()) ? "合格" : "不合格"); + map.put("appearance", "1".equals(request.getAppearance()) ? "合格" : "不合格"); + String customUrl = readyForCoverParams(map, request.getLabCode()); mapReplace(map); - prepareCertificateParams(map, request.getMeasureDataETwoList()); - readyForCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(ETWO_WEIGHT, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -488,6 +495,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(ETWO_WEIGHT, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 1d4794d..9b0b134 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 @@ -150,6 +150,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -193,7 +196,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowFrequencySignal lowFrequencySignal : request.getMeasureDataLowFrequencySignalList()) { BizBusinessDeviceMeasureDataLowFrequencySignal signal = (BizBusinessDeviceMeasureDataLowFrequencySignal) BeanUtils.cloneBean(lowFrequencySignal); @@ -205,7 +208,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_FREQUENCY_SIGNAL_SOURCE, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -214,6 +218,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(LOW_FREQUENCY_SIGNAL_SOURCE, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java index 556f01b..f1ae409 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/LowPowerHandler.java @@ -117,20 +117,16 @@ log.debug("校验没有原始记录"); return null; } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowPower lowPower : request.getMeasureDataLowPowerList()) { BizBusinessDeviceMeasureDataLowPower power = (BizBusinessDeviceMeasureDataLowPower) BeanUtils.cloneBean(lowPower); power.applyStrategyBasedOnDataType(); list.add(power); } - map.put("powerList", list); - replaceSlash(map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_POWER, "1", request.getItemCategoryName())); @@ -143,6 +139,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(LOW_POWER, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -164,22 +163,20 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataLowPower lowPower : request.getMeasureDataLowPowerList()) { BizBusinessDeviceMeasureDataLowPower power = (BizBusinessDeviceMeasureDataLowPower) BeanUtils.cloneBean(lowPower); power.applyStrategyBasedOnDataType(); list.add(power); } - map.put("powerList", list); - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(LOW_POWER, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -188,6 +185,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(LOW_POWER, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java index 0da809e..77c877c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MicrowaveHandler.java @@ -142,9 +142,7 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - readyForMicrowaveParams(map, request.getMeasureDataMicrowaveAttenuationList()); - replaceSlash(map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MICROWAVE_ATTENUATION, "1", request.getItemCategoryName())); @@ -157,6 +155,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(MICROWAVE_ATTENUATION, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -196,13 +197,14 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); readyForMicrowaveParams(map, request.getMeasureDataMicrowaveAttenuationList()); replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MICROWAVE_ATTENUATION, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -211,6 +213,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(MICROWAVE_ATTENUATION, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java index a9d9c02..4eb6cbe 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java @@ -192,10 +192,8 @@ List list = Collections.emptyList(); request.setMeasureDataElectricalSafetyList(list); } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); List electricalSafetyList = request.getMeasureDataElectricalSafetyList(); List safetyList = new ArrayList<>(); @@ -227,6 +225,9 @@ .build()); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -254,7 +255,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List electricalSafetyList = request.getMeasureDataElectricalSafetyList(); List safetyList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataElectricalSafety electricalSafety : electricalSafetyList) { @@ -271,7 +272,8 @@ BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MULTI_ELECTRICAL_SAFETY, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -287,6 +289,9 @@ .pdf(false) .customTemplateUrls(customTemplateUrls) .build()); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 5315a40..8d6b2ff 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 @@ -173,6 +173,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(request.getItemCategoryName(), "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -193,7 +196,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataOscilloscope oscilloscope : request.getMeasureDataOscilloscopeList()) { BizBusinessDeviceMeasureDataOscilloscope scope = (BizBusinessDeviceMeasureDataOscilloscope) BeanUtils.cloneBean(oscilloscope); @@ -214,7 +217,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(OSCILLOSCOPE, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -223,6 +227,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 43e3b66..ca10021 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 @@ -229,6 +229,9 @@ String originalUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalUrlFile)) { + return urlList; + } urlList.add(originalUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -424,7 +427,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List thermometerList = request.getMeasureDataResistanceThermometerList(); switch (request.getItemCategoryName()) { case THERMAL_RESISTANCE: @@ -445,7 +448,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(RESISTANCE_THERMOMETER, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -454,6 +458,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(request.getItemCategoryName(), "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SParameterHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SParameterHandler.java index d92a249..de3b58b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SParameterHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SParameterHandler.java @@ -8,7 +8,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataCesiumAtom; import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataSParam; import com.casic.missiles.model.equipment.BizEquipmentInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataSParam; @@ -23,7 +22,6 @@ 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.List; @@ -211,6 +209,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(itemCategoryName, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -320,20 +321,9 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } - if (CollectionUtils.isEmpty(request.getMeasureDataCesiumAtomList())) { - List list = new ArrayList<>(); - list.add(new BizBusinessDeviceMeasureDataCesiumAtom()); - request.setMeasureDataCesiumAtomList(list); - } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); String itemCategoryName = request.getItemCategoryName(); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataSParam sParam : request.getMeasureDataSParamList()) { @@ -351,12 +341,12 @@ default: break; } - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(S_PARAM, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -365,6 +355,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(itemCategoryName, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); 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 162b048..7d6ec7b 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 @@ -61,7 +61,6 @@ } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - List safetyValveList = request.getMeasureDataSafetyValueList(); readyForCoverParams(map,request.getLabCode()); List list = new ArrayList<>(); @@ -71,7 +70,6 @@ list.add(value); } assblemParams(list, map); - List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(SAFETY_VALVE, "1", request.getItemCategoryName())); //与证书模板区分 @@ -83,6 +81,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(SAFETY_VALVE, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -126,8 +127,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map,request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List safetyValveList = request.getMeasureDataSafetyValueList(); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataSafetyValue safetyValue : safetyValveList) { @@ -136,12 +136,12 @@ list.add(value); } assblemParams(list, map); - readyForCoverParams(map, request.getLabCode()); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(SAFETY_VALVE, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -150,6 +150,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(SAFETY_VALVE, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SignalGeneratorHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SignalGeneratorHandler.java index 88354ec..bdb6540 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SignalGeneratorHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SignalGeneratorHandler.java @@ -189,16 +189,13 @@ DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - List generatorList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataSignalGenerator signalGenerator : request.getMeasureDataSignalGeneratorList()) { BizBusinessDeviceMeasureDataSignalGenerator generator = (BizBusinessDeviceMeasureDataSignalGenerator) BeanUtils.cloneBean(signalGenerator); generator.applyStrategyBasedOnDataType(); generatorList.add(generator); } - readyForSignalGenerator(map, generatorList); - replaceSlash(map); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(SIGNAL_GENERATOR, "1", request.getItemCategoryName())); @@ -211,6 +208,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(SIGNAL_GENERATOR, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -261,8 +261,7 @@ try { DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); - + String customUrl = readyForCoverParams(map, request.getLabCode()); List list = new ArrayList<>(); for (BizBusinessDeviceMeasureDataSignalGenerator signalGenerator : request.getMeasureDataSignalGeneratorList()) { BizBusinessDeviceMeasureDataSignalGenerator generator = (BizBusinessDeviceMeasureDataSignalGenerator) BeanUtils.cloneBean(signalGenerator); @@ -270,12 +269,12 @@ list.add(generator); } readyForSignalGenerator(map, list); - replaceSlash(map); List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(SIGNAL_GENERATOR, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -285,6 +284,9 @@ log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(SIGNAL_GENERATOR, "证书打印", null, map, false, null, customTemplateUrls); urlList.add(wordUrl); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); } 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 e039e2f..7fd9978 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 @@ -3,18 +3,12 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSONArray; -import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; -import com.casic.missiles.enums.business.MeasureCategoryEnum; import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper; -import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureEquipmentMapper; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataDcPower; -import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataETwo; import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataSpectrumAnalyzer; import com.casic.missiles.model.equipment.BizEquipmentInfo; import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataSpectrumAnalyzer; @@ -36,7 +30,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * @Author: TuT @@ -71,7 +64,6 @@ processCheckAccord(map, request.getLabCode()); readyForCheckParams(map, request.getCheckDataSpectrumAnalyzerList()); replaceSlash(map); - map.put("pdfStatus", 1); //除了选用的模板不一致，模板配置流程是一致的 map.put("surveyor", "{{@surveyor}}"); @@ -274,17 +266,14 @@ list.add(new BizBusinessDeviceMeasureDataSpectrumAnalyzer()); request.setMeasureDataSpectrumAnalyzerList(list); } - DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); readyForCoverParams(map, request.getLabCode()); - List analyzerList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataSpectrumAnalyzer spectrumAnalyzer : request.getMeasureDataSpectrumAnalyzerList()) { BizBusinessDeviceMeasureDataSpectrumAnalyzer analyzer = (BizBusinessDeviceMeasureDataSpectrumAnalyzer) BeanUtils.cloneBean(spectrumAnalyzer); analyzerList.add(analyzer); } - //准备填充参数 readyForMeasureParams(map, analyzerList); //替换/方法 @@ -300,6 +289,9 @@ String originalWordUrlFile = printFileRegister.registerPrintFile(SPECTRUM_ANALYZER, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); + if (StringUtils.isEmpty(originalWordUrlFile)) { + return urlList; + } urlList.add(originalWordUrlFile); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); @@ -494,11 +486,6 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - //过滤不能生成证书的 - if (checkOutUnablePrint(request)) { - log.debug("该报告没有证书报告"); - return null; - } if (CollectionUtils.isEmpty(request.getMeasureDataSpectrumAnalyzerList())) { List list = new ArrayList<>(); list.add(new BizBusinessDeviceMeasureDataSpectrumAnalyzer()); @@ -506,7 +493,7 @@ } DictCodeUtils.convertDictCodeToName(request); Map map = BeanUtil.beanToMap(request); - readyForCoverParams(map, request.getLabCode()); + String customUrl = readyForCoverParams(map, request.getLabCode()); List analyzerList = new ArrayList<>(); for (BizBusinessDeviceMeasureDataSpectrumAnalyzer spectrumAnalyzer : request.getMeasureDataSpectrumAnalyzerList()) { BizBusinessDeviceMeasureDataSpectrumAnalyzer analyzer = (BizBusinessDeviceMeasureDataSpectrumAnalyzer) BeanUtils.cloneBean(spectrumAnalyzer); @@ -517,7 +504,8 @@ List customTemplateUrls = new ArrayList<>(); log.debug("--------get Certificate template is ...."); //查询对应封面模板和检定证书模板 - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : + bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(SPECTRUM_ANALYZER, "2", request.getItemCategoryName())); SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); @@ -526,6 +514,9 @@ //除了选用的模板不一致，模板配置流程是一致的 log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(SPECTRUM_ANALYZER, "证书打印", null, map, false, null, customTemplateUrls); + if (StringUtils.isEmpty(wordUrl)) { + return urlList; + } urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl"));