diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java index 2b4d377..01253ce 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeHandler.java @@ -4,12 +4,14 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.casic.missiles.core.application.service.AbstractDictService; +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.PrintFileModuleParamsEnum; 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.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataPistonGauge; import com.casic.missiles.model.business.BizBusinessDeviceMeasureItemConfigPistonGauge; @@ -26,6 +28,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; import java.util.*; import java.util.stream.Collectors; @@ -43,6 +46,7 @@ private final PrintFileRegister printFileRegister; private final SnowflakeUtil snowflakeUtil; + private final BizBusinessDeviceMeasureEquipmentMapper bizBusinessDeviceMeasureEquipmentMapper; @Override public List doCheckCertificateFile(BizEquipmentStandardCheckRecordApproval request) { @@ -110,7 +114,13 @@ //准备封面参数 prepareCoverParams(map, measureItemInfo.getLabCode()); //参数 - customParam(map); + customParam(map,measureItemInfo.getMeasureDataPistonGaugeList().get(0)); + List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); + if (CollectionUtils.isEmpty(equipmentList)) { + equipmentList = new ArrayList<>(); + equipmentList.add(new MeasureEquipmentInfoDTO()); + } + map.put("equipmentList", equipmentList); //检定数据 measuredDataParam(map, measureItemInfo.getMeasureDataPistonGaugeList()); //这一块逻辑比较复杂 @@ -144,7 +154,13 @@ //准备封面参数 prepareCoverParams(map, measureItemInfo.getLabCode()); measuredDataParam(map, measureItemInfo.getMeasureDataPistonGaugeList()); - customParam(map); + customParam(map, measureItemInfo.getMeasureDataPistonGaugeList().get(0)); + List equipmentList = bizBusinessDeviceMeasureEquipmentMapper.selectEquipmentListByDataId(measureItemInfo.getDataId()); + if (CollectionUtils.isEmpty(equipmentList)) { + equipmentList = new ArrayList<>(); + equipmentList.add(new MeasureEquipmentInfoDTO()); + } + map.put("equipmentList", equipmentList); List customTemplateUrls = new ArrayList<>(); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", measureItemInfo.getMeasureCategoryName())); @@ -178,8 +194,10 @@ map.put("setPointGaugeList", setPointGaugeList); } - private void customParam(Map map) { + private void customParam(Map map, BizBusinessDeviceMeasureDataPistonGauge dataPistonGauge) { BizBusinessDeviceMeasureItemConfigPistonGauge pistonGauge = (BizBusinessDeviceMeasureItemConfigPistonGauge) map.get("measureItemConfigPistonGauge"); + map.put("upToStandard", "\uF0A3"); + map.put("belowStandard", "\uF0A3"); if (ObjectUtils.isNotEmpty(pistonGauge)) { map.put("appearance", pistonGauge.getAppearance() ? "合格" : "不合格*");//外观 map.put("tightness", pistonGauge.getTightness() ? "合格" : "不合格*");//密封性 @@ -188,6 +206,11 @@ map.put("pointerDeflectionStability", pistonGauge.getPointerDeflectionStability() ? "合格" : "不合格*");//指针偏转平稳性 map.put("zeroDriftResult", pistonGauge.getTightness() ? "合格" : "不合格*");//零点漂移 map.put("indicationError", pistonGauge.getIndicationError() ? "合格" : "不合格*");//示值误差、回程误差、轻敲位移 + if(pistonGauge.getZeroDrift()){ + map.put("upToStandard", "\uF052"); + }else { + map.put("belowStandard", "\uF052"); + } } else { convertIntToValue(map, "appearance");//外观 convertIntToValue(map, "tightness");//密封性 @@ -197,6 +220,12 @@ convertIntToValue(map, "zeroDriftResult");//零点漂移 convertIntToValue(map, "indicationError");//示值误差、回程误差、轻敲位移 } + map.put("zeroDriftFive", StringUtils.isNotEmpty(dataPistonGauge.getZeroDriftFive()) ? dataPistonGauge.getZeroDriftFive() : "/");//60 + map.put("zeroDriftFour", StringUtils.isNotEmpty(dataPistonGauge.getZeroDriftFour()) ? dataPistonGauge.getZeroDriftFour() : "/");//45 + map.put("zeroDriftOne", StringUtils.isNotEmpty(dataPistonGauge.getZeroDriftOne()) ? dataPistonGauge.getZeroDriftOne() : "/");//0 + map.put("zeroDriftThree", StringUtils.isNotEmpty(dataPistonGauge.getZeroDriftThree()) ? dataPistonGauge.getZeroDriftThree() : "/");//30 + map.put("zeroDriftTwo", StringUtils.isNotEmpty(dataPistonGauge.getZeroDriftTwo()) ? dataPistonGauge.getZeroDriftTwo() : "/");//15 + } private void convertIntToValue(Map objectMap, String key) { @@ -242,8 +271,8 @@ //创建数据list List> standardCheckList = new ArrayList<>(); map.put(paramKey, standardCheckList); - if(ObjectUtils.isEmpty(map.get("technologyFile"))){ - map.put("technologyFile","无"); + if (ObjectUtils.isEmpty(map.get("technologyFile"))) { + map.put("technologyFile", "无"); } //创建最大界限值list List> maximumList = new ArrayList<>();