diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java index 1d34512..332e328 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java @@ -38,15 +38,15 @@ Boolean DELETE_FALSE = false; //资产类型1（测量设备） String ASSET_TYPE_1 = "1"; - + //检定状态 String MEASURE_STATUS = "measureStatus"; //校验类别 String MEASURE_CATEGORY= "measureCategory"; - //证书类型 String CERTIFICATION_CLASS= "certificationClass"; - //现场检测-任务来源 String TASK_SOURCE= "taskSource"; + //检定结果 + String MESURE_RESULT= "mesureResult"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java index 1d34512..332e328 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java @@ -38,15 +38,15 @@ Boolean DELETE_FALSE = false; //资产类型1（测量设备） String ASSET_TYPE_1 = "1"; - + //检定状态 String MEASURE_STATUS = "measureStatus"; //校验类别 String MEASURE_CATEGORY= "measureCategory"; - //证书类型 String CERTIFICATION_CLASS= "certificationClass"; - //现场检测-任务来源 String TASK_SOURCE= "taskSource"; + //检定结果 + String MESURE_RESULT= "mesureResult"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java index 954ed13..1b6ec7a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -131,9 +131,13 @@ * 检定结果（字典code） */ @TableField("measure_result") - @ApiModelProperty(value = "检定结果", dataType = "String") + @ApiModelProperty(value = "检定结果（字典code）", dataType = "String") private String measureResult; + @TableField(exist = false) + @ApiModelProperty(value = "检定结果（字典value）", dataType = "String") + private String measureResultName; + @TableField("environment_id") @ApiModelProperty(value = "环境记录单id", dataType = "Long") private Long environmentId; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java index 1d34512..332e328 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java @@ -38,15 +38,15 @@ Boolean DELETE_FALSE = false; //资产类型1（测量设备） String ASSET_TYPE_1 = "1"; - + //检定状态 String MEASURE_STATUS = "measureStatus"; //校验类别 String MEASURE_CATEGORY= "measureCategory"; - //证书类型 String CERTIFICATION_CLASS= "certificationClass"; - //现场检测-任务来源 String TASK_SOURCE= "taskSource"; + //检定结果 + String MESURE_RESULT= "mesureResult"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java index 954ed13..1b6ec7a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -131,9 +131,13 @@ * 检定结果（字典code） */ @TableField("measure_result") - @ApiModelProperty(value = "检定结果", dataType = "String") + @ApiModelProperty(value = "检定结果（字典code）", dataType = "String") private String measureResult; + @TableField(exist = false) + @ApiModelProperty(value = "检定结果（字典value）", dataType = "String") + private String measureResultName; + @TableField("environment_id") @ApiModelProperty(value = "环境记录单id", dataType = "Long") private Long environmentId; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java index 10cd6d5..4330fce 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -380,6 +380,7 @@ certificateReport.setCreateUser(user.getId()); certificateReport.setCreateUserName(user.getName()); certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS, certificateReport.getCertificateReportType())); + certificateReport.setMeasureResultName(dictService.getDictNameByCode(MeterDictEnum.MESURE_RESULT, certificateReport.getMeasureResult())); printFileRegister.registerPrintFile( RegisterCustomParameters.builder() .customObject(certificateReport) diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java index 1d34512..332e328 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java @@ -38,15 +38,15 @@ Boolean DELETE_FALSE = false; //资产类型1（测量设备） String ASSET_TYPE_1 = "1"; - + //检定状态 String MEASURE_STATUS = "measureStatus"; //校验类别 String MEASURE_CATEGORY= "measureCategory"; - //证书类型 String CERTIFICATION_CLASS= "certificationClass"; - //现场检测-任务来源 String TASK_SOURCE= "taskSource"; + //检定结果 + String MESURE_RESULT= "mesureResult"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java index 954ed13..1b6ec7a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -131,9 +131,13 @@ * 检定结果（字典code） */ @TableField("measure_result") - @ApiModelProperty(value = "检定结果", dataType = "String") + @ApiModelProperty(value = "检定结果（字典code）", dataType = "String") private String measureResult; + @TableField(exist = false) + @ApiModelProperty(value = "检定结果（字典value）", dataType = "String") + private String measureResultName; + @TableField("environment_id") @ApiModelProperty(value = "环境记录单id", dataType = "Long") private Long environmentId; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java index 10cd6d5..4330fce 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -380,6 +380,7 @@ certificateReport.setCreateUser(user.getId()); certificateReport.setCreateUserName(user.getName()); certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS, certificateReport.getCertificateReportType())); + certificateReport.setMeasureResultName(dictService.getDictNameByCode(MeterDictEnum.MESURE_RESULT, certificateReport.getMeasureResult())); printFileRegister.registerPrintFile( RegisterCustomParameters.builder() .customObject(certificateReport) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index 0dfaa6e..134bb89 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -440,7 +440,7 @@ PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); String printFileName = printFileRegister.registerPrintFile( RegisterCustomParameters.builder() - .customFileName(meterFile.getFileName()) +// .customFileName(meterFile.getFileName()) .customObject(meterFile) .prefixType(FilePrintTypeEnum.METER_FILE) .pdf(true) @@ -466,7 +466,7 @@ PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); String printFileName = printFileRegister.registerPrintFile( RegisterCustomParameters.builder() - .customFileName(meterFile.getFileName()) +// .customFileName(meterFile.getFileName()) .customObject(meterFile) .prefixType(FilePrintTypeEnum.METER_FILE) .pdf(true) diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java index 1d34512..332e328 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java @@ -38,15 +38,15 @@ Boolean DELETE_FALSE = false; //资产类型1（测量设备） String ASSET_TYPE_1 = "1"; - + //检定状态 String MEASURE_STATUS = "measureStatus"; //校验类别 String MEASURE_CATEGORY= "measureCategory"; - //证书类型 String CERTIFICATION_CLASS= "certificationClass"; - //现场检测-任务来源 String TASK_SOURCE= "taskSource"; + //检定结果 + String MESURE_RESULT= "mesureResult"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java index 954ed13..1b6ec7a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -131,9 +131,13 @@ * 检定结果（字典code） */ @TableField("measure_result") - @ApiModelProperty(value = "检定结果", dataType = "String") + @ApiModelProperty(value = "检定结果（字典code）", dataType = "String") private String measureResult; + @TableField(exist = false) + @ApiModelProperty(value = "检定结果（字典value）", dataType = "String") + private String measureResultName; + @TableField("environment_id") @ApiModelProperty(value = "环境记录单id", dataType = "Long") private Long environmentId; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java index 10cd6d5..4330fce 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -380,6 +380,7 @@ certificateReport.setCreateUser(user.getId()); certificateReport.setCreateUserName(user.getName()); certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS, certificateReport.getCertificateReportType())); + certificateReport.setMeasureResultName(dictService.getDictNameByCode(MeterDictEnum.MESURE_RESULT, certificateReport.getMeasureResult())); printFileRegister.registerPrintFile( RegisterCustomParameters.builder() .customObject(certificateReport) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index 0dfaa6e..134bb89 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -440,7 +440,7 @@ PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); String printFileName = printFileRegister.registerPrintFile( RegisterCustomParameters.builder() - .customFileName(meterFile.getFileName()) +// .customFileName(meterFile.getFileName()) .customObject(meterFile) .prefixType(FilePrintTypeEnum.METER_FILE) .pdf(true) @@ -466,7 +466,7 @@ PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); String printFileName = printFileRegister.registerPrintFile( RegisterCustomParameters.builder() - .customFileName(meterFile.getFileName()) +// .customFileName(meterFile.getFileName()) .customObject(meterFile) .prefixType(FilePrintTypeEnum.METER_FILE) .pdf(true) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileApprovalDataSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileApprovalDataSupport.java index 7b6fbb8..25b1c8a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileApprovalDataSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileApprovalDataSupport.java @@ -139,7 +139,8 @@ electronicImageSeals.add(doPopulateElectronicSignSeal(id, electronicImage, filePrintRegister)); } //在"二维码"/"{qr}"关键字填充二维码图片 - ElectronicImage electronicImage = filePrintRegister.getTemplateWordType() ? defaultElectronicImage("二维码"): defaultElectronicImage("{qr}"); +// ElectronicImage electronicImage = filePrintRegister.getTemplateWordType() ? defaultElectronicImage("二维码"): defaultElectronicImage("{qr}"); + ElectronicImage electronicImage = defaultElectronicImage("{qr}"); electronicImage.setIsSealImage(true); electronicImageSeals.add(doPopulateQRCode(electronicImage, filePrintRegister)); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java index 1d34512..332e328 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java @@ -38,15 +38,15 @@ Boolean DELETE_FALSE = false; //资产类型1（测量设备） String ASSET_TYPE_1 = "1"; - + //检定状态 String MEASURE_STATUS = "measureStatus"; //校验类别 String MEASURE_CATEGORY= "measureCategory"; - //证书类型 String CERTIFICATION_CLASS= "certificationClass"; - //现场检测-任务来源 String TASK_SOURCE= "taskSource"; + //检定结果 + String MESURE_RESULT= "mesureResult"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java index 954ed13..1b6ec7a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -131,9 +131,13 @@ * 检定结果（字典code） */ @TableField("measure_result") - @ApiModelProperty(value = "检定结果", dataType = "String") + @ApiModelProperty(value = "检定结果（字典code）", dataType = "String") private String measureResult; + @TableField(exist = false) + @ApiModelProperty(value = "检定结果（字典value）", dataType = "String") + private String measureResultName; + @TableField("environment_id") @ApiModelProperty(value = "环境记录单id", dataType = "Long") private Long environmentId; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java index 10cd6d5..4330fce 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -380,6 +380,7 @@ certificateReport.setCreateUser(user.getId()); certificateReport.setCreateUserName(user.getName()); certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS, certificateReport.getCertificateReportType())); + certificateReport.setMeasureResultName(dictService.getDictNameByCode(MeterDictEnum.MESURE_RESULT, certificateReport.getMeasureResult())); printFileRegister.registerPrintFile( RegisterCustomParameters.builder() .customObject(certificateReport) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index 0dfaa6e..134bb89 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -440,7 +440,7 @@ PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); String printFileName = printFileRegister.registerPrintFile( RegisterCustomParameters.builder() - .customFileName(meterFile.getFileName()) +// .customFileName(meterFile.getFileName()) .customObject(meterFile) .prefixType(FilePrintTypeEnum.METER_FILE) .pdf(true) @@ -466,7 +466,7 @@ PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); String printFileName = printFileRegister.registerPrintFile( RegisterCustomParameters.builder() - .customFileName(meterFile.getFileName()) +// .customFileName(meterFile.getFileName()) .customObject(meterFile) .prefixType(FilePrintTypeEnum.METER_FILE) .pdf(true) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileApprovalDataSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileApprovalDataSupport.java index 7b6fbb8..25b1c8a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileApprovalDataSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileApprovalDataSupport.java @@ -139,7 +139,8 @@ electronicImageSeals.add(doPopulateElectronicSignSeal(id, electronicImage, filePrintRegister)); } //在"二维码"/"{qr}"关键字填充二维码图片 - ElectronicImage electronicImage = filePrintRegister.getTemplateWordType() ? defaultElectronicImage("二维码"): defaultElectronicImage("{qr}"); +// ElectronicImage electronicImage = filePrintRegister.getTemplateWordType() ? defaultElectronicImage("二维码"): defaultElectronicImage("{qr}"); + ElectronicImage electronicImage = defaultElectronicImage("{qr}"); electronicImage.setIsSealImage(true); electronicImageSeals.add(doPopulateQRCode(electronicImage, filePrintRegister)); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java index f2eb344..01d47ac 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java @@ -98,7 +98,7 @@ params.put("createUserName", metaData.getCreateUserName()); params.put("humidity", metaData.getHumidity()); params.put("temperature", metaData.getTemperature()); - params.put("measureResult", metaData.getMeasureResult()); + params.put("measureResultName", metaData.getMeasureResultName()); params.put("remark", metaData.getRemark()); List mapList = new ArrayList<>(); //所用的计量标准器具 @@ -112,7 +112,7 @@ params.put("mapList", mapList); //关联的技术文件 if (CollectionUtils.isNotEmpty(metaData.getFileList())) { - String fileNames = metaData.getFileList().stream().map(MeterFile::getFileName).collect(Collectors.joining(",")); + String fileNames = metaData.getFileList().stream().map(MeterFile::getFileName).collect(Collectors.joining(";")); params.put("fileNames", fileNames); } } catch (Exception ex) { diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java index 1d34512..332e328 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java @@ -38,15 +38,15 @@ Boolean DELETE_FALSE = false; //资产类型1（测量设备） String ASSET_TYPE_1 = "1"; - + //检定状态 String MEASURE_STATUS = "measureStatus"; //校验类别 String MEASURE_CATEGORY= "measureCategory"; - //证书类型 String CERTIFICATION_CLASS= "certificationClass"; - //现场检测-任务来源 String TASK_SOURCE= "taskSource"; + //检定结果 + String MESURE_RESULT= "mesureResult"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java index 954ed13..1b6ec7a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -131,9 +131,13 @@ * 检定结果（字典code） */ @TableField("measure_result") - @ApiModelProperty(value = "检定结果", dataType = "String") + @ApiModelProperty(value = "检定结果（字典code）", dataType = "String") private String measureResult; + @TableField(exist = false) + @ApiModelProperty(value = "检定结果（字典value）", dataType = "String") + private String measureResultName; + @TableField("environment_id") @ApiModelProperty(value = "环境记录单id", dataType = "Long") private Long environmentId; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java index 10cd6d5..4330fce 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -380,6 +380,7 @@ certificateReport.setCreateUser(user.getId()); certificateReport.setCreateUserName(user.getName()); certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS, certificateReport.getCertificateReportType())); + certificateReport.setMeasureResultName(dictService.getDictNameByCode(MeterDictEnum.MESURE_RESULT, certificateReport.getMeasureResult())); printFileRegister.registerPrintFile( RegisterCustomParameters.builder() .customObject(certificateReport) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index 0dfaa6e..134bb89 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -440,7 +440,7 @@ PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); String printFileName = printFileRegister.registerPrintFile( RegisterCustomParameters.builder() - .customFileName(meterFile.getFileName()) +// .customFileName(meterFile.getFileName()) .customObject(meterFile) .prefixType(FilePrintTypeEnum.METER_FILE) .pdf(true) @@ -466,7 +466,7 @@ PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); String printFileName = printFileRegister.registerPrintFile( RegisterCustomParameters.builder() - .customFileName(meterFile.getFileName()) +// .customFileName(meterFile.getFileName()) .customObject(meterFile) .prefixType(FilePrintTypeEnum.METER_FILE) .pdf(true) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileApprovalDataSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileApprovalDataSupport.java index 7b6fbb8..25b1c8a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileApprovalDataSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileApprovalDataSupport.java @@ -139,7 +139,8 @@ electronicImageSeals.add(doPopulateElectronicSignSeal(id, electronicImage, filePrintRegister)); } //在"二维码"/"{qr}"关键字填充二维码图片 - ElectronicImage electronicImage = filePrintRegister.getTemplateWordType() ? defaultElectronicImage("二维码"): defaultElectronicImage("{qr}"); +// ElectronicImage electronicImage = filePrintRegister.getTemplateWordType() ? defaultElectronicImage("二维码"): defaultElectronicImage("{qr}"); + ElectronicImage electronicImage = defaultElectronicImage("{qr}"); electronicImage.setIsSealImage(true); electronicImageSeals.add(doPopulateQRCode(electronicImage, filePrintRegister)); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java index f2eb344..01d47ac 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java @@ -98,7 +98,7 @@ params.put("createUserName", metaData.getCreateUserName()); params.put("humidity", metaData.getHumidity()); params.put("temperature", metaData.getTemperature()); - params.put("measureResult", metaData.getMeasureResult()); + params.put("measureResultName", metaData.getMeasureResultName()); params.put("remark", metaData.getRemark()); List mapList = new ArrayList<>(); //所用的计量标准器具 @@ -112,7 +112,7 @@ params.put("mapList", mapList); //关联的技术文件 if (CollectionUtils.isNotEmpty(metaData.getFileList())) { - String fileNames = metaData.getFileList().stream().map(MeterFile::getFileName).collect(Collectors.joining(",")); + String fileNames = metaData.getFileList().stream().map(MeterFile::getFileName).collect(Collectors.joining(";")); params.put("fileNames", fileNames); } } catch (Exception ex) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/meter/MeterFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/meter/MeterFileData.java index c7fbf30..b669c48 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/meter/MeterFileData.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/meter/MeterFileData.java @@ -40,6 +40,8 @@ wrapper.eq("sign_name", "受控章"); } else if (EffectiveStatusEnum.REPEALED.getCode().equals(metaData.getEffectiveStatus())) { wrapper.eq("sign_name", "废止章"); + } else { + return filePrintRegister; } SystemSign systemSign = signMapper.selectOne(wrapper); //文件左上角盖章 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java index 1d34512..332e328 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/meter/MeterDictEnum.java @@ -38,15 +38,15 @@ Boolean DELETE_FALSE = false; //资产类型1（测量设备） String ASSET_TYPE_1 = "1"; - + //检定状态 String MEASURE_STATUS = "measureStatus"; //校验类别 String MEASURE_CATEGORY= "measureCategory"; - //证书类型 String CERTIFICATION_CLASS= "certificationClass"; - //现场检测-任务来源 String TASK_SOURCE= "taskSource"; + //检定结果 + String MESURE_RESULT= "mesureResult"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java index 954ed13..1b6ec7a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -131,9 +131,13 @@ * 检定结果（字典code） */ @TableField("measure_result") - @ApiModelProperty(value = "检定结果", dataType = "String") + @ApiModelProperty(value = "检定结果（字典code）", dataType = "String") private String measureResult; + @TableField(exist = false) + @ApiModelProperty(value = "检定结果（字典value）", dataType = "String") + private String measureResultName; + @TableField("environment_id") @ApiModelProperty(value = "环境记录单id", dataType = "Long") private Long environmentId; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java index 10cd6d5..4330fce 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -380,6 +380,7 @@ certificateReport.setCreateUser(user.getId()); certificateReport.setCreateUserName(user.getName()); certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS, certificateReport.getCertificateReportType())); + certificateReport.setMeasureResultName(dictService.getDictNameByCode(MeterDictEnum.MESURE_RESULT, certificateReport.getMeasureResult())); printFileRegister.registerPrintFile( RegisterCustomParameters.builder() .customObject(certificateReport) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java index 0dfaa6e..134bb89 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterFileServiceImpl.java @@ -440,7 +440,7 @@ PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); String printFileName = printFileRegister.registerPrintFile( RegisterCustomParameters.builder() - .customFileName(meterFile.getFileName()) +// .customFileName(meterFile.getFileName()) .customObject(meterFile) .prefixType(FilePrintTypeEnum.METER_FILE) .pdf(true) @@ -466,7 +466,7 @@ PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); String printFileName = printFileRegister.registerPrintFile( RegisterCustomParameters.builder() - .customFileName(meterFile.getFileName()) +// .customFileName(meterFile.getFileName()) .customObject(meterFile) .prefixType(FilePrintTypeEnum.METER_FILE) .pdf(true) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileApprovalDataSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileApprovalDataSupport.java index 7b6fbb8..25b1c8a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileApprovalDataSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileApprovalDataSupport.java @@ -139,7 +139,8 @@ electronicImageSeals.add(doPopulateElectronicSignSeal(id, electronicImage, filePrintRegister)); } //在"二维码"/"{qr}"关键字填充二维码图片 - ElectronicImage electronicImage = filePrintRegister.getTemplateWordType() ? defaultElectronicImage("二维码"): defaultElectronicImage("{qr}"); +// ElectronicImage electronicImage = filePrintRegister.getTemplateWordType() ? defaultElectronicImage("二维码"): defaultElectronicImage("{qr}"); + ElectronicImage electronicImage = defaultElectronicImage("{qr}"); electronicImage.setIsSealImage(true); electronicImageSeals.add(doPopulateQRCode(electronicImage, filePrintRegister)); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java index f2eb344..01d47ac 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java @@ -98,7 +98,7 @@ params.put("createUserName", metaData.getCreateUserName()); params.put("humidity", metaData.getHumidity()); params.put("temperature", metaData.getTemperature()); - params.put("measureResult", metaData.getMeasureResult()); + params.put("measureResultName", metaData.getMeasureResultName()); params.put("remark", metaData.getRemark()); List mapList = new ArrayList<>(); //所用的计量标准器具 @@ -112,7 +112,7 @@ params.put("mapList", mapList); //关联的技术文件 if (CollectionUtils.isNotEmpty(metaData.getFileList())) { - String fileNames = metaData.getFileList().stream().map(MeterFile::getFileName).collect(Collectors.joining(",")); + String fileNames = metaData.getFileList().stream().map(MeterFile::getFileName).collect(Collectors.joining(";")); params.put("fileNames", fileNames); } } catch (Exception ex) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/meter/MeterFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/meter/MeterFileData.java index c7fbf30..b669c48 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/meter/MeterFileData.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/meter/MeterFileData.java @@ -40,6 +40,8 @@ wrapper.eq("sign_name", "受控章"); } else if (EffectiveStatusEnum.REPEALED.getCode().equals(metaData.getEffectiveStatus())) { wrapper.eq("sign_name", "废止章"); + } else { + return filePrintRegister; } SystemSign systemSign = signMapper.selectOne(wrapper); //文件左上角盖章 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ExcelPrintUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ExcelPrintUtils.java index f1a862a..17772eb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ExcelPrintUtils.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/util/ExcelPrintUtils.java @@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.casic.missiles.dto.business.certificate.ElectronicImage; import com.casic.missiles.dto.business.file.FilePrintRegister; +import com.casic.missiles.utils.MinioUtil; import com.casic.missiles.utils.QRCodeUtil; +import com.casic.missiles.utils.SpringContextUtil; import com.spire.xls.CellRange; import com.spire.xls.ExcelPicture; import com.spire.xls.ExcelVersion; @@ -33,12 +35,19 @@ public static String filePrintGenerate(String tempLocalFileDir, FilePrintRegister filePrintRegister, String customFileName) throws Exception { //填充文字数据 - String wordUrl = exportParam(tempLocalFileDir, filePrintRegister, customFileName); + String excelUrl = exportParam(tempLocalFileDir, filePrintRegister, customFileName); //生成二维码 - getQrCode(filePrintRegister.getTemDir(), filePrintRegister.getCustomFileName(), wordUrl, filePrintRegister); + getQrCode(filePrintRegister.getTemDir(), filePrintRegister.getCustomFileName(), excelUrl, filePrintRegister); //根据关键字进行添加签章和签字图片 - imageWrite(filePrintRegister.getTemDir() + wordUrl, filePrintRegister.getElectronicImageList()); - return tempLocalFileDir + wordUrl; + imageWrite(filePrintRegister.getTemDir() + excelUrl, filePrintRegister.getElectronicImageList()); + //获取没有关键字的图片，即绝对路径的图片（电子认定章） + List absolutePathImageList = filePrintRegister.getElectronicImageList().stream() + .filter(electronicImage -> StringUtils.isEmpty(electronicImage.getKeyWord())) + .collect(Collectors.toList()); + log.debug("执行excel绝对打合成操作,打印配置为......."); + //根据设置的绝对路径进行图片的填充 + addAbsolutePathStamp(filePrintRegister.getTemDir() + excelUrl, absolutePathImageList); + return tempLocalFileDir + excelUrl; } /** @@ -80,26 +89,37 @@ * * @param tempDir * @param customFileName - * @param wordOldUrl + * @param pdfNewUrl * @param filePrintRegister * @throws IOException */ - private static void getQrCode(String tempDir, String customFileName, String wordOldUrl, FilePrintRegister filePrintRegister) throws IOException { + private static void getQrCode(String tempDir, String customFileName, String pdfNewUrl, FilePrintRegister filePrintRegister) throws IOException { +// if (StringUtils.isEmpty(filePrintRegister.getQrCode())) { +// return; +// } +// String urlPath = StringUtils.isNotEmpty(customFileName) ? customFileName + ".jpg" : "检测.jpg"; +// String[] split = wordOldUrl.split("\\."); +// String content = ""; +// if (split.length > 1) { +// content = split[0] + "_" + System.currentTimeMillis() + ".pdf"; +// } else { +// content = wordOldUrl + System.currentTimeMillis(); +// } +// filePrintRegister.setQrCode(content); +// // 加载模板 +// OutputStream output = new FileOutputStream(tempDir + urlPath); +// QRCodeUtil.getQRCode(tempDir + content, output); if (StringUtils.isEmpty(filePrintRegister.getQrCode())) { return; } String urlPath = StringUtils.isNotEmpty(customFileName) ? customFileName + ".jpg" : "检测.jpg"; - String[] split = wordOldUrl.split("\\."); - String content = ""; - if (split.length > 1) { - content = split[0] + "_" + System.currentTimeMillis() + ".pdf"; - } else { - content = wordOldUrl + System.currentTimeMillis(); - } + String[] split = pdfNewUrl.split("\\."); + String content = split[0].replaceAll("[\\u4e00-\\u9fa5]", "") + System.currentTimeMillis() + ".png"; filePrintRegister.setQrCode(content); // 加载模板 OutputStream output = new FileOutputStream(tempDir + urlPath); - QRCodeUtil.getQRCode(tempDir + content, output); + MinioUtil minioUtil = SpringContextUtil.getBean(MinioUtil.class); + QRCodeUtil.getQRCode(minioUtil.getPreviewUrl(content), output); } /** @@ -163,5 +183,22 @@ return; } - + private static void addAbsolutePathStamp(String excelUrl, List absolutePathImageList) { + //加载文档 + com.spire.xls.Workbook workbook = new com.spire.xls.Workbook(); + workbook.loadFromFile(excelUrl); + //证书首页 + Worksheet worksheet = workbook.getWorksheets().get(1); + //计算放置位置 + int i = Math.floorDiv(24, absolutePathImageList.size() + 1); + for (int j = 0; j < absolutePathImageList.size(); j++) { + if (ObjectUtils.isEmpty(absolutePathImageList.get(j).getImageConfig())) { + ExcelPicture picture = worksheet.getPictures().add(3, (j + 1) * i, absolutePathImageList.get(j).getElectronicSealImageUrl()); + picture.setWidth(120); + picture.setHeight(70); + } + } + workbook.saveToFile(excelUrl); + workbook.dispose(); + } }