diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java index 873780d..2d0041f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java @@ -118,6 +118,16 @@ String STABILITY = "稳定性"; /** + * 偏载误差 + */ + String OFFSET_LOAD_ERROR = "偏载误差"; + + /** + * 局部示值误差 + */ + String LOCAL_INDICATION_ERROR = "局部示值误差"; + + /** * 直流电压 */ String DC_VOLTAGE = "直流电压"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java index 873780d..2d0041f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java @@ -118,6 +118,16 @@ String STABILITY = "稳定性"; /** + * 偏载误差 + */ + String OFFSET_LOAD_ERROR = "偏载误差"; + + /** + * 局部示值误差 + */ + String LOCAL_INDICATION_ERROR = "局部示值误差"; + + /** * 直流电压 */ String DC_VOLTAGE = "直流电压"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureEquipmentInfoDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureEquipmentInfoDTO.java index 54d5ecf..aa809e4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureEquipmentInfoDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureEquipmentInfoDTO.java @@ -31,4 +31,7 @@ @ApiModelProperty(value = "证书有效期", dataType = "String") private String measureValidDate; + @ApiModelProperty(value = "设备类型(打印扩展使用)",dataType = "String") + private String equipmentType; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java index 873780d..2d0041f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java @@ -118,6 +118,16 @@ String STABILITY = "稳定性"; /** + * 偏载误差 + */ + String OFFSET_LOAD_ERROR = "偏载误差"; + + /** + * 局部示值误差 + */ + String LOCAL_INDICATION_ERROR = "局部示值误差"; + + /** * 直流电压 */ String DC_VOLTAGE = "直流电压"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureEquipmentInfoDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureEquipmentInfoDTO.java index 54d5ecf..aa809e4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureEquipmentInfoDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureEquipmentInfoDTO.java @@ -31,4 +31,7 @@ @ApiModelProperty(value = "证书有效期", dataType = "String") private String measureValidDate; + @ApiModelProperty(value = "设备类型(打印扩展使用)",dataType = "String") + private String equipmentType; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java index eae9f61..ffbd7da 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java @@ -302,6 +302,58 @@ @TableField(exist = false) private String technologyFile; + @ApiModelProperty(value = "载荷点A1-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String aManufactureNo_1; + + @ApiModelProperty(value = "载荷点A2-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String aManufactureNo_2; + + @ApiModelProperty(value = "载荷点A3-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String aManufactureNo_3; + + @ApiModelProperty(value = "载荷点A4-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String aManufactureNo_4; + + @ApiModelProperty(value = "载荷点A5-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String aManufactureNo_5; + + @ApiModelProperty(value = "载荷点A6-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String aManufactureNo_6; + + @ApiModelProperty(value = "载荷点B1-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String bManufactureNo_1; + + @ApiModelProperty(value = "载荷点B2-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String bManufactureNo_2; + + @ApiModelProperty(value = "载荷点B2-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String bManufactureNo_3; + + @ApiModelProperty(value = "载荷点B2-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String bManufactureNo_4; + + @ApiModelProperty(value = "秤量盘形式-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String scalePlateForm; + + @ApiModelProperty(value = "实际分度值d-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String actualDivisionValue; + + @ApiModelProperty(value = "实际分度值d单位-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String actualDivisionValueUnit; + @ApiModelProperty(value = "检定数据-多功能校准源(打印需要)", dataType = "List") @TableField(exist = false) private List measureDataCalibratorList; @@ -330,6 +382,10 @@ @TableField(exist = false) private List measureDataResistanceThermometerList; + @ApiModelProperty(value = "检定数据-E2等级砝码(打印需要)",dataType = "List") + @TableField(exist = false) + private List measureDataETwoList; + @ApiModelProperty(value = "标准装置编号", dataType = "String") @TableField(exist = false) private String belongStandardEquipment; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java index 873780d..2d0041f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java @@ -118,6 +118,16 @@ String STABILITY = "稳定性"; /** + * 偏载误差 + */ + String OFFSET_LOAD_ERROR = "偏载误差"; + + /** + * 局部示值误差 + */ + String LOCAL_INDICATION_ERROR = "局部示值误差"; + + /** * 直流电压 */ String DC_VOLTAGE = "直流电压"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureEquipmentInfoDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureEquipmentInfoDTO.java index 54d5ecf..aa809e4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureEquipmentInfoDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureEquipmentInfoDTO.java @@ -31,4 +31,7 @@ @ApiModelProperty(value = "证书有效期", dataType = "String") private String measureValidDate; + @ApiModelProperty(value = "设备类型(打印扩展使用)",dataType = "String") + private String equipmentType; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java index eae9f61..ffbd7da 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java @@ -302,6 +302,58 @@ @TableField(exist = false) private String technologyFile; + @ApiModelProperty(value = "载荷点A1-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String aManufactureNo_1; + + @ApiModelProperty(value = "载荷点A2-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String aManufactureNo_2; + + @ApiModelProperty(value = "载荷点A3-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String aManufactureNo_3; + + @ApiModelProperty(value = "载荷点A4-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String aManufactureNo_4; + + @ApiModelProperty(value = "载荷点A5-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String aManufactureNo_5; + + @ApiModelProperty(value = "载荷点A6-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String aManufactureNo_6; + + @ApiModelProperty(value = "载荷点B1-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String bManufactureNo_1; + + @ApiModelProperty(value = "载荷点B2-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String bManufactureNo_2; + + @ApiModelProperty(value = "载荷点B2-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String bManufactureNo_3; + + @ApiModelProperty(value = "载荷点B2-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String bManufactureNo_4; + + @ApiModelProperty(value = "秤量盘形式-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String scalePlateForm; + + @ApiModelProperty(value = "实际分度值d-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String actualDivisionValue; + + @ApiModelProperty(value = "实际分度值d单位-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String actualDivisionValueUnit; + @ApiModelProperty(value = "检定数据-多功能校准源(打印需要)", dataType = "List") @TableField(exist = false) private List measureDataCalibratorList; @@ -330,6 +382,10 @@ @TableField(exist = false) private List measureDataResistanceThermometerList; + @ApiModelProperty(value = "检定数据-E2等级砝码(打印需要)",dataType = "List") + @TableField(exist = false) + private List measureDataETwoList; + @ApiModelProperty(value = "标准装置编号", dataType = "String") @TableField(exist = false) private String belongStandardEquipment; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataETwo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataETwo.java index 5d3ec05..b039e37 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataETwo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataETwo.java @@ -41,6 +41,13 @@ private String dataType; /** + * 检定项目 + */ + @ApiModelProperty(value = "检定项目",dataType = "String") + @TableField(exist = false) + private String params; + + /** * 实验载荷Pt1 */ @ApiModelProperty(value = "实验载荷Pt1", dataType = "String") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java index 873780d..2d0041f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java @@ -118,6 +118,16 @@ String STABILITY = "稳定性"; /** + * 偏载误差 + */ + String OFFSET_LOAD_ERROR = "偏载误差"; + + /** + * 局部示值误差 + */ + String LOCAL_INDICATION_ERROR = "局部示值误差"; + + /** * 直流电压 */ String DC_VOLTAGE = "直流电压"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureEquipmentInfoDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureEquipmentInfoDTO.java index 54d5ecf..aa809e4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureEquipmentInfoDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureEquipmentInfoDTO.java @@ -31,4 +31,7 @@ @ApiModelProperty(value = "证书有效期", dataType = "String") private String measureValidDate; + @ApiModelProperty(value = "设备类型(打印扩展使用)",dataType = "String") + private String equipmentType; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java index eae9f61..ffbd7da 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java @@ -302,6 +302,58 @@ @TableField(exist = false) private String technologyFile; + @ApiModelProperty(value = "载荷点A1-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String aManufactureNo_1; + + @ApiModelProperty(value = "载荷点A2-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String aManufactureNo_2; + + @ApiModelProperty(value = "载荷点A3-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String aManufactureNo_3; + + @ApiModelProperty(value = "载荷点A4-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String aManufactureNo_4; + + @ApiModelProperty(value = "载荷点A5-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String aManufactureNo_5; + + @ApiModelProperty(value = "载荷点A6-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String aManufactureNo_6; + + @ApiModelProperty(value = "载荷点B1-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String bManufactureNo_1; + + @ApiModelProperty(value = "载荷点B2-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String bManufactureNo_2; + + @ApiModelProperty(value = "载荷点B2-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String bManufactureNo_3; + + @ApiModelProperty(value = "载荷点B2-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String bManufactureNo_4; + + @ApiModelProperty(value = "秤量盘形式-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String scalePlateForm; + + @ApiModelProperty(value = "实际分度值d-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String actualDivisionValue; + + @ApiModelProperty(value = "实际分度值d单位-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String actualDivisionValueUnit; + @ApiModelProperty(value = "检定数据-多功能校准源(打印需要)", dataType = "List") @TableField(exist = false) private List measureDataCalibratorList; @@ -330,6 +382,10 @@ @TableField(exist = false) private List measureDataResistanceThermometerList; + @ApiModelProperty(value = "检定数据-E2等级砝码(打印需要)",dataType = "List") + @TableField(exist = false) + private List measureDataETwoList; + @ApiModelProperty(value = "标准装置编号", dataType = "String") @TableField(exist = false) private String belongStandardEquipment; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataETwo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataETwo.java index 5d3ec05..b039e37 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataETwo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataETwo.java @@ -41,6 +41,13 @@ private String dataType; /** + * 检定项目 + */ + @ApiModelProperty(value = "检定项目",dataType = "String") + @TableField(exist = false) + private String params; + + /** * 实验载荷Pt1 */ @ApiModelProperty(value = "实验载荷Pt1", dataType = "String") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java index 877bc82..ab7a597 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java @@ -271,11 +271,10 @@ templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "1", request.getItemCategoryName())); //与证书模板区分 SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); - map.put("pdfStatus", 1); map.put("id", snowflakeUtil.nextId()); log.debug("original before ----"); //除了选用的模板不一致，模板配置流程是一致的 - String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, false, null, templateUrls); + String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); urlList.add(originalWordUrlFile); @@ -353,8 +352,7 @@ } map.put("equipmentList", equipmentList); List dcPowerList = request.getMeasureDataDcPowerList(); -// List powerList = dcPowerList.stream().collect(Collectors.toList()); -// Collections.copy(powerList,dcPowerList); + //电源电压调整率 List powerSupplyVoltageAdjustmentList = dcPowerList.stream() .filter(dcPower -> "1".equals(dcPower.getDataType())).collect(Collectors.toList()); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java index 873780d..2d0041f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java @@ -118,6 +118,16 @@ String STABILITY = "稳定性"; /** + * 偏载误差 + */ + String OFFSET_LOAD_ERROR = "偏载误差"; + + /** + * 局部示值误差 + */ + String LOCAL_INDICATION_ERROR = "局部示值误差"; + + /** * 直流电压 */ String DC_VOLTAGE = "直流电压"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureEquipmentInfoDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureEquipmentInfoDTO.java index 54d5ecf..aa809e4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureEquipmentInfoDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/deviceMeasure/MeasureEquipmentInfoDTO.java @@ -31,4 +31,7 @@ @ApiModelProperty(value = "证书有效期", dataType = "String") private String measureValidDate; + @ApiModelProperty(value = "设备类型(打印扩展使用)",dataType = "String") + private String equipmentType; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java index eae9f61..ffbd7da 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureApproval.java @@ -302,6 +302,58 @@ @TableField(exist = false) private String technologyFile; + @ApiModelProperty(value = "载荷点A1-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String aManufactureNo_1; + + @ApiModelProperty(value = "载荷点A2-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String aManufactureNo_2; + + @ApiModelProperty(value = "载荷点A3-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String aManufactureNo_3; + + @ApiModelProperty(value = "载荷点A4-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String aManufactureNo_4; + + @ApiModelProperty(value = "载荷点A5-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String aManufactureNo_5; + + @ApiModelProperty(value = "载荷点A6-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String aManufactureNo_6; + + @ApiModelProperty(value = "载荷点B1-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String bManufactureNo_1; + + @ApiModelProperty(value = "载荷点B2-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String bManufactureNo_2; + + @ApiModelProperty(value = "载荷点B2-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String bManufactureNo_3; + + @ApiModelProperty(value = "载荷点B2-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String bManufactureNo_4; + + @ApiModelProperty(value = "秤量盘形式-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String scalePlateForm; + + @ApiModelProperty(value = "实际分度值d-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String actualDivisionValue; + + @ApiModelProperty(value = "实际分度值d单位-E2等砝码(打印)",dataType = "String") + @TableField(exist = false) + private String actualDivisionValueUnit; + @ApiModelProperty(value = "检定数据-多功能校准源(打印需要)", dataType = "List") @TableField(exist = false) private List measureDataCalibratorList; @@ -330,6 +382,10 @@ @TableField(exist = false) private List measureDataResistanceThermometerList; + @ApiModelProperty(value = "检定数据-E2等级砝码(打印需要)",dataType = "List") + @TableField(exist = false) + private List measureDataETwoList; + @ApiModelProperty(value = "标准装置编号", dataType = "String") @TableField(exist = false) private String belongStandardEquipment; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataETwo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataETwo.java index 5d3ec05..b039e37 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataETwo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataETwo.java @@ -41,6 +41,13 @@ private String dataType; /** + * 检定项目 + */ + @ApiModelProperty(value = "检定项目",dataType = "String") + @TableField(exist = false) + private String params; + + /** * 实验载荷Pt1 */ @ApiModelProperty(value = "实验载荷Pt1", dataType = "String") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java index 877bc82..ab7a597 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/DcPowerSupplyHandler.java @@ -271,11 +271,10 @@ templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "1", request.getItemCategoryName())); //与证书模板区分 SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); - map.put("pdfStatus", 1); map.put("id", snowflakeUtil.nextId()); log.debug("original before ----"); //除了选用的模板不一致，模板配置流程是一致的 - String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, false, null, templateUrls); + String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); urlList.add(originalWordUrlFile); @@ -353,8 +352,7 @@ } map.put("equipmentList", equipmentList); List dcPowerList = request.getMeasureDataDcPowerList(); -// List powerList = dcPowerList.stream().collect(Collectors.toList()); -// Collections.copy(powerList,dcPowerList); + //电源电压调整率 List powerSupplyVoltageAdjustmentList = dcPowerList.stream() .filter(dcPower -> "1".equals(dcPower.getDataType())).collect(Collectors.toList()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ETwoWeightHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ETwoWeightHandler.java new file mode 100644 index 0000000..8b94baa --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ETwoWeightHandler.java @@ -0,0 +1,308 @@ +package com.casic.missiles.service.Impl.eqpt.standard.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; +import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureApprovalMapper; +import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureEquipmentMapper; +import com.casic.missiles.mapper.business.BizBusinessDeviceMeasureInfoMapper; +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataDcPower; +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataETwo; +import com.casic.missiles.model.business.BizBusinessDeviceMeasureInfo; +import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.utils.DictCodeUtils; + +import com.casic.missiles.enums.PrintFileModuleNameEnum; +import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; +import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; +import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint; +import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentSupport; +import com.casic.missiles.utils.SnowflakeUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; +import org.springframework.util.SocketUtils; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @Author: TuT + * @CreateTime: 2024-02-28 15:24 + * @Description: ETwoHandler E2等级砝码 + */ +@Component(MeasureItemBelongStandardEquipmentDictEnum.E2_WEIGHT) +@RequiredArgsConstructor +@Slf4j +public class ETwoWeightHandler extends StandardEquipmentSupport implements PrintFileModuleNameEnum, StandardEquipmentPrint { + + private final BizBusinessDeviceMeasureInfoMapper bizBusinessDeviceMeasureInfoMapper; + + private final PrintFileRegister printFileRegister; + + private final BizBusinessDeviceMeasureEquipmentMapper bizBusinessDeviceMeasureEquipmentMapper; + + private final BizBusinessDeviceMeasureApprovalMapper bizBusinessDeviceMeasureApprovalMapper; + + @Override + public List doCheckCertificateFile(BizEquipmentStandardCheckRecordApproval request) { + return null; + } + + @Override + public List doCreateOriginalFile(BizBusinessDeviceMeasureApproval request) { + try { + if (ObjectUtil.isEmpty(request)) { + return null; + } + if (CollectionUtils.isEmpty(request.getMeasureDataETwoList())) { + List list = new ArrayList<>(); + list.add(new BizBusinessDeviceMeasureDataETwo()); + request.setMeasureDataETwoList(list); + } + +// BizBusinessDeviceMeasureInfo measureInfo = bizBusinessDeviceMeasureInfoMapper.selectDetailById(request.getDataId()); + DictCodeUtils.convertDictCodeToName(request); + Map map = BeanUtil.beanToMap(request); +// map.put("dataNo", measureInfo.getDataNo()); + + List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); + if (CollectionUtils.isEmpty(equipmentList)) { + equipmentList = new ArrayList<>(); + equipmentList.add(new MeasureEquipmentInfoDTO()); + } + for (MeasureEquipmentInfoDTO equipmentInfo : equipmentList) { + equipmentInfo.setEquipmentType("标准砝码"); + } + map.put("equipmentList", equipmentList); + + //准备填充参数 + prepareParams(map, request.getMeasureDataETwoList()); + + List templateUrls = new ArrayList<>(); + templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "1", request.getItemCategoryName())); + //与证书模板区分 + SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); + map.put("id", snowflakeUtil.nextId()); + map.put("surveyor", "{{@surveyor}}"); + map.put("auditor", "{{@auditor}}"); + log.debug("original before ----"); + //除了选用的模板不一致，模板配置流程是一致的 + String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, templateUrls); + log.debug("originalUrlFile after------------{}", originalWordUrlFile); + List urlList = new ArrayList<>(); + urlList.add(originalWordUrlFile); + if (map.containsKey("pdfUrl")) { + urlList.add((String) map.get("pdfUrl")); + } + return urlList; + } catch (Exception ex) { + log.debug("doCreateOriginalFile Exception is -----------{}", ex); + throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); + } + } + + /** + * 原始记录填充参数 + * + * @param map + * @param eTwoList + */ + private void prepareParams(Map map, List eTwoList) { + //重复性 + List repPtOneList = eTwoList.stream() + .filter(e -> "1".equals(e.getDataType()) + && REPEATABILITY.equals(e.getParams()) + && StringUtils.isNotBlank(e.getPtOne())) + .collect(Collectors.toList()); + List repPtTwoList = eTwoList.stream() + .filter(e -> "1".equals(e.getDataType()) + && REPEATABILITY.equals(e.getParams()) + && StringUtils.isNotBlank(e.getPtTwo())) + .collect(Collectors.toList()); + map.put("repPtOneList", repPtOneList); + map.put("repPtOne", repPtOneList.get(0).getPtOne()); + map.put("repPtTwoList", repPtTwoList); + map.put("repPtTwo", repPtTwoList.get(0).getPtTwo()); + //偏载误差 + List loadPtOneList = eTwoList.stream() + .filter(e -> "2".equals(e.getDataType()) + && OFFSET_LOAD_ERROR.equals(e.getParams()) + && StringUtils.isNotBlank(e.getPtOne())) + .collect(Collectors.toList()); + List loadPtTwoList = eTwoList.stream() + .filter(e -> "2".equals(e.getDataType()) + && OFFSET_LOAD_ERROR.equals(e.getParams()) + && StringUtils.isNotBlank(e.getPtTwo())) + .collect(Collectors.toList()); + map.put("loadPtOneList", loadPtOneList); + map.put("loadPtOne", loadPtOneList.get(0).getPtOne()); + + map.put("loadPtTwoList", loadPtTwoList); + map.put("loadPtTwo", loadPtTwoList.get(0).getPtTwo()); + + //局部示值误差 + List errorPtOneList = eTwoList.stream() + .filter(e -> "3".equals(e.getDataType()) + && LOCAL_INDICATION_ERROR.equals(e.getParams()) + && StringUtils.isNotBlank(e.getPtOne())) + .collect(Collectors.toList()); + List errorPtTwoList = eTwoList.stream() + .filter(e -> "3".equals(e.getDataType()) + && LOCAL_INDICATION_ERROR.equals(e.getParams()) + && StringUtils.isNotBlank(e.getPtTwo())) + .collect(Collectors.toList()); + map.put("errorPtOneList", errorPtOneList); + map.put("errorPtOne", errorPtOneList.get(0).getPtOne()); + map.put("errorPtOnemSValue", errorPtOneList.get(0).getMSValue()); + map.put("errorPtOnempesValue", errorPtOneList.get(0).getMpesValue()); + map.put("errorPtTwoList", errorPtTwoList); + map.put("errorPtTwo", errorPtTwoList.get(0).getPtTwo()); + map.put("errorPtTwomSValue", errorPtTwoList.get(0).getMSValue()); + map.put("errorPtTwompesValue", errorPtTwoList.get(0).getMpesValue()); + + } + + @Override + public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { + try { + //过滤不能生成证书的 + if (checkOutUnablePrint(request)) { + log.debug("该报告没有证书报告"); + return null; + } + if (CollectionUtils.isEmpty(request.getMeasureDataDcPowerList())) { + List list = new ArrayList<>(); + list.add(new BizBusinessDeviceMeasureDataDcPower()); + request.setMeasureDataDcPowerList(list); + } + + DictCodeUtils.convertDictCodeToName(request); + request.setActualDivisionValue(request.getActualDivisionValue() + request.getActualDivisionValueUnit()); + Map map = BeanUtil.beanToMap(request); + + List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(request.getDataId()); + if (CollectionUtils.isEmpty(equipmentList)) { + equipmentList = new ArrayList<>(); + equipmentList.add(new MeasureEquipmentInfoDTO()); + } + map.put("equipmentList", equipmentList); + + prepareCertificateParams(map, request.getMeasureDataETwoList()); + prepareParams(map, request.getMeasureDataETwoList()); + prepareCoverParams(map, request.getLabCode()); + List customTemplateUrls = new ArrayList<>(); + log.debug("--------get Certificate template is ...."); + //查询对应封面模板和检定证书模板 + customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); + customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getItemCategoryName())); + SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); + map.put("id", snowflakeUtil.nextId()); + map.put("pdfStatus", 1); + List urlList = new ArrayList<>(); + //除了选用的模板不一致，模板配置流程是一致的 + 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); + } + } + + private void prepareCertificateParams(Map map, List eTwoList) { + //重复性PtOne + List repPtOneList = eTwoList.stream() + .filter(e -> "1".equals(e.getDataType()) + && REPEATABILITY.equals(e.getParams()) + && StringUtils.isNotBlank(e.getPtOne())) + .collect(Collectors.toList()); + //重复性PtTwo + List repPtTwoList = eTwoList.stream() + .filter(e -> "1".equals(e.getDataType()) + && REPEATABILITY.equals(e.getParams()) + && StringUtils.isNotBlank(e.getPtTwo())) + .collect(Collectors.toList()); + BizBusinessDeviceMeasureDataETwo repOne = repPtOneList.get(0); + repOne.setPtOne( repOne.getPtOne() + repOne.getPtOneUnit()); + + map.put("repOne", repOne); + BizBusinessDeviceMeasureDataETwo repTwo = repPtTwoList.get(0); + repTwo.setPtTwo(repTwo.getPtTwo() + repTwo.getPtTwoUnit()); + + map.put("repTwo", repTwo); + + //偏载误差PtOne + List loadPtOneList = eTwoList.stream() + .filter(e -> "2".equals(e.getDataType()) + && OFFSET_LOAD_ERROR.equals(e.getParams()) + && StringUtils.isNotBlank(e.getPtOne())) + .collect(Collectors.toList()); + //偏载误差PtTwo + List loadPtTwoList = eTwoList.stream() + .filter(e -> "2".equals(e.getDataType()) + && OFFSET_LOAD_ERROR.equals(e.getParams()) + && StringUtils.isNotBlank(e.getPtTwo())) + .collect(Collectors.toList()); + BizBusinessDeviceMeasureDataETwo loadOne = loadPtOneList.get(0); + loadOne.setPtOne(loadOne.getPtOne() + loadOne.getPtOneUnit()); + map.put("loadOne", loadOne); + BizBusinessDeviceMeasureDataETwo loadTwo = loadPtTwoList.get(0); + loadTwo.setPtTwo(loadTwo.getPtTwo() + loadTwo.getPtTwoUnit()); + map.put("loadTwo", loadTwo); + + //局部示值误差PtOne + List errorPtOneList = eTwoList.stream() + .filter(e -> "3".equals(e.getDataType()) + && LOCAL_INDICATION_ERROR.equals(e.getParams()) + && StringUtils.isNotBlank(e.getPtOne())) + .collect(Collectors.toList()); + //局部示值误差PtTwo + List errorPtTwoList = eTwoList.stream() + .filter(e -> "3".equals(e.getDataType()) + && LOCAL_INDICATION_ERROR.equals(e.getParams()) + && StringUtils.isNotBlank(e.getPtTwo())) + .collect(Collectors.toList()); + + BizBusinessDeviceMeasureDataETwo errorOne = errorPtOneList.get(0); + errorOne.setPtOne(errorOne.getPtOne() + errorOne.getPtOneUnit()); + map.put("errorOne", errorOne); + BizBusinessDeviceMeasureDataETwo errorTwo = errorPtTwoList.get(0); + errorTwo.setPtTwo(errorTwo.getPtTwo() + errorTwo.getPtTwoUnit()); + map.put("errorTwo", errorTwo); + } + + /** + * 检查是否能生成证书 + */ + private Boolean checkOutUnablePrint(BizBusinessDeviceMeasureApproval measureItemInfo) { + //通过检定项名称，获取对应的模块配置列表 + if (StringUtils.isNotEmpty(measureItemInfo.getItemCategoryName())) { + if (MEASURE_ITEMS_WITHOUT_CERTIFICATE.contains(measureItemInfo.getItemCategoryName())) { + log.warn(BusinessExceptionEnum.ITEM_CATEGORY_NOT_NULL.getMessage()); + return true; + } + if (CHECKOUT_REPORT.equals(measureItemInfo.getMeasureCategoryName())) { + log.warn(BusinessExceptionEnum.TEST_CATEGORY_IS_NONE.getMessage()); + return true; + } + } else { + log.warn(BusinessExceptionEnum.ITEM_CATEGORY_IS_NULL.getMessage()); + return true; + } + return false; + } +}