diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index e89ca84..2d2bd12 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -45,6 +45,10 @@ EQUIPMENT_INFO_NOT_EXIST(2413, "设备台账不存在"), + CHECK_DATA_ELECTRICAL_SAFETY_IS_EMPTY(2415,"多功能电气核查数据为空"), + + CHECK_DATA_ELECTRICAL_SAFETY_VOLTAGE_IS_EMPTY(2416,"多功能电气核查数据直流电压为空"), + /** * 资源管理模块 */ @@ -63,6 +67,7 @@ ORDER_DATE_NOT_EXIST(2513,"委托日期不存在"), ORDER_DATE_FORMAT_FAILED(2514,"委托日期格式异常"), VALID_DATE_NOT_EXIST(2515,"有效日期不存在"), + NOT_FOUND_EQUIPMENT_INFO(2516,"未找到复查设备列表"), /** * 计量检定业务模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index e89ca84..2d2bd12 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -45,6 +45,10 @@ EQUIPMENT_INFO_NOT_EXIST(2413, "设备台账不存在"), + CHECK_DATA_ELECTRICAL_SAFETY_IS_EMPTY(2415,"多功能电气核查数据为空"), + + CHECK_DATA_ELECTRICAL_SAFETY_VOLTAGE_IS_EMPTY(2416,"多功能电气核查数据直流电压为空"), + /** * 资源管理模块 */ @@ -63,6 +67,7 @@ ORDER_DATE_NOT_EXIST(2513,"委托日期不存在"), ORDER_DATE_FORMAT_FAILED(2514,"委托日期格式异常"), VALID_DATE_NOT_EXIST(2515,"有效日期不存在"), + NOT_FOUND_EQUIPMENT_INFO(2516,"未找到复查设备列表"), /** * 计量检定业务模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 89cfae2..3c5d81f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -25,6 +25,7 @@ String MULTIFUNCTION_CHECK_DATA = "多功能核查数据"; String MEASURE_DATA_APPROVAL = "检定数据管理审批"; String RESISTANCE_CHECK_DATA = "活塞式压力"; + String ELECTRICAL_SAFETY_CHECK_DATA = "多功能电气安全"; String FILE_CHANGE_FORM = "文件更改申请单"; @@ -105,6 +106,8 @@ String EQUIPMENT_BORROWING = "设备借用管理"; String EQUIPMENT_STATUS_ENABLE = "设备启封登记表"; String EQUIPMENT_STATUS_UNABLE = "设备封存登记表"; + String EQUIPMENT_STATUS_DISCARD = "设备报废登记表"; + String EQUIPMENT_STATUS_DISABLE = "设备禁用登记表"; String EQUIPMENT_PACKING = "设备运输装箱管理"; String EQUIPMENT_TRANSPORTATION_PROCESS = "设备运输过程管理"; String EXCEPTION_HANDLING = "异常情况处置处理"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index e89ca84..2d2bd12 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -45,6 +45,10 @@ EQUIPMENT_INFO_NOT_EXIST(2413, "设备台账不存在"), + CHECK_DATA_ELECTRICAL_SAFETY_IS_EMPTY(2415,"多功能电气核查数据为空"), + + CHECK_DATA_ELECTRICAL_SAFETY_VOLTAGE_IS_EMPTY(2416,"多功能电气核查数据直流电压为空"), + /** * 资源管理模块 */ @@ -63,6 +67,7 @@ ORDER_DATE_NOT_EXIST(2513,"委托日期不存在"), ORDER_DATE_FORMAT_FAILED(2514,"委托日期格式异常"), VALID_DATE_NOT_EXIST(2515,"有效日期不存在"), + NOT_FOUND_EQUIPMENT_INFO(2516,"未找到复查设备列表"), /** * 计量检定业务模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 89cfae2..3c5d81f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -25,6 +25,7 @@ String MULTIFUNCTION_CHECK_DATA = "多功能核查数据"; String MEASURE_DATA_APPROVAL = "检定数据管理审批"; String RESISTANCE_CHECK_DATA = "活塞式压力"; + String ELECTRICAL_SAFETY_CHECK_DATA = "多功能电气安全"; String FILE_CHANGE_FORM = "文件更改申请单"; @@ -105,6 +106,8 @@ String EQUIPMENT_BORROWING = "设备借用管理"; String EQUIPMENT_STATUS_ENABLE = "设备启封登记表"; String EQUIPMENT_STATUS_UNABLE = "设备封存登记表"; + String EQUIPMENT_STATUS_DISCARD = "设备报废登记表"; + String EQUIPMENT_STATUS_DISABLE = "设备禁用登记表"; String EQUIPMENT_PACKING = "设备运输装箱管理"; String EQUIPMENT_TRANSPORTATION_PROCESS = "设备运输过程管理"; String EXCEPTION_HANDLING = "异常情况处置处理"; 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 4d188dd..602e0f2 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 @@ -106,7 +106,35 @@ String WORST_POINT ="最差点"; String MODEL_POINT ="典型点"; - String STABILITY ="稳定性"; - String REPEATABILITY ="重复性"; + + /** + * 重复性 + */ + String REPEATABILITY = "重复性"; + + /** + * 稳定性 + */ + String STABILITY = "稳定性"; + + /** + * 直流电压 + */ + String DC_VOLTAGE = "直流电压"; + + /** + * 电阻测量 + */ + String RESISTANCE_MEASUREMENT = "电阻测量"; + + /** + * 结论-合格 + */ + String QUALIFIED = "合格"; + + /** + * 结论-不合格 + */ + String UNQUALIFIED = "不合格"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index e89ca84..2d2bd12 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -45,6 +45,10 @@ EQUIPMENT_INFO_NOT_EXIST(2413, "设备台账不存在"), + CHECK_DATA_ELECTRICAL_SAFETY_IS_EMPTY(2415,"多功能电气核查数据为空"), + + CHECK_DATA_ELECTRICAL_SAFETY_VOLTAGE_IS_EMPTY(2416,"多功能电气核查数据直流电压为空"), + /** * 资源管理模块 */ @@ -63,6 +67,7 @@ ORDER_DATE_NOT_EXIST(2513,"委托日期不存在"), ORDER_DATE_FORMAT_FAILED(2514,"委托日期格式异常"), VALID_DATE_NOT_EXIST(2515,"有效日期不存在"), + NOT_FOUND_EQUIPMENT_INFO(2516,"未找到复查设备列表"), /** * 计量检定业务模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 89cfae2..3c5d81f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -25,6 +25,7 @@ String MULTIFUNCTION_CHECK_DATA = "多功能核查数据"; String MEASURE_DATA_APPROVAL = "检定数据管理审批"; String RESISTANCE_CHECK_DATA = "活塞式压力"; + String ELECTRICAL_SAFETY_CHECK_DATA = "多功能电气安全"; String FILE_CHANGE_FORM = "文件更改申请单"; @@ -105,6 +106,8 @@ String EQUIPMENT_BORROWING = "设备借用管理"; String EQUIPMENT_STATUS_ENABLE = "设备启封登记表"; String EQUIPMENT_STATUS_UNABLE = "设备封存登记表"; + String EQUIPMENT_STATUS_DISCARD = "设备报废登记表"; + String EQUIPMENT_STATUS_DISABLE = "设备禁用登记表"; String EQUIPMENT_PACKING = "设备运输装箱管理"; String EQUIPMENT_TRANSPORTATION_PROCESS = "设备运输过程管理"; String EXCEPTION_HANDLING = "异常情况处置处理"; 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 4d188dd..602e0f2 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 @@ -106,7 +106,35 @@ String WORST_POINT ="最差点"; String MODEL_POINT ="典型点"; - String STABILITY ="稳定性"; - String REPEATABILITY ="重复性"; + + /** + * 重复性 + */ + String REPEATABILITY = "重复性"; + + /** + * 稳定性 + */ + String STABILITY = "稳定性"; + + /** + * 直流电压 + */ + String DC_VOLTAGE = "直流电压"; + + /** + * 电阻测量 + */ + String RESISTANCE_MEASUREMENT = "电阻测量"; + + /** + * 结论-合格 + */ + String QUALIFIED = "合格"; + + /** + * 结论-不合格 + */ + String UNQUALIFIED = "不合格"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckRecordApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckRecordApproval.java index 4a95a20..c6afc46 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckRecordApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckRecordApproval.java @@ -212,6 +212,10 @@ @TableField(exist = false) private List checkDataPistonGaugeList; + @ApiModelProperty(value = "核查数据-多功能电气(打印)") + @TableField(exist = false) + private List checkDataElectricalSafetyList; + @ApiModelProperty(value = "标准装置编号", dataType = "String") @TableField(exist = false) private String belongStandardEquipment; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index e89ca84..2d2bd12 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -45,6 +45,10 @@ EQUIPMENT_INFO_NOT_EXIST(2413, "设备台账不存在"), + CHECK_DATA_ELECTRICAL_SAFETY_IS_EMPTY(2415,"多功能电气核查数据为空"), + + CHECK_DATA_ELECTRICAL_SAFETY_VOLTAGE_IS_EMPTY(2416,"多功能电气核查数据直流电压为空"), + /** * 资源管理模块 */ @@ -63,6 +67,7 @@ ORDER_DATE_NOT_EXIST(2513,"委托日期不存在"), ORDER_DATE_FORMAT_FAILED(2514,"委托日期格式异常"), VALID_DATE_NOT_EXIST(2515,"有效日期不存在"), + NOT_FOUND_EQUIPMENT_INFO(2516,"未找到复查设备列表"), /** * 计量检定业务模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index 89cfae2..3c5d81f 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -25,6 +25,7 @@ String MULTIFUNCTION_CHECK_DATA = "多功能核查数据"; String MEASURE_DATA_APPROVAL = "检定数据管理审批"; String RESISTANCE_CHECK_DATA = "活塞式压力"; + String ELECTRICAL_SAFETY_CHECK_DATA = "多功能电气安全"; String FILE_CHANGE_FORM = "文件更改申请单"; @@ -105,6 +106,8 @@ String EQUIPMENT_BORROWING = "设备借用管理"; String EQUIPMENT_STATUS_ENABLE = "设备启封登记表"; String EQUIPMENT_STATUS_UNABLE = "设备封存登记表"; + String EQUIPMENT_STATUS_DISCARD = "设备报废登记表"; + String EQUIPMENT_STATUS_DISABLE = "设备禁用登记表"; String EQUIPMENT_PACKING = "设备运输装箱管理"; String EQUIPMENT_TRANSPORTATION_PROCESS = "设备运输过程管理"; String EXCEPTION_HANDLING = "异常情况处置处理"; 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 4d188dd..602e0f2 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 @@ -106,7 +106,35 @@ String WORST_POINT ="最差点"; String MODEL_POINT ="典型点"; - String STABILITY ="稳定性"; - String REPEATABILITY ="重复性"; + + /** + * 重复性 + */ + String REPEATABILITY = "重复性"; + + /** + * 稳定性 + */ + String STABILITY = "稳定性"; + + /** + * 直流电压 + */ + String DC_VOLTAGE = "直流电压"; + + /** + * 电阻测量 + */ + String RESISTANCE_MEASUREMENT = "电阻测量"; + + /** + * 结论-合格 + */ + String QUALIFIED = "合格"; + + /** + * 结论-不合格 + */ + String UNQUALIFIED = "不合格"; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckRecordApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckRecordApproval.java index 4a95a20..c6afc46 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckRecordApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckRecordApproval.java @@ -212,6 +212,10 @@ @TableField(exist = false) private List checkDataPistonGaugeList; + @ApiModelProperty(value = "核查数据-多功能电气(打印)") + @TableField(exist = false) + private List checkDataElectricalSafetyList; + @ApiModelProperty(value = "标准装置编号", dataType = "String") @TableField(exist = false) private String belongStandardEquipment; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java index 9bd8a47..c1f22a0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java @@ -4,12 +4,16 @@ import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; +import com.casic.missiles.enums.business.MeasureCategoryEnum; import com.casic.missiles.enums.business.MeasureItemBelongStandardEquipmentDictEnum; 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.*; +import com.casic.missiles.model.equipment.BizEquipmentInfo; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataCalibrator; +import com.casic.missiles.model.equipment.BizEquipmentStandardCheckDataElectricalSafety; 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; @@ -18,17 +22,17 @@ import com.casic.missiles.utils.SnowflakeUtil; import com.casic.missiles.utils.SpringContextUtil; import lombok.RequiredArgsConstructor; +import lombok.Value; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; /** * @Author: TuT @@ -39,10 +43,102 @@ @RequiredArgsConstructor @Slf4j public class MultiElectricalHandler extends StandardEquipmentSupport implements PrintFileModuleNameEnum, StandardEquipmentPrint { - @Override - public List doCheckCertificateFile(BizEquipmentStandardCheckRecordApproval measureItemInfo) { - return null; + + @Override + public List doCheckCertificateFile(BizEquipmentStandardCheckRecordApproval request) { + for (BizEquipmentInfo checkEquipment : request.getCheckEquipmentList()) { + checkEquipment.setEquipmentType("测量设备"); + } + try { + //健壮性判断 + if (ObjectUtils.isEmpty(request)) { + return null; + } + Map map = BeanUtil.beanToMap(request); + String[] pointStr = {DC_VOLTAGE, RESISTANCE_MEASUREMENT}; + //重复性、稳定性 + final String[] checkTypes = {REPEATABILITY, STABILITY}; + List pointList = Arrays.asList(pointStr); + for (int i = 0; i < pointList.size(); i++) { + String points = pointList.get(i); + List repList = request.getCheckDataElectricalSafetyList() + .stream().filter(e -> points.equals(e.getParams()) + && checkTypes[0].equals(e.getCheckType()) + && StringUtils.isEmpty(e.getTestValueFiveDate())).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(repList)) { + List repMapList = new ArrayList<>(); + for (BizEquipmentStandardCheckDataElectricalSafety rep : repList) { + Map repMap = BeanUtil.beanToMap(rep); + repMapList.add(repMap); + } + map.put(REPEAT_PREFIX + (i + 1), repMapList); + } + + List staList = request.getCheckDataElectricalSafetyList() + .stream().filter(e -> points.equals(e.getParams()) + && checkTypes[1].equals(e.getCheckType()) + && (StringUtils.isNotEmpty(e.getTestValueOneDate()) + || StringUtils.isNotEmpty(e.getTestValueTwoDate()) + || StringUtils.isNotEmpty(e.getTestValueThreeDate()) + || StringUtils.isNotEmpty(e.getTestValueFourDate()) + || StringUtils.isNotEmpty(e.getTestValueFiveDate()) + || StringUtils.isNotEmpty(e.getTestValueSixDate())) + ).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(staList)) { + statisticalDate(staList, STA_PREFIX + (i + 1), map); + List repMapList = new ArrayList<>(); + for (BizEquipmentStandardCheckDataElectricalSafety sta : staList) { + Map repMap = BeanUtil.beanToMap(sta); + repMap.put("lessThan", ObjectUtils.isEmpty(sta.getLessThan()) || 0 == sta.getLessThan() ? "否" : "是"); + repMapList.add(repMap); + } + map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF0A3"); + map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF0A3"); + if (1==staList.get(0).getQualified()) { + map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF052"); + } else { + map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF052"); + } + map.put(STA_PREFIX + (i + 1), repMapList); + } + } + //除了选用的模板不一致，模板配置流程是一致的 + PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class); + String wordUrl = printFileRegister.registerPrintFile(ELECTRICAL_SAFETY_CHECK_DATA, "数据打印", null, map, false, null, null); + List urlList = new ArrayList<>(); + if (StringUtils.isNotEmpty(wordUrl)) { + urlList.add(wordUrl); + } + if (map.containsKey("pdfUrl")) { + urlList.add((String) map.get("pdfUrl")); + } + return urlList; + }catch (Exception ex){ + log.info("-----package data is exception， this is {}", ex); + throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); + } + } + + /** + * 组装参数 + * + * @param sta + * @param strListParam + * @param map + */ + private void statisticalDate(List sta, String strListParam, Map map) { + //再次健壮性判断，防止其他方法调用，或者已经存在直接退出 + if (CollectionUtils.isEmpty(sta) || map.containsKey(strListParam + DATE_PREFIX + 1)) { + return; + } + BizEquipmentStandardCheckDataElectricalSafety dataCalibrator = sta.get(0); + map.put(strListParam + DATE_PREFIX + 1, dataCalibrator.getTestValueOneDate()); + map.put(strListParam + DATE_PREFIX + 2, dataCalibrator.getTestValueTwoDate()); + map.put(strListParam + DATE_PREFIX + 3, dataCalibrator.getTestValueThreeDate()); + map.put(strListParam + DATE_PREFIX + 4, dataCalibrator.getTestValueFourDate()); + map.put(strListParam + DATE_PREFIX + 5, dataCalibrator.getTestValueFiveDate()); + map.put(strListParam + DATE_PREFIX + 6, dataCalibrator.getTestValueSixDate()); } @Override