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 fb70360..c80b5c9 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 @@ -1,6 +1,8 @@ package com.casic.missiles.service.Impl.eqpt.standard.impl; import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.casic.missiles.dto.business.deviceMeasure.MeasureEquipmentInfoDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrintFileModuleNameEnum; @@ -10,19 +12,18 @@ 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.model.equipment.*; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentSupport; import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.SnowflakeUtil; import com.casic.missiles.utils.SpringContextUtil; +import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.Value; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Component; @@ -62,6 +63,9 @@ //重复性、稳定性 final String[] checkTypes = {REPEATABILITY, STABILITY}; List pointList = Arrays.asList(pointStr); + Map numMap = new HashMap<>(); + numMap.put(1, 6); + numMap.put(2, 3); for (int i = 0; i < pointList.size(); i++) { String points = pointList.get(i); List repList = request.getCheckDataElectricalSafetyList() @@ -75,6 +79,13 @@ mapReplace(repMap); repMapList.add(repMap); } + int size = numMap.get(i + 1) - repMapList.size(); + for (int j = 0; j < size; j++) { + BizEquipmentStandardCheckDataElectricalSafety safety = new BizEquipmentStandardCheckDataElectricalSafety(); + Map safetyMap = BeanUtil.beanToMap(safety); + mapReplace(safetyMap); + repMapList.add(safetyMap); + } map.put(REPEAT_PREFIX + (i + 1), repMapList); } @@ -94,9 +105,21 @@ for (BizEquipmentStandardCheckDataElectricalSafety sta : staList) { Map repMap = BeanUtil.beanToMap(sta); mapReplace(repMap); - repMap.put("lessThan", ObjectUtils.isEmpty(sta.getLessThan()) || 0 == sta.getLessThan() ? "否" : "是"); + if (sta.getLessThan() != null) { + repMap.put("lessThan", 0 == sta.getLessThan() ? "否" : "是"); + } else { + repMap.put("lessThan", ""); + } repMapList.add(repMap); } + int size = numMap.get(i + 1) - repMapList.size(); + for (int j = 0; j < size; j++) { + BizEquipmentStandardCheckDataElectricalSafety safety = new BizEquipmentStandardCheckDataElectricalSafety(); + Map safetyMap = BeanUtil.beanToMap(safety); + mapReplace(safetyMap); + safetyMap.put("lessThan", ""); + repMapList.add(safetyMap); + } map.put(STA_PREFIX + (i + 1) + UP_STANDARD, "\uF0A3"); map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF0A3"); if (1 == staList.get(0).getQualified()) { @@ -199,7 +222,6 @@ } - private void prepareParams(List electricalSafetyList, Map map) { List> voltageList = electricalSafetyList.stream() .filter(e -> "1".equals(e.getDataType())).map(BeanUtil::beanToMap).collect(Collectors.toList());