diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java index 9b99c8b..6ce55a4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java @@ -1,8 +1,5 @@ package com.casic.missiles.dto.equipment; -import com.baomidou.mybatisplus.annotation.TableField; -import com.casic.missiles.annotation.DictCodeField; -import com.casic.missiles.constants.MeterDictCode; import com.casic.missiles.dto.BaseApprovalListRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -52,14 +49,17 @@ /** * 实验室代码 */ - @ApiModelProperty(value = "实验室代码",dataType = "String") + @ApiModelProperty(value = "实验室代码", dataType = "String") private String labCode; /** * 组别代码 */ - @ApiModelProperty(value = "组别代码",dataType = "String") + @ApiModelProperty(value = "组别代码", dataType = "String") private String groupCode; + + @ApiModelProperty(value = "实验室名称", dataType = "String") + private String labName; /** * 负责人id */ @@ -93,13 +93,13 @@ /** * 生产厂家 */ - @ApiModelProperty(value = "生产厂家",dataType = "String") + @ApiModelProperty(value = "生产厂家", dataType = "String") private String manufacturer; /** * 所属标准装置名称 */ - @ApiModelProperty(value = "所属标准装置名称",dataType = "String") + @ApiModelProperty(value = "所属标准装置名称", dataType = "String") private String meterStandardName; @ApiModelProperty(value = "导出ids", dataType = "List") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java index 9b99c8b..6ce55a4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java @@ -1,8 +1,5 @@ package com.casic.missiles.dto.equipment; -import com.baomidou.mybatisplus.annotation.TableField; -import com.casic.missiles.annotation.DictCodeField; -import com.casic.missiles.constants.MeterDictCode; import com.casic.missiles.dto.BaseApprovalListRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -52,14 +49,17 @@ /** * 实验室代码 */ - @ApiModelProperty(value = "实验室代码",dataType = "String") + @ApiModelProperty(value = "实验室代码", dataType = "String") private String labCode; /** * 组别代码 */ - @ApiModelProperty(value = "组别代码",dataType = "String") + @ApiModelProperty(value = "组别代码", dataType = "String") private String groupCode; + + @ApiModelProperty(value = "实验室名称", dataType = "String") + private String labName; /** * 负责人id */ @@ -93,13 +93,13 @@ /** * 生产厂家 */ - @ApiModelProperty(value = "生产厂家",dataType = "String") + @ApiModelProperty(value = "生产厂家", dataType = "String") private String manufacturer; /** * 所属标准装置名称 */ - @ApiModelProperty(value = "所属标准装置名称",dataType = "String") + @ApiModelProperty(value = "所属标准装置名称", dataType = "String") private String meterStandardName; @ApiModelProperty(value = "导出ids", dataType = "List") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java index c371269..7029a9b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java @@ -422,22 +422,23 @@ Map> measureDataMap = measureItemInfo.getMeasureDataCalibratorList().stream().collect( Collectors.groupingBy(BizBusinessDeviceMeasureDataCalibrator::getParams) ); - if (measureDataMap.get("ACI").isEmpty()) { + + if (CollectionUtils.isEmpty(measureDataMap.get("ACI"))) { addDataRemoveItem(dataItems, startIndex, ""); } else { map.put("firstSeq", (titleIndex++) + "."); } - if (measureDataMap.get("ACV").isEmpty()) { + if (CollectionUtils.isEmpty(measureDataMap.get("ACV"))) { addDataRemoveItem(dataItems, startIndex + 1, ""); } else { map.put("secondSeq", (titleIndex++) + "."); } - if (measureDataMap.get("DCI").isEmpty()) { + if (CollectionUtils.isEmpty(measureDataMap.get("DCI"))) { addDataRemoveItem(dataItems, startIndex + 2, ""); } else { map.put("thirdSeq", (titleIndex++) + "."); } - if (measureDataMap.get("DCV").isEmpty()) { + if (CollectionUtils.isEmpty(measureDataMap.get("DCV"))) { addDataRemoveItem(dataItems, startIndex + 3, ""); } else { map.put("fourthSeq", (titleIndex++) + "."); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java index 9b99c8b..6ce55a4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentApprovalListRequest.java @@ -1,8 +1,5 @@ package com.casic.missiles.dto.equipment; -import com.baomidou.mybatisplus.annotation.TableField; -import com.casic.missiles.annotation.DictCodeField; -import com.casic.missiles.constants.MeterDictCode; import com.casic.missiles.dto.BaseApprovalListRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -52,14 +49,17 @@ /** * 实验室代码 */ - @ApiModelProperty(value = "实验室代码",dataType = "String") + @ApiModelProperty(value = "实验室代码", dataType = "String") private String labCode; /** * 组别代码 */ - @ApiModelProperty(value = "组别代码",dataType = "String") + @ApiModelProperty(value = "组别代码", dataType = "String") private String groupCode; + + @ApiModelProperty(value = "实验室名称", dataType = "String") + private String labName; /** * 负责人id */ @@ -93,13 +93,13 @@ /** * 生产厂家 */ - @ApiModelProperty(value = "生产厂家",dataType = "String") + @ApiModelProperty(value = "生产厂家", dataType = "String") private String manufacturer; /** * 所属标准装置名称 */ - @ApiModelProperty(value = "所属标准装置名称",dataType = "String") + @ApiModelProperty(value = "所属标准装置名称", dataType = "String") private String meterStandardName; @ApiModelProperty(value = "导出ids", dataType = "List") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java index c371269..7029a9b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java @@ -422,22 +422,23 @@ Map> measureDataMap = measureItemInfo.getMeasureDataCalibratorList().stream().collect( Collectors.groupingBy(BizBusinessDeviceMeasureDataCalibrator::getParams) ); - if (measureDataMap.get("ACI").isEmpty()) { + + if (CollectionUtils.isEmpty(measureDataMap.get("ACI"))) { addDataRemoveItem(dataItems, startIndex, ""); } else { map.put("firstSeq", (titleIndex++) + "."); } - if (measureDataMap.get("ACV").isEmpty()) { + if (CollectionUtils.isEmpty(measureDataMap.get("ACV"))) { addDataRemoveItem(dataItems, startIndex + 1, ""); } else { map.put("secondSeq", (titleIndex++) + "."); } - if (measureDataMap.get("DCI").isEmpty()) { + if (CollectionUtils.isEmpty(measureDataMap.get("DCI"))) { addDataRemoveItem(dataItems, startIndex + 2, ""); } else { map.put("thirdSeq", (titleIndex++) + "."); } - if (measureDataMap.get("DCV").isEmpty()) { + if (CollectionUtils.isEmpty(measureDataMap.get("DCV"))) { addDataRemoveItem(dataItems, startIndex + 3, ""); } else { map.put("fourthSeq", (titleIndex++) + "."); 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 43a53e1..669ab99 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 @@ -146,9 +146,9 @@ miniName = createResponseFileInput(printDocUrl, registerParameters.getResponse()); } //删除无效的文件 -// File invalidFile = new File(tempLocalFileDir); -// // 删除运行空间下的文件 -// deleteFile(invalidFile); + File invalidFile = new File(tempLocalFileDir); + // 删除运行空间下的文件 + deleteFile(invalidFile); log.info("证书打印完成......,证书名称为{}", miniName); } return miniName;