diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index a6f2a77..e6c7011 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -68,6 +68,7 @@ saveResponse.setCertNo(certNo); } finally { if (saveResponse == null) { + log.debug("执行证书记录删除操作...."); //生成证书失败，删除保存的记录 this.baseMapper.deleteById(request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index a6f2a77..e6c7011 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -68,6 +68,7 @@ saveResponse.setCertNo(certNo); } finally { if (saveResponse == null) { + log.debug("执行证书记录删除操作...."); //生成证书失败，删除保存的记录 this.baseMapper.deleteById(request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index 871ddd6..11a0e46 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -14,6 +14,7 @@ import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.SpringContextUtil; +import com.gexin.fastjson.JSON; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -76,9 +77,9 @@ * @param oldCertificateFile */ public void excuteMeasureTaskAsyn(Map map, Long id, String oldCertificateFile) { - ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100, + ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100, TimeUnit.SECONDS, new LinkedBlockingQueue<>(2)); - log.info("measure data is check,please wait ..."); + log.info("measure data is check,please wait ..."); List customTemplateUrls = new ArrayList<>(); customTemplateUrls.add(oldCertificateFile); //生成证书报告的,需要改变为动态选择性 @@ -150,11 +151,9 @@ ThreadPoolExecutor threadPool = new ThreadPoolExecutor(2, 2, 100, TimeUnit.SECONDS, new LinkedBlockingQueue<>(2)); StandardEquipmentPrint equipmentPrint = getStandardEquipmentPrint(request); - log.info("---111111111"); //生成证书报告的 CompletableFuture> certificateFutureTask = CompletableFuture.supplyAsync( () -> equipmentPrint.doCreateCertificateFile(request), threadPool); - log.info("--------222222222"); //生成原始记录的线程 CompletableFuture originalFutureTask = CompletableFuture.supplyAsync( () -> equipmentPrint.doCreateOriginalFile(request), threadPool); @@ -165,8 +164,8 @@ //获取结果 List certificateFileUrl = certificateFutureTask.join(); String originalRecordFileUrl = originalFutureTask.join(); + log.debug("----------------get result orign is {},certificate is {}", originalRecordFileUrl, certificateFileUrl); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); - log.info("----------------get result orign is {},certificate is {}",originalRecordFileUrl,certificateFileUrl); if (CollectionUtils.isNotEmpty(certificateFileUrl) || StringUtils.isNotEmpty(originalRecordFileUrl)) { //生成证书文件 if (CollectionUtils.isNotEmpty(certificateFileUrl)) { @@ -177,16 +176,18 @@ request.setOriginalRecordFile(originalRecordFileUrl); //更新记录 int updateFlag = bizBusinessMapper.updateById(request); + log.debug("----------------update flag {}", updateFlag); Assert.isFalse(updateFlag <= 0, () -> { throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); }); } else { + log.debug("----------------delete is{}", originalFutureTask.join()); //生成证书失败，删除保存的记录 bizBusinessMapper.deleteById(request); throw new BusinessException(BusinessExceptionEnum.MEASURE_FILE_CREATE_FAILED); } } catch (Exception ex) { - log.info("---- data is exception， this is {}", ex); + log.debug("---- data is exception，ex this is {}", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_GET_FAILED); } }).join(); @@ -198,7 +199,7 @@ * @param request * @return */ - private StandardEquipmentPrint getStandardEquipmentPrint(BizBusinessDeviceMeasureApproval request) { + private StandardEquipmentPrint getStandardEquipmentPrint(BizBusinessDeviceMeasureApproval request) { //标准装置判别 if (ObjectUtils.isEmpty(request) || StringUtils.isEmpty(request.getBelongStandardEquipment())) { throw new BusinessException(BusinessExceptionEnum.MEASURE_STANDARD_IS_NULL); @@ -208,6 +209,7 @@ throw new BusinessException(BusinessExceptionEnum.MEASURE_ITEM_ID_IS_NULL); } StandardEquipmentPrint standardEquipmentPrint = SpringContextUtil.getBean(request.getBelongStandardEquipment()); + return standardEquipmentPrint; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index a6f2a77..e6c7011 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -68,6 +68,7 @@ saveResponse.setCertNo(certNo); } finally { if (saveResponse == null) { + log.debug("执行证书记录删除操作...."); //生成证书失败，删除保存的记录 this.baseMapper.deleteById(request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index 871ddd6..11a0e46 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -14,6 +14,7 @@ import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.SpringContextUtil; +import com.gexin.fastjson.JSON; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -76,9 +77,9 @@ * @param oldCertificateFile */ public void excuteMeasureTaskAsyn(Map map, Long id, String oldCertificateFile) { - ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100, + ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100, TimeUnit.SECONDS, new LinkedBlockingQueue<>(2)); - log.info("measure data is check,please wait ..."); + log.info("measure data is check,please wait ..."); List customTemplateUrls = new ArrayList<>(); customTemplateUrls.add(oldCertificateFile); //生成证书报告的,需要改变为动态选择性 @@ -150,11 +151,9 @@ ThreadPoolExecutor threadPool = new ThreadPoolExecutor(2, 2, 100, TimeUnit.SECONDS, new LinkedBlockingQueue<>(2)); StandardEquipmentPrint equipmentPrint = getStandardEquipmentPrint(request); - log.info("---111111111"); //生成证书报告的 CompletableFuture> certificateFutureTask = CompletableFuture.supplyAsync( () -> equipmentPrint.doCreateCertificateFile(request), threadPool); - log.info("--------222222222"); //生成原始记录的线程 CompletableFuture originalFutureTask = CompletableFuture.supplyAsync( () -> equipmentPrint.doCreateOriginalFile(request), threadPool); @@ -165,8 +164,8 @@ //获取结果 List certificateFileUrl = certificateFutureTask.join(); String originalRecordFileUrl = originalFutureTask.join(); + log.debug("----------------get result orign is {},certificate is {}", originalRecordFileUrl, certificateFileUrl); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); - log.info("----------------get result orign is {},certificate is {}",originalRecordFileUrl,certificateFileUrl); if (CollectionUtils.isNotEmpty(certificateFileUrl) || StringUtils.isNotEmpty(originalRecordFileUrl)) { //生成证书文件 if (CollectionUtils.isNotEmpty(certificateFileUrl)) { @@ -177,16 +176,18 @@ request.setOriginalRecordFile(originalRecordFileUrl); //更新记录 int updateFlag = bizBusinessMapper.updateById(request); + log.debug("----------------update flag {}", updateFlag); Assert.isFalse(updateFlag <= 0, () -> { throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); }); } else { + log.debug("----------------delete is{}", originalFutureTask.join()); //生成证书失败，删除保存的记录 bizBusinessMapper.deleteById(request); throw new BusinessException(BusinessExceptionEnum.MEASURE_FILE_CREATE_FAILED); } } catch (Exception ex) { - log.info("---- data is exception， this is {}", ex); + log.debug("---- data is exception，ex this is {}", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_GET_FAILED); } }).join(); @@ -198,7 +199,7 @@ * @param request * @return */ - private StandardEquipmentPrint getStandardEquipmentPrint(BizBusinessDeviceMeasureApproval request) { + private StandardEquipmentPrint getStandardEquipmentPrint(BizBusinessDeviceMeasureApproval request) { //标准装置判别 if (ObjectUtils.isEmpty(request) || StringUtils.isEmpty(request.getBelongStandardEquipment())) { throw new BusinessException(BusinessExceptionEnum.MEASURE_STANDARD_IS_NULL); @@ -208,6 +209,7 @@ throw new BusinessException(BusinessExceptionEnum.MEASURE_ITEM_ID_IS_NULL); } StandardEquipmentPrint standardEquipmentPrint = SpringContextUtil.getBean(request.getBelongStandardEquipment()); + return standardEquipmentPrint; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java index 81469e2..8db19d6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java @@ -120,16 +120,19 @@ prepareCoverParams(map, measureItemInfo.getLabCode()); //定制化原始记录参数 prepareCustomCoverParams(map, measureItemInfo.getMeasureDataCalibratorList()); - log.info("--------生成原始记录，获取模板"); + log.debug("--------get original template is"); //这一块逻辑比较复杂 customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "1", measureItemInfo.getItemCategoryName())); //与证书模板区分 SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); - log.info("------------生成原始记录前"); + log.debug("original before ----"); //除了选用的模板不一致，模板配置流程是一致的 - return printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, customTemplateUrls); + String originalUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, customTemplateUrls); + log.debug("originalUrlFile after------------{}", originalUrlFile); + return originalUrlFile; } catch (Exception ex) { + log.debug("doCreateCertificateFile Exception is------------{}", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } } @@ -145,7 +148,7 @@ try { //过滤不能生成证书的 if (checkOutUnablePrint(measureItemInfo)) { - log.warn("该报告没有证书报告"); + log.debug("该报告没有证书报告"); return null; } if (CollectionUtil.isEmpty(measureItemInfo.getMeasureDataCalibratorList())) { @@ -158,7 +161,7 @@ prepareCoverParams(map, measureItemInfo.getLabCode()); List customTemplateUrls = new ArrayList<>(); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); - log.info("--------生成证书报告，获取模板"); + log.debug("--------get Certificate template is ...."); //这一块逻辑比较复杂 customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", measureItemInfo.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", "数字记录表内容")); @@ -168,14 +171,16 @@ List urlList = new ArrayList<>(); PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); //除了选用的模板不一致，模板配置流程是一致的 - log.info("------------生成证书报告前"); + log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(MEASURE_DATA, "证书打印", null, map, false, null, customTemplateUrls); urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); } + log.debug("certificate after------------{}", wordUrl); return urlList; } catch (Exception ex) { + log.debug("doCreateCertificateFile Exception is------------{}", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index a6f2a77..e6c7011 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -68,6 +68,7 @@ saveResponse.setCertNo(certNo); } finally { if (saveResponse == null) { + log.debug("执行证书记录删除操作...."); //生成证书失败，删除保存的记录 this.baseMapper.deleteById(request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index 871ddd6..11a0e46 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -14,6 +14,7 @@ import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.SpringContextUtil; +import com.gexin.fastjson.JSON; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -76,9 +77,9 @@ * @param oldCertificateFile */ public void excuteMeasureTaskAsyn(Map map, Long id, String oldCertificateFile) { - ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100, + ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100, TimeUnit.SECONDS, new LinkedBlockingQueue<>(2)); - log.info("measure data is check,please wait ..."); + log.info("measure data is check,please wait ..."); List customTemplateUrls = new ArrayList<>(); customTemplateUrls.add(oldCertificateFile); //生成证书报告的,需要改变为动态选择性 @@ -150,11 +151,9 @@ ThreadPoolExecutor threadPool = new ThreadPoolExecutor(2, 2, 100, TimeUnit.SECONDS, new LinkedBlockingQueue<>(2)); StandardEquipmentPrint equipmentPrint = getStandardEquipmentPrint(request); - log.info("---111111111"); //生成证书报告的 CompletableFuture> certificateFutureTask = CompletableFuture.supplyAsync( () -> equipmentPrint.doCreateCertificateFile(request), threadPool); - log.info("--------222222222"); //生成原始记录的线程 CompletableFuture originalFutureTask = CompletableFuture.supplyAsync( () -> equipmentPrint.doCreateOriginalFile(request), threadPool); @@ -165,8 +164,8 @@ //获取结果 List certificateFileUrl = certificateFutureTask.join(); String originalRecordFileUrl = originalFutureTask.join(); + log.debug("----------------get result orign is {},certificate is {}", originalRecordFileUrl, certificateFileUrl); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); - log.info("----------------get result orign is {},certificate is {}",originalRecordFileUrl,certificateFileUrl); if (CollectionUtils.isNotEmpty(certificateFileUrl) || StringUtils.isNotEmpty(originalRecordFileUrl)) { //生成证书文件 if (CollectionUtils.isNotEmpty(certificateFileUrl)) { @@ -177,16 +176,18 @@ request.setOriginalRecordFile(originalRecordFileUrl); //更新记录 int updateFlag = bizBusinessMapper.updateById(request); + log.debug("----------------update flag {}", updateFlag); Assert.isFalse(updateFlag <= 0, () -> { throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); }); } else { + log.debug("----------------delete is{}", originalFutureTask.join()); //生成证书失败，删除保存的记录 bizBusinessMapper.deleteById(request); throw new BusinessException(BusinessExceptionEnum.MEASURE_FILE_CREATE_FAILED); } } catch (Exception ex) { - log.info("---- data is exception， this is {}", ex); + log.debug("---- data is exception，ex this is {}", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_GET_FAILED); } }).join(); @@ -198,7 +199,7 @@ * @param request * @return */ - private StandardEquipmentPrint getStandardEquipmentPrint(BizBusinessDeviceMeasureApproval request) { + private StandardEquipmentPrint getStandardEquipmentPrint(BizBusinessDeviceMeasureApproval request) { //标准装置判别 if (ObjectUtils.isEmpty(request) || StringUtils.isEmpty(request.getBelongStandardEquipment())) { throw new BusinessException(BusinessExceptionEnum.MEASURE_STANDARD_IS_NULL); @@ -208,6 +209,7 @@ throw new BusinessException(BusinessExceptionEnum.MEASURE_ITEM_ID_IS_NULL); } StandardEquipmentPrint standardEquipmentPrint = SpringContextUtil.getBean(request.getBelongStandardEquipment()); + return standardEquipmentPrint; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java index 81469e2..8db19d6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java @@ -120,16 +120,19 @@ prepareCoverParams(map, measureItemInfo.getLabCode()); //定制化原始记录参数 prepareCustomCoverParams(map, measureItemInfo.getMeasureDataCalibratorList()); - log.info("--------生成原始记录，获取模板"); + log.debug("--------get original template is"); //这一块逻辑比较复杂 customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "1", measureItemInfo.getItemCategoryName())); //与证书模板区分 SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); - log.info("------------生成原始记录前"); + log.debug("original before ----"); //除了选用的模板不一致，模板配置流程是一致的 - return printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, customTemplateUrls); + String originalUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, customTemplateUrls); + log.debug("originalUrlFile after------------{}", originalUrlFile); + return originalUrlFile; } catch (Exception ex) { + log.debug("doCreateCertificateFile Exception is------------{}", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } } @@ -145,7 +148,7 @@ try { //过滤不能生成证书的 if (checkOutUnablePrint(measureItemInfo)) { - log.warn("该报告没有证书报告"); + log.debug("该报告没有证书报告"); return null; } if (CollectionUtil.isEmpty(measureItemInfo.getMeasureDataCalibratorList())) { @@ -158,7 +161,7 @@ prepareCoverParams(map, measureItemInfo.getLabCode()); List customTemplateUrls = new ArrayList<>(); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); - log.info("--------生成证书报告，获取模板"); + log.debug("--------get Certificate template is ...."); //这一块逻辑比较复杂 customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", measureItemInfo.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", "数字记录表内容")); @@ -168,14 +171,16 @@ List urlList = new ArrayList<>(); PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); //除了选用的模板不一致，模板配置流程是一致的 - log.info("------------生成证书报告前"); + log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(MEASURE_DATA, "证书打印", null, map, false, null, customTemplateUrls); urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); } + log.debug("certificate after------------{}", wordUrl); return urlList; } catch (Exception ex) { + log.debug("doCreateCertificateFile Exception is------------{}", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java index 8ca3a0e..209260e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java @@ -62,25 +62,28 @@ log.debug("执行完填充参数操作......"); if (CollectionUtils.isNotEmpty(filePrintRegister.getElectronicImageList())) { try { + //按关键字进行分组 Map> sameKeyWordSealMaps = filePrintRegister.getElectronicImageList().stream() .filter(electronicImage -> StringUtils.isNotEmpty(electronicImage.getKeyWord())) .collect( Collectors.groupingBy(ElectronicImage::getKeyWord) ); + log.debug("执行关键字打合成操作,打印配置为{}.......", JSON.toJSON(sameKeyWordSealMaps)); //3、根据关键字进行添加签章和签字 selectSeal = addSameKeyWordStamp(wordOldUrl, wordOldUrl, sameKeyWordSealMaps); //获取没有关键字的图片，即绝对路径的图片 List absolutePathImageList = filePrintRegister.getElectronicImageList().stream() .filter(electronicImage -> StringUtils.isEmpty(electronicImage.getKeyWord())) .collect(Collectors.toList()); + log.debug("执行绝对打合成操作,打印配置为{}.......", JSON.toJSON(absolutePathImageList)); //根据设置的绝对路径进行图片的填充 addAbsolutePathStamp(wordOldUrl, wordOldUrl, absolutePathImageList); - }catch (Exception ex){ - log.error("关键字异常，异常信息{}",ex); + } catch (Exception ex) { + log.error("关键字异常，异常信息{}", ex); } } - log.debug("执行完路径设置操作操作"); + log.debug("执行完路径设置操作"); //如果有骑缝章新增骑缝章 return checkExtendSeal(wordOldUrl, selectSeal, filePrintRegister); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index a6f2a77..e6c7011 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -68,6 +68,7 @@ saveResponse.setCertNo(certNo); } finally { if (saveResponse == null) { + log.debug("执行证书记录删除操作...."); //生成证书失败，删除保存的记录 this.baseMapper.deleteById(request); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index 871ddd6..11a0e46 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -14,6 +14,7 @@ import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.SpringContextUtil; +import com.gexin.fastjson.JSON; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -76,9 +77,9 @@ * @param oldCertificateFile */ public void excuteMeasureTaskAsyn(Map map, Long id, String oldCertificateFile) { - ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100, + ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100, TimeUnit.SECONDS, new LinkedBlockingQueue<>(2)); - log.info("measure data is check,please wait ..."); + log.info("measure data is check,please wait ..."); List customTemplateUrls = new ArrayList<>(); customTemplateUrls.add(oldCertificateFile); //生成证书报告的,需要改变为动态选择性 @@ -150,11 +151,9 @@ ThreadPoolExecutor threadPool = new ThreadPoolExecutor(2, 2, 100, TimeUnit.SECONDS, new LinkedBlockingQueue<>(2)); StandardEquipmentPrint equipmentPrint = getStandardEquipmentPrint(request); - log.info("---111111111"); //生成证书报告的 CompletableFuture> certificateFutureTask = CompletableFuture.supplyAsync( () -> equipmentPrint.doCreateCertificateFile(request), threadPool); - log.info("--------222222222"); //生成原始记录的线程 CompletableFuture originalFutureTask = CompletableFuture.supplyAsync( () -> equipmentPrint.doCreateOriginalFile(request), threadPool); @@ -165,8 +164,8 @@ //获取结果 List certificateFileUrl = certificateFutureTask.join(); String originalRecordFileUrl = originalFutureTask.join(); + log.debug("----------------get result orign is {},certificate is {}", originalRecordFileUrl, certificateFileUrl); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); - log.info("----------------get result orign is {},certificate is {}",originalRecordFileUrl,certificateFileUrl); if (CollectionUtils.isNotEmpty(certificateFileUrl) || StringUtils.isNotEmpty(originalRecordFileUrl)) { //生成证书文件 if (CollectionUtils.isNotEmpty(certificateFileUrl)) { @@ -177,16 +176,18 @@ request.setOriginalRecordFile(originalRecordFileUrl); //更新记录 int updateFlag = bizBusinessMapper.updateById(request); + log.debug("----------------update flag {}", updateFlag); Assert.isFalse(updateFlag <= 0, () -> { throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); }); } else { + log.debug("----------------delete is{}", originalFutureTask.join()); //生成证书失败，删除保存的记录 bizBusinessMapper.deleteById(request); throw new BusinessException(BusinessExceptionEnum.MEASURE_FILE_CREATE_FAILED); } } catch (Exception ex) { - log.info("---- data is exception， this is {}", ex); + log.debug("---- data is exception，ex this is {}", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_GET_FAILED); } }).join(); @@ -198,7 +199,7 @@ * @param request * @return */ - private StandardEquipmentPrint getStandardEquipmentPrint(BizBusinessDeviceMeasureApproval request) { + private StandardEquipmentPrint getStandardEquipmentPrint(BizBusinessDeviceMeasureApproval request) { //标准装置判别 if (ObjectUtils.isEmpty(request) || StringUtils.isEmpty(request.getBelongStandardEquipment())) { throw new BusinessException(BusinessExceptionEnum.MEASURE_STANDARD_IS_NULL); @@ -208,6 +209,7 @@ throw new BusinessException(BusinessExceptionEnum.MEASURE_ITEM_ID_IS_NULL); } StandardEquipmentPrint standardEquipmentPrint = SpringContextUtil.getBean(request.getBelongStandardEquipment()); + return standardEquipmentPrint; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java index 81469e2..8db19d6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java @@ -120,16 +120,19 @@ prepareCoverParams(map, measureItemInfo.getLabCode()); //定制化原始记录参数 prepareCustomCoverParams(map, measureItemInfo.getMeasureDataCalibratorList()); - log.info("--------生成原始记录，获取模板"); + log.debug("--------get original template is"); //这一块逻辑比较复杂 customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "1", measureItemInfo.getItemCategoryName())); //与证书模板区分 SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); - log.info("------------生成原始记录前"); + log.debug("original before ----"); //除了选用的模板不一致，模板配置流程是一致的 - return printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, customTemplateUrls); + String originalUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, customTemplateUrls); + log.debug("originalUrlFile after------------{}", originalUrlFile); + return originalUrlFile; } catch (Exception ex) { + log.debug("doCreateCertificateFile Exception is------------{}", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } } @@ -145,7 +148,7 @@ try { //过滤不能生成证书的 if (checkOutUnablePrint(measureItemInfo)) { - log.warn("该报告没有证书报告"); + log.debug("该报告没有证书报告"); return null; } if (CollectionUtil.isEmpty(measureItemInfo.getMeasureDataCalibratorList())) { @@ -158,7 +161,7 @@ prepareCoverParams(map, measureItemInfo.getLabCode()); List customTemplateUrls = new ArrayList<>(); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); - log.info("--------生成证书报告，获取模板"); + log.debug("--------get Certificate template is ...."); //这一块逻辑比较复杂 customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", measureItemInfo.getMeasureCategoryName())); customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", "数字记录表内容")); @@ -168,14 +171,16 @@ List urlList = new ArrayList<>(); PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); //除了选用的模板不一致，模板配置流程是一致的 - log.info("------------生成证书报告前"); + log.debug("certificate before------------"); String wordUrl = printFileRegister.registerPrintFile(MEASURE_DATA, "证书打印", null, map, false, null, customTemplateUrls); urlList.add(wordUrl); if (map.containsKey("pdfUrl")) { urlList.add((String) map.get("pdfUrl")); } + log.debug("certificate after------------{}", wordUrl); return urlList; } catch (Exception ex) { + log.debug("doCreateCertificateFile Exception is------------{}", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java index 8ca3a0e..209260e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java @@ -62,25 +62,28 @@ log.debug("执行完填充参数操作......"); if (CollectionUtils.isNotEmpty(filePrintRegister.getElectronicImageList())) { try { + //按关键字进行分组 Map> sameKeyWordSealMaps = filePrintRegister.getElectronicImageList().stream() .filter(electronicImage -> StringUtils.isNotEmpty(electronicImage.getKeyWord())) .collect( Collectors.groupingBy(ElectronicImage::getKeyWord) ); + log.debug("执行关键字打合成操作,打印配置为{}.......", JSON.toJSON(sameKeyWordSealMaps)); //3、根据关键字进行添加签章和签字 selectSeal = addSameKeyWordStamp(wordOldUrl, wordOldUrl, sameKeyWordSealMaps); //获取没有关键字的图片，即绝对路径的图片 List absolutePathImageList = filePrintRegister.getElectronicImageList().stream() .filter(electronicImage -> StringUtils.isEmpty(electronicImage.getKeyWord())) .collect(Collectors.toList()); + log.debug("执行绝对打合成操作,打印配置为{}.......", JSON.toJSON(absolutePathImageList)); //根据设置的绝对路径进行图片的填充 addAbsolutePathStamp(wordOldUrl, wordOldUrl, absolutePathImageList); - }catch (Exception ex){ - log.error("关键字异常，异常信息{}",ex); + } catch (Exception ex) { + log.error("关键字异常，异常信息{}", ex); } } - log.debug("执行完路径设置操作操作"); + log.debug("执行完路径设置操作"); //如果有骑缝章新增骑缝章 return checkExtendSeal(wordOldUrl, selectSeal, filePrintRegister); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java index 08fdbfc..b9254c5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java @@ -91,12 +91,12 @@ downTemplateFile(fileName, tempLocalFileDir); } } - log.debug("执行结束下载操作,下载内容为{}", JSON.toJSON(filePrintRegister.getBeDownloadedFileNames())); + log.debug("执行结束下载操作,下载内容为{},自定义下载内容为{}", JSON.toJSON(filePrintRegister.getBeDownloadedFileNames()), + JSON.toJSON(customTemplateUrls)); String printDocUrl = null, miniName = ""; //合并注册 try { printDocUrl = FilePrintRegisterUtils.filePrintGenerate(filePrintRegister); - //当有骑缝章，强制执行为word文档 if (isPdf && printDocUrl.contains("docx")) { //默认转为docx，只需要进行docx的替换即可 @@ -110,6 +110,7 @@ miniName = createResponseFileInput(pdfNewUrl, response); customParam.put("pdfUrl", miniName); } + log.debug("证书名称{}......",miniName); } catch (RuntimeException rex) { log.error("文件打印出现异常，打印参数信息为{}，异常信息为{}", JSON.toJSON(filePrintRegister), rex); } finally { @@ -120,7 +121,8 @@ //删除无效的文件 File invalidFile = new File(tempLocalFileDir); //删除运行空间下的文件 -// deleteFile(invalidFile); + deleteFile(invalidFile); + log.debug("证书打印完成......，证书名称为{}",miniName); } return miniName; }