diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataDcPower.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataDcPower.java index 060ddbf..9b02983 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataDcPower.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataDcPower.java @@ -252,6 +252,10 @@ @TableField("short_term_stability") private String shortTermStability; + @ApiModelProperty(value = "频率",dataType = "String") + @TableField(exist = false) + private String frequency; + /** * 超出范围标*(1/0) */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataDcPower.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataDcPower.java index 060ddbf..9b02983 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataDcPower.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataDcPower.java @@ -252,6 +252,10 @@ @TableField("short_term_stability") private String shortTermStability; + @ApiModelProperty(value = "频率",dataType = "String") + @TableField(exist = false) + private String frequency; + /** * 超出范围标*(1/0) */ 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 49486b0..47df097 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 @@ -111,7 +111,7 @@ repMapList.add(repMap); } int size = numMap.get(i + 1) - repMapList.size(); - for (int j = 0; j < size; j++) { + for (int j = 0; j < 8; j++) { BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); Map powerMap = BeanUtil.beanToMap(dcPower); mapReplace(powerMap); @@ -144,7 +144,7 @@ repMapList.add(repMap); } int size = numMap.get(i + 1) - repMapList.size(); - for (int j = 0; j < size; j++) { + for (int j = 0; j < 8; j++) { BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); Map powerMap = BeanUtil.beanToMap(dcPower); mapReplace(powerMap); @@ -174,7 +174,7 @@ repMapList.add(repMap); } int size = numMap.get(5) - repMapList.size(); - for (int j = 0; j < size; j++) { + for (int j = 0; j < 8; j++) { BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); Map powerMap = BeanUtil.beanToMap(dcPower); mapReplace(powerMap); @@ -206,7 +206,7 @@ repMapList.add(repMap); } int size = numMap.get(5) - repMapList.size(); - for (int j = 0; j < size; j++) { + for (int j = 0; j < 8; j++) { BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); Map powerMap = BeanUtil.beanToMap(dcPower); mapReplace(powerMap); @@ -273,6 +273,7 @@ //组装原始记录打印参数 prepareParams(dcPowerList, map); + map.put("pdfStatus", 1); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "1", request.getItemCategoryName())); //与证书模板区分 @@ -280,7 +281,7 @@ map.put("id", snowflakeUtil.nextId()); log.debug("original before ----"); //除了选用的模板不一致，模板配置流程是一致的 - String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, templateUrls); + String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); urlList.add(originalWordUrlFile); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataDcPower.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataDcPower.java index 060ddbf..9b02983 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataDcPower.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataDcPower.java @@ -252,6 +252,10 @@ @TableField("short_term_stability") private String shortTermStability; + @ApiModelProperty(value = "频率",dataType = "String") + @TableField(exist = false) + private String frequency; + /** * 超出范围标*(1/0) */ 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 49486b0..47df097 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 @@ -111,7 +111,7 @@ repMapList.add(repMap); } int size = numMap.get(i + 1) - repMapList.size(); - for (int j = 0; j < size; j++) { + for (int j = 0; j < 8; j++) { BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); Map powerMap = BeanUtil.beanToMap(dcPower); mapReplace(powerMap); @@ -144,7 +144,7 @@ repMapList.add(repMap); } int size = numMap.get(i + 1) - repMapList.size(); - for (int j = 0; j < size; j++) { + for (int j = 0; j < 8; j++) { BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); Map powerMap = BeanUtil.beanToMap(dcPower); mapReplace(powerMap); @@ -174,7 +174,7 @@ repMapList.add(repMap); } int size = numMap.get(5) - repMapList.size(); - for (int j = 0; j < size; j++) { + for (int j = 0; j < 8; j++) { BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); Map powerMap = BeanUtil.beanToMap(dcPower); mapReplace(powerMap); @@ -206,7 +206,7 @@ repMapList.add(repMap); } int size = numMap.get(5) - repMapList.size(); - for (int j = 0; j < size; j++) { + for (int j = 0; j < 8; j++) { BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); Map powerMap = BeanUtil.beanToMap(dcPower); mapReplace(powerMap); @@ -273,6 +273,7 @@ //组装原始记录打印参数 prepareParams(dcPowerList, map); + map.put("pdfStatus", 1); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "1", request.getItemCategoryName())); //与证书模板区分 @@ -280,7 +281,7 @@ map.put("id", snowflakeUtil.nextId()); log.debug("original before ----"); //除了选用的模板不一致，模板配置流程是一致的 - String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, templateUrls); + String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); urlList.add(originalWordUrlFile); 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 index 018d497..27c06d8 100644 --- 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 @@ -293,14 +293,16 @@ //准备填充参数 prepareParams(map, request.getMeasureDataETwoList()); prepareCoverParams(map, request.getLabCode()); + List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "1", request.getItemCategoryName())); //与证书模板区分 SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); + map.put("pdfStatus", 1); log.debug("original before ----"); //除了选用的模板不一致，模板配置流程是一致的 - String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, templateUrls); + String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); urlList.add(originalWordUrlFile); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataDcPower.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataDcPower.java index 060ddbf..9b02983 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataDcPower.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataDcPower.java @@ -252,6 +252,10 @@ @TableField("short_term_stability") private String shortTermStability; + @ApiModelProperty(value = "频率",dataType = "String") + @TableField(exist = false) + private String frequency; + /** * 超出范围标*(1/0) */ 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 49486b0..47df097 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 @@ -111,7 +111,7 @@ repMapList.add(repMap); } int size = numMap.get(i + 1) - repMapList.size(); - for (int j = 0; j < size; j++) { + for (int j = 0; j < 8; j++) { BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); Map powerMap = BeanUtil.beanToMap(dcPower); mapReplace(powerMap); @@ -144,7 +144,7 @@ repMapList.add(repMap); } int size = numMap.get(i + 1) - repMapList.size(); - for (int j = 0; j < size; j++) { + for (int j = 0; j < 8; j++) { BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); Map powerMap = BeanUtil.beanToMap(dcPower); mapReplace(powerMap); @@ -174,7 +174,7 @@ repMapList.add(repMap); } int size = numMap.get(5) - repMapList.size(); - for (int j = 0; j < size; j++) { + for (int j = 0; j < 8; j++) { BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); Map powerMap = BeanUtil.beanToMap(dcPower); mapReplace(powerMap); @@ -206,7 +206,7 @@ repMapList.add(repMap); } int size = numMap.get(5) - repMapList.size(); - for (int j = 0; j < size; j++) { + for (int j = 0; j < 8; j++) { BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); Map powerMap = BeanUtil.beanToMap(dcPower); mapReplace(powerMap); @@ -273,6 +273,7 @@ //组装原始记录打印参数 prepareParams(dcPowerList, map); + map.put("pdfStatus", 1); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "1", request.getItemCategoryName())); //与证书模板区分 @@ -280,7 +281,7 @@ map.put("id", snowflakeUtil.nextId()); log.debug("original before ----"); //除了选用的模板不一致，模板配置流程是一致的 - String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, templateUrls); + String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); urlList.add(originalWordUrlFile); 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 index 018d497..27c06d8 100644 --- 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 @@ -293,14 +293,16 @@ //准备填充参数 prepareParams(map, request.getMeasureDataETwoList()); prepareCoverParams(map, request.getLabCode()); + List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "1", request.getItemCategoryName())); //与证书模板区分 SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); + map.put("pdfStatus", 1); log.debug("original before ----"); //除了选用的模板不一致，模板配置流程是一致的 - String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, templateUrls); + String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); urlList.add(originalWordUrlFile); 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 fbe4e92..50bd57d 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 @@ -2,7 +2,6 @@ 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,9 +9,11 @@ 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.*; +import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataElectricalSafety; +import com.casic.missiles.model.equipment.BizEquipmentInfo; +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; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -21,20 +22,15 @@ 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; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import reactor.core.publisher.Mono; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * @Author: TuT @@ -169,6 +165,61 @@ map.put(strListParam + DATE_PREFIX + 6, StringUtils.isNotBlank(dataCalibrator.getTestValueSixDate()) ? dataCalibrator.getTestValueSixDate() : "/"); } + public static void main(String[] args) { + Student student = new Student(); + student.setName("123"); + student.setAge("11"); + List adjustList = new ArrayList<>(); + for (int i = 0; i < 5; i++) { + Adjust adjust = new Adjust(); + adjust.setAdjustName("123" + i); + adjust.setAdjustTime("111" + i); + adjustList.add(adjust); + } + student.setAdjustList(adjustList); + Map map = BeanUtil.beanToMap(student); + List excludedKeys = Arrays.asList("approvalStatus", "processId", "createUserId", "createUserName", + "checkUserName", "approvalStatusName", "taskId", "decisionItem", "staffName", "lessThan"); + map.forEach((k, v) -> { + if (v instanceof Collection) { + List list = (List) v; + List> objectList = new ArrayList<>(); + list.forEach(obj -> { + Map objectMap = BeanUtil.beanToMap(obj); + objectMap.forEach((k1, v1) -> { + if (!excludedKeys.contains(k1) && org.springframework.util.ObjectUtils.isEmpty(v1)) { + objectMap.put(k1, "/"); + } + }); + objectList.add(objectMap); + }); + map.put(k, objectList); + } else { + if (!excludedKeys.contains(k) && org.springframework.util.ObjectUtils.isEmpty(v)) { + map.put(k, "/"); + } + } + }); + String jsonString = JSON.toJSONString(map); + System.out.println(jsonString); + ; + } + + @Data + private static class Student { + private String name; + private String age; + private String score; + private List adjustList; + } + + @Data + private static class Adjust { + private String AdjustName; + private String AdjustTime; + private String AdjustAge; + } + @Override public List doCreateOriginalFile(BizBusinessDeviceMeasureApproval request) { try { diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataDcPower.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataDcPower.java index 060ddbf..9b02983 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataDcPower.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataDcPower.java @@ -252,6 +252,10 @@ @TableField("short_term_stability") private String shortTermStability; + @ApiModelProperty(value = "频率",dataType = "String") + @TableField(exist = false) + private String frequency; + /** * 超出范围标*(1/0) */ 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 49486b0..47df097 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 @@ -111,7 +111,7 @@ repMapList.add(repMap); } int size = numMap.get(i + 1) - repMapList.size(); - for (int j = 0; j < size; j++) { + for (int j = 0; j < 8; j++) { BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); Map powerMap = BeanUtil.beanToMap(dcPower); mapReplace(powerMap); @@ -144,7 +144,7 @@ repMapList.add(repMap); } int size = numMap.get(i + 1) - repMapList.size(); - for (int j = 0; j < size; j++) { + for (int j = 0; j < 8; j++) { BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); Map powerMap = BeanUtil.beanToMap(dcPower); mapReplace(powerMap); @@ -174,7 +174,7 @@ repMapList.add(repMap); } int size = numMap.get(5) - repMapList.size(); - for (int j = 0; j < size; j++) { + for (int j = 0; j < 8; j++) { BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); Map powerMap = BeanUtil.beanToMap(dcPower); mapReplace(powerMap); @@ -206,7 +206,7 @@ repMapList.add(repMap); } int size = numMap.get(5) - repMapList.size(); - for (int j = 0; j < size; j++) { + for (int j = 0; j < 8; j++) { BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); Map powerMap = BeanUtil.beanToMap(dcPower); mapReplace(powerMap); @@ -273,6 +273,7 @@ //组装原始记录打印参数 prepareParams(dcPowerList, map); + map.put("pdfStatus", 1); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "1", request.getItemCategoryName())); //与证书模板区分 @@ -280,7 +281,7 @@ map.put("id", snowflakeUtil.nextId()); log.debug("original before ----"); //除了选用的模板不一致，模板配置流程是一致的 - String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, templateUrls); + String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); urlList.add(originalWordUrlFile); 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 index 018d497..27c06d8 100644 --- 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 @@ -293,14 +293,16 @@ //准备填充参数 prepareParams(map, request.getMeasureDataETwoList()); prepareCoverParams(map, request.getLabCode()); + List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "1", request.getItemCategoryName())); //与证书模板区分 SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); + map.put("pdfStatus", 1); log.debug("original before ----"); //除了选用的模板不一致，模板配置流程是一致的 - String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, templateUrls); + String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); urlList.add(originalWordUrlFile); 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 fbe4e92..50bd57d 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 @@ -2,7 +2,6 @@ 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,9 +9,11 @@ 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.*; +import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataElectricalSafety; +import com.casic.missiles.model.equipment.BizEquipmentInfo; +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; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -21,20 +22,15 @@ 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; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import reactor.core.publisher.Mono; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * @Author: TuT @@ -169,6 +165,61 @@ map.put(strListParam + DATE_PREFIX + 6, StringUtils.isNotBlank(dataCalibrator.getTestValueSixDate()) ? dataCalibrator.getTestValueSixDate() : "/"); } + public static void main(String[] args) { + Student student = new Student(); + student.setName("123"); + student.setAge("11"); + List adjustList = new ArrayList<>(); + for (int i = 0; i < 5; i++) { + Adjust adjust = new Adjust(); + adjust.setAdjustName("123" + i); + adjust.setAdjustTime("111" + i); + adjustList.add(adjust); + } + student.setAdjustList(adjustList); + Map map = BeanUtil.beanToMap(student); + List excludedKeys = Arrays.asList("approvalStatus", "processId", "createUserId", "createUserName", + "checkUserName", "approvalStatusName", "taskId", "decisionItem", "staffName", "lessThan"); + map.forEach((k, v) -> { + if (v instanceof Collection) { + List list = (List) v; + List> objectList = new ArrayList<>(); + list.forEach(obj -> { + Map objectMap = BeanUtil.beanToMap(obj); + objectMap.forEach((k1, v1) -> { + if (!excludedKeys.contains(k1) && org.springframework.util.ObjectUtils.isEmpty(v1)) { + objectMap.put(k1, "/"); + } + }); + objectList.add(objectMap); + }); + map.put(k, objectList); + } else { + if (!excludedKeys.contains(k) && org.springframework.util.ObjectUtils.isEmpty(v)) { + map.put(k, "/"); + } + } + }); + String jsonString = JSON.toJSONString(map); + System.out.println(jsonString); + ; + } + + @Data + private static class Student { + private String name; + private String age; + private String score; + private List adjustList; + } + + @Data + private static class Adjust { + private String AdjustName; + private String AdjustTime; + private String AdjustAge; + } + @Override public List doCreateOriginalFile(BizBusinessDeviceMeasureApproval request) { try { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ResistanceThermometerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ResistanceThermometerHandler.java index 5971090..230418e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ResistanceThermometerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ResistanceThermometerHandler.java @@ -222,9 +222,10 @@ //与证书模板区分 SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); + map.put("pdfStatus", 1); log.debug("original before ----"); //除了选用的模板不一致，模板配置流程是一致的 - String originalUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, templateUrls); + String originalUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalUrlFile); List urlList = new ArrayList<>(); urlList.add(originalUrlFile); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataDcPower.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataDcPower.java index 060ddbf..9b02983 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataDcPower.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureDataDcPower.java @@ -252,6 +252,10 @@ @TableField("short_term_stability") private String shortTermStability; + @ApiModelProperty(value = "频率",dataType = "String") + @TableField(exist = false) + private String frequency; + /** * 超出范围标*(1/0) */ 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 49486b0..47df097 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 @@ -111,7 +111,7 @@ repMapList.add(repMap); } int size = numMap.get(i + 1) - repMapList.size(); - for (int j = 0; j < size; j++) { + for (int j = 0; j < 8; j++) { BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); Map powerMap = BeanUtil.beanToMap(dcPower); mapReplace(powerMap); @@ -144,7 +144,7 @@ repMapList.add(repMap); } int size = numMap.get(i + 1) - repMapList.size(); - for (int j = 0; j < size; j++) { + for (int j = 0; j < 8; j++) { BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); Map powerMap = BeanUtil.beanToMap(dcPower); mapReplace(powerMap); @@ -174,7 +174,7 @@ repMapList.add(repMap); } int size = numMap.get(5) - repMapList.size(); - for (int j = 0; j < size; j++) { + for (int j = 0; j < 8; j++) { BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); Map powerMap = BeanUtil.beanToMap(dcPower); mapReplace(powerMap); @@ -206,7 +206,7 @@ repMapList.add(repMap); } int size = numMap.get(5) - repMapList.size(); - for (int j = 0; j < size; j++) { + for (int j = 0; j < 8; j++) { BizEquipmentStandardCheckDataDcPower dcPower = new BizEquipmentStandardCheckDataDcPower(); Map powerMap = BeanUtil.beanToMap(dcPower); mapReplace(powerMap); @@ -273,6 +273,7 @@ //组装原始记录打印参数 prepareParams(dcPowerList, map); + map.put("pdfStatus", 1); List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "1", request.getItemCategoryName())); //与证书模板区分 @@ -280,7 +281,7 @@ map.put("id", snowflakeUtil.nextId()); log.debug("original before ----"); //除了选用的模板不一致，模板配置流程是一致的 - String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, templateUrls); + String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); urlList.add(originalWordUrlFile); 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 index 018d497..27c06d8 100644 --- 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 @@ -293,14 +293,16 @@ //准备填充参数 prepareParams(map, request.getMeasureDataETwoList()); prepareCoverParams(map, request.getLabCode()); + List templateUrls = new ArrayList<>(); templateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "1", request.getItemCategoryName())); //与证书模板区分 SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); + map.put("pdfStatus", 1); log.debug("original before ----"); //除了选用的模板不一致，模板配置流程是一致的 - String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, templateUrls); + String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); urlList.add(originalWordUrlFile); 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 fbe4e92..50bd57d 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 @@ -2,7 +2,6 @@ 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,9 +9,11 @@ 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.*; +import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; +import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataElectricalSafety; +import com.casic.missiles.model.equipment.BizEquipmentInfo; +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; import com.casic.missiles.service.listeners.register.PrintFileRegister; @@ -21,20 +22,15 @@ 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; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import reactor.core.publisher.Mono; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * @Author: TuT @@ -169,6 +165,61 @@ map.put(strListParam + DATE_PREFIX + 6, StringUtils.isNotBlank(dataCalibrator.getTestValueSixDate()) ? dataCalibrator.getTestValueSixDate() : "/"); } + public static void main(String[] args) { + Student student = new Student(); + student.setName("123"); + student.setAge("11"); + List adjustList = new ArrayList<>(); + for (int i = 0; i < 5; i++) { + Adjust adjust = new Adjust(); + adjust.setAdjustName("123" + i); + adjust.setAdjustTime("111" + i); + adjustList.add(adjust); + } + student.setAdjustList(adjustList); + Map map = BeanUtil.beanToMap(student); + List excludedKeys = Arrays.asList("approvalStatus", "processId", "createUserId", "createUserName", + "checkUserName", "approvalStatusName", "taskId", "decisionItem", "staffName", "lessThan"); + map.forEach((k, v) -> { + if (v instanceof Collection) { + List list = (List) v; + List> objectList = new ArrayList<>(); + list.forEach(obj -> { + Map objectMap = BeanUtil.beanToMap(obj); + objectMap.forEach((k1, v1) -> { + if (!excludedKeys.contains(k1) && org.springframework.util.ObjectUtils.isEmpty(v1)) { + objectMap.put(k1, "/"); + } + }); + objectList.add(objectMap); + }); + map.put(k, objectList); + } else { + if (!excludedKeys.contains(k) && org.springframework.util.ObjectUtils.isEmpty(v)) { + map.put(k, "/"); + } + } + }); + String jsonString = JSON.toJSONString(map); + System.out.println(jsonString); + ; + } + + @Data + private static class Student { + private String name; + private String age; + private String score; + private List adjustList; + } + + @Data + private static class Adjust { + private String AdjustName; + private String AdjustTime; + private String AdjustAge; + } + @Override public List doCreateOriginalFile(BizBusinessDeviceMeasureApproval request) { try { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ResistanceThermometerHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ResistanceThermometerHandler.java index 5971090..230418e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ResistanceThermometerHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/ResistanceThermometerHandler.java @@ -222,9 +222,10 @@ //与证书模板区分 SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); + map.put("pdfStatus", 1); log.debug("original before ----"); //除了选用的模板不一致，模板配置流程是一致的 - String originalUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, templateUrls); + String originalUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalUrlFile); List urlList = new ArrayList<>(); urlList.add(originalUrlFile); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SateyValueHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SateyValueHandler.java index deaeb98..3e62045 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SateyValueHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/SateyValueHandler.java @@ -74,9 +74,10 @@ //与证书模板区分 SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); map.put("id", snowflakeUtil.nextId()); + map.put("pdfStatus", 1); log.debug("original before ----"); //除了选用的模板不一致，模板配置流程是一致的 - String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, templateUrls); + String originalWordUrlFile = printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, false, null, templateUrls); log.debug("originalUrlFile after------------{}", originalWordUrlFile); List urlList = new ArrayList<>(); urlList.add(originalWordUrlFile);