diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java index 52b47e5..f7caa62 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java @@ -1,13 +1,6 @@ package com.casic.missiles.enums.business; public interface FilePrintTypeEnum { - - // 自有设备内部检校证书 - String CALIBRATION_CERTIFICATE = "样品内部检校证书"; - // 自有设备外包证书 - String TEST_REPORT = "样品外包证书"; - String EXTERNAL_CALIBRATION_FILE = "外检检定"; - // 自有设备溯源证书 - String EXTERNAL_ENVIRONMENTAL_RECORD = "现场记录"; - + String TEST_REPORT = "1"; + String CALIBRATION_CERTIFICATE = "2"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java index 52b47e5..f7caa62 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java @@ -1,13 +1,6 @@ package com.casic.missiles.enums.business; public interface FilePrintTypeEnum { - - // 自有设备内部检校证书 - String CALIBRATION_CERTIFICATE = "样品内部检校证书"; - // 自有设备外包证书 - String TEST_REPORT = "样品外包证书"; - String EXTERNAL_CALIBRATION_FILE = "外检检定"; - // 自有设备溯源证书 - String EXTERNAL_ENVIRONMENTAL_RECORD = "现场记录"; - + String TEST_REPORT = "1"; + String CALIBRATION_CERTIFICATE = "2"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java index 40a6e80..a17b733 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java @@ -10,8 +10,6 @@ { put(CALIBRATION_CERTIFICATE, CALIBRATION_CERTIFICATE_BEAN); //校准证书 put(TEST_REPORT, TEST_REPORT_BEAN); //测试报告 - put(EXTERNAL_CALIBRATION_FILE, EXTERNAL_CALIBRATION_FILE_BEAN); //现场检测报告 - put(EXTERNAL_ENVIRONMENTAL_RECORD, EXTERNAL_ENVIRONMENTAL_RECORD_BEAN); //现场记录单 } }); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java index 52b47e5..f7caa62 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java @@ -1,13 +1,6 @@ package com.casic.missiles.enums.business; public interface FilePrintTypeEnum { - - // 自有设备内部检校证书 - String CALIBRATION_CERTIFICATE = "样品内部检校证书"; - // 自有设备外包证书 - String TEST_REPORT = "样品外包证书"; - String EXTERNAL_CALIBRATION_FILE = "外检检定"; - // 自有设备溯源证书 - String EXTERNAL_ENVIRONMENTAL_RECORD = "现场记录"; - + String TEST_REPORT = "1"; + String CALIBRATION_CERTIFICATE = "2"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java index 40a6e80..a17b733 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java @@ -10,8 +10,6 @@ { put(CALIBRATION_CERTIFICATE, CALIBRATION_CERTIFICATE_BEAN); //校准证书 put(TEST_REPORT, TEST_REPORT_BEAN); //测试报告 - put(EXTERNAL_CALIBRATION_FILE, EXTERNAL_CALIBRATION_FILE_BEAN); //现场检测报告 - put(EXTERNAL_ENVIRONMENTAL_RECORD, EXTERNAL_ENVIRONMENTAL_RECORD_BEAN); //现场记录单 } }); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java index 9453477..099faae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java @@ -3,7 +3,7 @@ public interface PrintFileDataBeanNameAliasEnum { //校准证书 - String CALIBRATION_CERTIFICATE_BEAN="calibration"; + String CALIBRATION_CERTIFICATE_BEAN = "calibration"; //检测报告 String TEST_REPORT_BEAN = "testingReport"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java index 52b47e5..f7caa62 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java @@ -1,13 +1,6 @@ package com.casic.missiles.enums.business; public interface FilePrintTypeEnum { - - // 自有设备内部检校证书 - String CALIBRATION_CERTIFICATE = "样品内部检校证书"; - // 自有设备外包证书 - String TEST_REPORT = "样品外包证书"; - String EXTERNAL_CALIBRATION_FILE = "外检检定"; - // 自有设备溯源证书 - String EXTERNAL_ENVIRONMENTAL_RECORD = "现场记录"; - + String TEST_REPORT = "1"; + String CALIBRATION_CERTIFICATE = "2"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java index 40a6e80..a17b733 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java @@ -10,8 +10,6 @@ { put(CALIBRATION_CERTIFICATE, CALIBRATION_CERTIFICATE_BEAN); //校准证书 put(TEST_REPORT, TEST_REPORT_BEAN); //测试报告 - put(EXTERNAL_CALIBRATION_FILE, EXTERNAL_CALIBRATION_FILE_BEAN); //现场检测报告 - put(EXTERNAL_ENVIRONMENTAL_RECORD, EXTERNAL_ENVIRONMENTAL_RECORD_BEAN); //现场记录单 } }); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java index 9453477..099faae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java @@ -3,7 +3,7 @@ public interface PrintFileDataBeanNameAliasEnum { //校准证书 - String CALIBRATION_CERTIFICATE_BEAN="calibration"; + String CALIBRATION_CERTIFICATE_BEAN = "calibration"; //检测报告 String TEST_REPORT_BEAN = "testingReport"; diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index 63bca23..e39a259 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -8,6 +8,7 @@ + @@ -18,7 +19,7 @@ - id, template_no, template_name, template_type, template_desc, template_creator, minio_file_name, is_del, create_time, update_time + id, template_no, template_name, template_type, certification_type, template_desc, template_creator, minio_file_name, is_del, create_time, update_time diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java index 52b47e5..f7caa62 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java @@ -1,13 +1,6 @@ package com.casic.missiles.enums.business; public interface FilePrintTypeEnum { - - // 自有设备内部检校证书 - String CALIBRATION_CERTIFICATE = "样品内部检校证书"; - // 自有设备外包证书 - String TEST_REPORT = "样品外包证书"; - String EXTERNAL_CALIBRATION_FILE = "外检检定"; - // 自有设备溯源证书 - String EXTERNAL_ENVIRONMENTAL_RECORD = "现场记录"; - + String TEST_REPORT = "1"; + String CALIBRATION_CERTIFICATE = "2"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java index 40a6e80..a17b733 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java @@ -10,8 +10,6 @@ { put(CALIBRATION_CERTIFICATE, CALIBRATION_CERTIFICATE_BEAN); //校准证书 put(TEST_REPORT, TEST_REPORT_BEAN); //测试报告 - put(EXTERNAL_CALIBRATION_FILE, EXTERNAL_CALIBRATION_FILE_BEAN); //现场检测报告 - put(EXTERNAL_ENVIRONMENTAL_RECORD, EXTERNAL_ENVIRONMENTAL_RECORD_BEAN); //现场记录单 } }); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java index 9453477..099faae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java @@ -3,7 +3,7 @@ public interface PrintFileDataBeanNameAliasEnum { //校准证书 - String CALIBRATION_CERTIFICATE_BEAN="calibration"; + String CALIBRATION_CERTIFICATE_BEAN = "calibration"; //检测报告 String TEST_REPORT_BEAN = "testingReport"; diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index 63bca23..e39a259 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -8,6 +8,7 @@ + @@ -18,7 +19,7 @@ - id, template_no, template_name, template_type, template_desc, template_creator, minio_file_name, is_del, create_time, update_time + id, template_no, template_name, template_type, certification_type, template_desc, template_creator, minio_file_name, is_del, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java index 0a4ec1b..868776e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -70,6 +70,10 @@ @TableField("template_type") private String templateType; + @ApiModelProperty(value = "证书类别（证书报告）-字典code", dataType = "String") + @TableField("certification_type") + private String certificationType; + /** * 模板描述 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java index 52b47e5..f7caa62 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java @@ -1,13 +1,6 @@ package com.casic.missiles.enums.business; public interface FilePrintTypeEnum { - - // 自有设备内部检校证书 - String CALIBRATION_CERTIFICATE = "样品内部检校证书"; - // 自有设备外包证书 - String TEST_REPORT = "样品外包证书"; - String EXTERNAL_CALIBRATION_FILE = "外检检定"; - // 自有设备溯源证书 - String EXTERNAL_ENVIRONMENTAL_RECORD = "现场记录"; - + String TEST_REPORT = "1"; + String CALIBRATION_CERTIFICATE = "2"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java index 40a6e80..a17b733 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java @@ -10,8 +10,6 @@ { put(CALIBRATION_CERTIFICATE, CALIBRATION_CERTIFICATE_BEAN); //校准证书 put(TEST_REPORT, TEST_REPORT_BEAN); //测试报告 - put(EXTERNAL_CALIBRATION_FILE, EXTERNAL_CALIBRATION_FILE_BEAN); //现场检测报告 - put(EXTERNAL_ENVIRONMENTAL_RECORD, EXTERNAL_ENVIRONMENTAL_RECORD_BEAN); //现场记录单 } }); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java index 9453477..099faae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java @@ -3,7 +3,7 @@ public interface PrintFileDataBeanNameAliasEnum { //校准证书 - String CALIBRATION_CERTIFICATE_BEAN="calibration"; + String CALIBRATION_CERTIFICATE_BEAN = "calibration"; //检测报告 String TEST_REPORT_BEAN = "testingReport"; diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index 63bca23..e39a259 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -8,6 +8,7 @@ + @@ -18,7 +19,7 @@ - id, template_no, template_name, template_type, template_desc, template_creator, minio_file_name, is_del, create_time, update_time + id, template_no, template_name, template_type, certification_type, template_desc, template_creator, minio_file_name, is_del, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java index 0a4ec1b..868776e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -70,6 +70,10 @@ @TableField("template_type") private String templateType; + @ApiModelProperty(value = "证书类别（证书报告）-字典code", dataType = "String") + @TableField("certification_type") + private String certificationType; + /** * 模板描述 */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java index cfddc29..609341d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java @@ -86,10 +86,10 @@ if (ObjectUtil.isNotEmpty(siteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && siteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) { siteExecutiveEquipmentRelationService.saveBatch(siteExecutiveLog.getId(), siteExecutiveLog.getSiteExecutiveEquipmentRelationList()); } - ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 30000, - TimeUnit.MILLISECONDS, new LinkedBlockingDeque()); - executor.execute(() -> registerPrintFile(siteExecutiveLog)); - return ReturnUtil.success(); +// ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 30000, +// TimeUnit.MILLISECONDS, new LinkedBlockingDeque()); +// executor.execute(() -> registerPrintFile(siteExecutiveLog)); +// return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @@ -113,12 +113,12 @@ if (ObjectUtil.isNotEmpty(businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) { siteExecutiveEquipmentRelationService.saveBatch(businessSiteExecutiveLog.getId(), businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()); } - ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 30000, - TimeUnit.MILLISECONDS, new LinkedBlockingDeque()); - executor.execute(() -> { - deletePrintFile(businessSiteExecutiveLog.getPrintFileName()); - registerPrintFile(businessSiteExecutiveLog); - }); +// ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 30000, +// TimeUnit.MILLISECONDS, new LinkedBlockingDeque()); +// executor.execute(() -> { +// deletePrintFile(businessSiteExecutiveLog.getPrintFileName()); +// registerPrintFile(businessSiteExecutiveLog); +// }); return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -217,26 +217,26 @@ /** * 增加，修改环境审批单需要进行 */ - private void registerPrintFile(BusinessSiteExecutiveLog siteExecutiveLog) { - //获取证书报告信息 - siteExecutiveLog.setLaboratoryName(this.baseMapper.getLaboratoryName(siteExecutiveLog.getLaboratoryId())); - //进行证书报告生成，并在远程注册服务器注册 - PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); - try { - DictCodeUtils.convertDictCodeToName(siteExecutiveLog); - String printFileName = printFileRegister.registerPrintFile(siteExecutiveLog, FilePrintTypeEnum.EXTERNAL_ENVIRONMENTAL_RECORD); - setSitePrintFileName(siteExecutiveLog.getId(), printFileName); - } catch (Exception ex) { - log.error("打印异常，证书报告信息为{},异常信息为{}", JSONObject.toJSON(siteExecutiveLog), ex); - } - } - - private void setSitePrintFileName(Long id, String printFileName) { - //生成证书打印信息 - BusinessSiteExecutiveLog siteExecutiveLog = new BusinessSiteExecutiveLog(); - siteExecutiveLog.setId(id); - siteExecutiveLog.setPrintFileName(printFileName); - this.baseMapper.updateById(siteExecutiveLog); - } +// private void registerPrintFile(BusinessSiteExecutiveLog siteExecutiveLog) { +// //获取证书报告信息 +// siteExecutiveLog.setLaboratoryName(this.baseMapper.getLaboratoryName(siteExecutiveLog.getLaboratoryId())); +// //进行证书报告生成，并在远程注册服务器注册 +// PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); +// try { +// DictCodeUtils.convertDictCodeToName(siteExecutiveLog); +// String printFileName = printFileRegister.registerPrintFile(siteExecutiveLog, FilePrintTypeEnum.EXTERNAL_ENVIRONMENTAL_RECORD); +// setSitePrintFileName(siteExecutiveLog.getId(), printFileName); +// } catch (Exception ex) { +// log.error("打印异常，证书报告信息为{},异常信息为{}", JSONObject.toJSON(siteExecutiveLog), ex); +// } +// } +// +// private void setSitePrintFileName(Long id, String printFileName) { +// //生成证书打印信息 +// BusinessSiteExecutiveLog siteExecutiveLog = new BusinessSiteExecutiveLog(); +// siteExecutiveLog.setId(id); +// siteExecutiveLog.setPrintFileName(printFileName); +// this.baseMapper.updateById(siteExecutiveLog); +// } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java index 52b47e5..f7caa62 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java @@ -1,13 +1,6 @@ package com.casic.missiles.enums.business; public interface FilePrintTypeEnum { - - // 自有设备内部检校证书 - String CALIBRATION_CERTIFICATE = "样品内部检校证书"; - // 自有设备外包证书 - String TEST_REPORT = "样品外包证书"; - String EXTERNAL_CALIBRATION_FILE = "外检检定"; - // 自有设备溯源证书 - String EXTERNAL_ENVIRONMENTAL_RECORD = "现场记录"; - + String TEST_REPORT = "1"; + String CALIBRATION_CERTIFICATE = "2"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java index 40a6e80..a17b733 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java @@ -10,8 +10,6 @@ { put(CALIBRATION_CERTIFICATE, CALIBRATION_CERTIFICATE_BEAN); //校准证书 put(TEST_REPORT, TEST_REPORT_BEAN); //测试报告 - put(EXTERNAL_CALIBRATION_FILE, EXTERNAL_CALIBRATION_FILE_BEAN); //现场检测报告 - put(EXTERNAL_ENVIRONMENTAL_RECORD, EXTERNAL_ENVIRONMENTAL_RECORD_BEAN); //现场记录单 } }); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java index 9453477..099faae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java @@ -3,7 +3,7 @@ public interface PrintFileDataBeanNameAliasEnum { //校准证书 - String CALIBRATION_CERTIFICATE_BEAN="calibration"; + String CALIBRATION_CERTIFICATE_BEAN = "calibration"; //检测报告 String TEST_REPORT_BEAN = "testingReport"; diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index 63bca23..e39a259 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -8,6 +8,7 @@ + @@ -18,7 +19,7 @@ - id, template_no, template_name, template_type, template_desc, template_creator, minio_file_name, is_del, create_time, update_time + id, template_no, template_name, template_type, certification_type, template_desc, template_creator, minio_file_name, is_del, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java index 0a4ec1b..868776e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -70,6 +70,10 @@ @TableField("template_type") private String templateType; + @ApiModelProperty(value = "证书类别（证书报告）-字典code", dataType = "String") + @TableField("certification_type") + private String certificationType; + /** * 模板描述 */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java index cfddc29..609341d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java @@ -86,10 +86,10 @@ if (ObjectUtil.isNotEmpty(siteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && siteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) { siteExecutiveEquipmentRelationService.saveBatch(siteExecutiveLog.getId(), siteExecutiveLog.getSiteExecutiveEquipmentRelationList()); } - ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 30000, - TimeUnit.MILLISECONDS, new LinkedBlockingDeque()); - executor.execute(() -> registerPrintFile(siteExecutiveLog)); - return ReturnUtil.success(); +// ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 30000, +// TimeUnit.MILLISECONDS, new LinkedBlockingDeque()); +// executor.execute(() -> registerPrintFile(siteExecutiveLog)); +// return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @@ -113,12 +113,12 @@ if (ObjectUtil.isNotEmpty(businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) { siteExecutiveEquipmentRelationService.saveBatch(businessSiteExecutiveLog.getId(), businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()); } - ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 30000, - TimeUnit.MILLISECONDS, new LinkedBlockingDeque()); - executor.execute(() -> { - deletePrintFile(businessSiteExecutiveLog.getPrintFileName()); - registerPrintFile(businessSiteExecutiveLog); - }); +// ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 30000, +// TimeUnit.MILLISECONDS, new LinkedBlockingDeque()); +// executor.execute(() -> { +// deletePrintFile(businessSiteExecutiveLog.getPrintFileName()); +// registerPrintFile(businessSiteExecutiveLog); +// }); return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -217,26 +217,26 @@ /** * 增加，修改环境审批单需要进行 */ - private void registerPrintFile(BusinessSiteExecutiveLog siteExecutiveLog) { - //获取证书报告信息 - siteExecutiveLog.setLaboratoryName(this.baseMapper.getLaboratoryName(siteExecutiveLog.getLaboratoryId())); - //进行证书报告生成，并在远程注册服务器注册 - PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); - try { - DictCodeUtils.convertDictCodeToName(siteExecutiveLog); - String printFileName = printFileRegister.registerPrintFile(siteExecutiveLog, FilePrintTypeEnum.EXTERNAL_ENVIRONMENTAL_RECORD); - setSitePrintFileName(siteExecutiveLog.getId(), printFileName); - } catch (Exception ex) { - log.error("打印异常，证书报告信息为{},异常信息为{}", JSONObject.toJSON(siteExecutiveLog), ex); - } - } - - private void setSitePrintFileName(Long id, String printFileName) { - //生成证书打印信息 - BusinessSiteExecutiveLog siteExecutiveLog = new BusinessSiteExecutiveLog(); - siteExecutiveLog.setId(id); - siteExecutiveLog.setPrintFileName(printFileName); - this.baseMapper.updateById(siteExecutiveLog); - } +// private void registerPrintFile(BusinessSiteExecutiveLog siteExecutiveLog) { +// //获取证书报告信息 +// siteExecutiveLog.setLaboratoryName(this.baseMapper.getLaboratoryName(siteExecutiveLog.getLaboratoryId())); +// //进行证书报告生成，并在远程注册服务器注册 +// PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); +// try { +// DictCodeUtils.convertDictCodeToName(siteExecutiveLog); +// String printFileName = printFileRegister.registerPrintFile(siteExecutiveLog, FilePrintTypeEnum.EXTERNAL_ENVIRONMENTAL_RECORD); +// setSitePrintFileName(siteExecutiveLog.getId(), printFileName); +// } catch (Exception ex) { +// log.error("打印异常，证书报告信息为{},异常信息为{}", JSONObject.toJSON(siteExecutiveLog), ex); +// } +// } +// +// private void setSitePrintFileName(Long id, String printFileName) { +// //生成证书打印信息 +// BusinessSiteExecutiveLog siteExecutiveLog = new BusinessSiteExecutiveLog(); +// siteExecutiveLog.setId(id); +// siteExecutiveLog.setPrintFileName(printFileName); +// this.baseMapper.updateById(siteExecutiveLog); +// } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveInfoEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveInfoEventPostProcessor.java index 7424b78..4b7622f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveInfoEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveInfoEventPostProcessor.java @@ -43,27 +43,26 @@ siteExecutive.setApprovalStatus(ApprovalStatusEnum.PASSED); siteExecutive.setUpdateTime(DateUtil.formatDateTime(new Date())); siteExecutiveInfoMapper.updateById(siteExecutive); - //审批通过 根据模板生成审批单打印样例 - //获取证书报告信息 - siteExecutive = siteExecutiveInfoMapper.selectById(id); - //进行证书报告生成，并在远程注册服务器注册 - PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); - try { - DictCodeUtils.convertDictCodeToName(siteExecutive); - String printFileName = printFileRegister.registerPrintFile(siteExecutive, PrintFileDataBeanNameAliasEnum.EXTERNAL_CALIBRATION_FILE_BEAN); - setSitePrintFileName(siteExecutive.getId(), printFileName, siteExecutiveInfoMapper); - } catch (Exception ex) { - log.error("打印异常，证书报告信息为{},异常信息为{}", JSONObject.toJSON(siteExecutive), ex); - } +// //审批通过 根据模板生成审批单打印样例 +// //获取证书报告信息 +// siteExecutive = siteExecutiveInfoMapper.selectById(id); +// //进行证书报告生成，并在远程注册服务器注册 +// PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); +// try { +// DictCodeUtils.convertDictCodeToName(siteExecutive); +// String printFileName = printFileRegister.registerPrintFile(siteExecutive, PrintFileDataBeanNameAliasEnum.EXTERNAL_CALIBRATION_FILE_BEAN); +// setSitePrintFileName(siteExecutive.getId(), printFileName, siteExecutiveInfoMapper); +// } catch (Exception ex) { +// log.error("打印异常，证书报告信息为{},异常信息为{}", JSONObject.toJSON(siteExecutive), ex); +// } } - private void setSitePrintFileName(Long id, String printFileName, BusinessSiteExecutiveInfoMapper siteExecutiveInfoMapper) { - //生成证书打印信息 - BusinessSiteExecutiveInfo sitePrintFileName = new BusinessSiteExecutiveInfo(); - sitePrintFileName.setId(id); - sitePrintFileName.setPrintFileName(printFileName); - siteExecutiveInfoMapper.updateById(sitePrintFileName); - } - +// private void setSitePrintFileName(Long id, String printFileName, BusinessSiteExecutiveInfoMapper siteExecutiveInfoMapper) { +// //生成证书打印信息 +// BusinessSiteExecutiveInfo sitePrintFileName = new BusinessSiteExecutiveInfo(); +// sitePrintFileName.setId(id); +// sitePrintFileName.setPrintFileName(printFileName); +// siteExecutiveInfoMapper.updateById(sitePrintFileName); +// } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java index 52b47e5..f7caa62 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/FilePrintTypeEnum.java @@ -1,13 +1,6 @@ package com.casic.missiles.enums.business; public interface FilePrintTypeEnum { - - // 自有设备内部检校证书 - String CALIBRATION_CERTIFICATE = "样品内部检校证书"; - // 自有设备外包证书 - String TEST_REPORT = "样品外包证书"; - String EXTERNAL_CALIBRATION_FILE = "外检检定"; - // 自有设备溯源证书 - String EXTERNAL_ENVIRONMENTAL_RECORD = "现场记录"; - + String TEST_REPORT = "1"; + String CALIBRATION_CERTIFICATE = "2"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java index 40a6e80..a17b733 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareFilePrintTypeEnum.java @@ -10,8 +10,6 @@ { put(CALIBRATION_CERTIFICATE, CALIBRATION_CERTIFICATE_BEAN); //校准证书 put(TEST_REPORT, TEST_REPORT_BEAN); //测试报告 - put(EXTERNAL_CALIBRATION_FILE, EXTERNAL_CALIBRATION_FILE_BEAN); //现场检测报告 - put(EXTERNAL_ENVIRONMENTAL_RECORD, EXTERNAL_ENVIRONMENTAL_RECORD_BEAN); //现场记录单 } }); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java index 9453477..099faae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/PrintFileDataBeanNameAliasEnum.java @@ -3,7 +3,7 @@ public interface PrintFileDataBeanNameAliasEnum { //校准证书 - String CALIBRATION_CERTIFICATE_BEAN="calibration"; + String CALIBRATION_CERTIFICATE_BEAN = "calibration"; //检测报告 String TEST_REPORT_BEAN = "testingReport"; diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml index 63bca23..e39a259 100644 --- a/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/system/SystemTemplateMapper.xml @@ -8,6 +8,7 @@ + @@ -18,7 +19,7 @@ - id, template_no, template_name, template_type, template_desc, template_creator, minio_file_name, is_del, create_time, update_time + id, template_no, template_name, template_type, certification_type, template_desc, template_creator, minio_file_name, is_del, create_time, update_time diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java index 0a4ec1b..868776e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemTemplate.java @@ -70,6 +70,10 @@ @TableField("template_type") private String templateType; + @ApiModelProperty(value = "证书类别（证书报告）-字典code", dataType = "String") + @TableField("certification_type") + private String certificationType; + /** * 模板描述 */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java index cfddc29..609341d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java @@ -86,10 +86,10 @@ if (ObjectUtil.isNotEmpty(siteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && siteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) { siteExecutiveEquipmentRelationService.saveBatch(siteExecutiveLog.getId(), siteExecutiveLog.getSiteExecutiveEquipmentRelationList()); } - ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 30000, - TimeUnit.MILLISECONDS, new LinkedBlockingDeque()); - executor.execute(() -> registerPrintFile(siteExecutiveLog)); - return ReturnUtil.success(); +// ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 30000, +// TimeUnit.MILLISECONDS, new LinkedBlockingDeque()); +// executor.execute(() -> registerPrintFile(siteExecutiveLog)); +// return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @@ -113,12 +113,12 @@ if (ObjectUtil.isNotEmpty(businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) { siteExecutiveEquipmentRelationService.saveBatch(businessSiteExecutiveLog.getId(), businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()); } - ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 30000, - TimeUnit.MILLISECONDS, new LinkedBlockingDeque()); - executor.execute(() -> { - deletePrintFile(businessSiteExecutiveLog.getPrintFileName()); - registerPrintFile(businessSiteExecutiveLog); - }); +// ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 30000, +// TimeUnit.MILLISECONDS, new LinkedBlockingDeque()); +// executor.execute(() -> { +// deletePrintFile(businessSiteExecutiveLog.getPrintFileName()); +// registerPrintFile(businessSiteExecutiveLog); +// }); return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -217,26 +217,26 @@ /** * 增加，修改环境审批单需要进行 */ - private void registerPrintFile(BusinessSiteExecutiveLog siteExecutiveLog) { - //获取证书报告信息 - siteExecutiveLog.setLaboratoryName(this.baseMapper.getLaboratoryName(siteExecutiveLog.getLaboratoryId())); - //进行证书报告生成，并在远程注册服务器注册 - PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); - try { - DictCodeUtils.convertDictCodeToName(siteExecutiveLog); - String printFileName = printFileRegister.registerPrintFile(siteExecutiveLog, FilePrintTypeEnum.EXTERNAL_ENVIRONMENTAL_RECORD); - setSitePrintFileName(siteExecutiveLog.getId(), printFileName); - } catch (Exception ex) { - log.error("打印异常，证书报告信息为{},异常信息为{}", JSONObject.toJSON(siteExecutiveLog), ex); - } - } - - private void setSitePrintFileName(Long id, String printFileName) { - //生成证书打印信息 - BusinessSiteExecutiveLog siteExecutiveLog = new BusinessSiteExecutiveLog(); - siteExecutiveLog.setId(id); - siteExecutiveLog.setPrintFileName(printFileName); - this.baseMapper.updateById(siteExecutiveLog); - } +// private void registerPrintFile(BusinessSiteExecutiveLog siteExecutiveLog) { +// //获取证书报告信息 +// siteExecutiveLog.setLaboratoryName(this.baseMapper.getLaboratoryName(siteExecutiveLog.getLaboratoryId())); +// //进行证书报告生成，并在远程注册服务器注册 +// PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); +// try { +// DictCodeUtils.convertDictCodeToName(siteExecutiveLog); +// String printFileName = printFileRegister.registerPrintFile(siteExecutiveLog, FilePrintTypeEnum.EXTERNAL_ENVIRONMENTAL_RECORD); +// setSitePrintFileName(siteExecutiveLog.getId(), printFileName); +// } catch (Exception ex) { +// log.error("打印异常，证书报告信息为{},异常信息为{}", JSONObject.toJSON(siteExecutiveLog), ex); +// } +// } +// +// private void setSitePrintFileName(Long id, String printFileName) { +// //生成证书打印信息 +// BusinessSiteExecutiveLog siteExecutiveLog = new BusinessSiteExecutiveLog(); +// siteExecutiveLog.setId(id); +// siteExecutiveLog.setPrintFileName(printFileName); +// this.baseMapper.updateById(siteExecutiveLog); +// } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveInfoEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveInfoEventPostProcessor.java index 7424b78..4b7622f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveInfoEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/SiteExecutiveInfoEventPostProcessor.java @@ -43,27 +43,26 @@ siteExecutive.setApprovalStatus(ApprovalStatusEnum.PASSED); siteExecutive.setUpdateTime(DateUtil.formatDateTime(new Date())); siteExecutiveInfoMapper.updateById(siteExecutive); - //审批通过 根据模板生成审批单打印样例 - //获取证书报告信息 - siteExecutive = siteExecutiveInfoMapper.selectById(id); - //进行证书报告生成，并在远程注册服务器注册 - PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); - try { - DictCodeUtils.convertDictCodeToName(siteExecutive); - String printFileName = printFileRegister.registerPrintFile(siteExecutive, PrintFileDataBeanNameAliasEnum.EXTERNAL_CALIBRATION_FILE_BEAN); - setSitePrintFileName(siteExecutive.getId(), printFileName, siteExecutiveInfoMapper); - } catch (Exception ex) { - log.error("打印异常，证书报告信息为{},异常信息为{}", JSONObject.toJSON(siteExecutive), ex); - } +// //审批通过 根据模板生成审批单打印样例 +// //获取证书报告信息 +// siteExecutive = siteExecutiveInfoMapper.selectById(id); +// //进行证书报告生成，并在远程注册服务器注册 +// PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); +// try { +// DictCodeUtils.convertDictCodeToName(siteExecutive); +// String printFileName = printFileRegister.registerPrintFile(siteExecutive, PrintFileDataBeanNameAliasEnum.EXTERNAL_CALIBRATION_FILE_BEAN); +// setSitePrintFileName(siteExecutive.getId(), printFileName, siteExecutiveInfoMapper); +// } catch (Exception ex) { +// log.error("打印异常，证书报告信息为{},异常信息为{}", JSONObject.toJSON(siteExecutive), ex); +// } } - private void setSitePrintFileName(Long id, String printFileName, BusinessSiteExecutiveInfoMapper siteExecutiveInfoMapper) { - //生成证书打印信息 - BusinessSiteExecutiveInfo sitePrintFileName = new BusinessSiteExecutiveInfo(); - sitePrintFileName.setId(id); - sitePrintFileName.setPrintFileName(printFileName); - siteExecutiveInfoMapper.updateById(sitePrintFileName); - } - +// private void setSitePrintFileName(Long id, String printFileName, BusinessSiteExecutiveInfoMapper siteExecutiveInfoMapper) { +// //生成证书打印信息 +// BusinessSiteExecutiveInfo sitePrintFileName = new BusinessSiteExecutiveInfo(); +// sitePrintFileName.setId(id); +// sitePrintFileName.setPrintFileName(printFileName); +// siteExecutiveInfoMapper.updateById(sitePrintFileName); +// } } 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 93f94aa..9037b0c 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 @@ -74,10 +74,10 @@ //上传到服务器 String certificatePdfName=uploadCertificate(certificatePdfUrl); //删除无效的文件 -// File invalidFile = new File(tempLocalFileDir); + File invalidFile = new File(tempLocalFileDir); log.debug("invalid print file start delete, the file directory is {}", tempLocalFileDir); //删除运行空间下的文件 -// deleteFile(invalidFile); + deleteFile(invalidFile); return certificatePdfName; } throw new RuntimeException("the bean mapped to this certificate type is empty...");