diff --git a/casic-metering-api/src/main/resources/config/application-test.yml b/casic-metering-api/src/main/resources/config/application-test.yml index cd5d140..17b15a6 100644 --- a/casic-metering-api/src/main/resources/config/application-test.yml +++ b/casic-metering-api/src/main/resources/config/application-test.yml @@ -13,7 +13,6 @@ host: 111.198.10.15 # port: 11412 port: 21903 -# password: ew5T4K3#203lwh password: ew5T4K3#203 database: 1 serializer: org.springframework.data.redis.serializer.StringRedisSerializer diff --git a/casic-metering-api/src/main/resources/config/application-test.yml b/casic-metering-api/src/main/resources/config/application-test.yml index cd5d140..17b15a6 100644 --- a/casic-metering-api/src/main/resources/config/application-test.yml +++ b/casic-metering-api/src/main/resources/config/application-test.yml @@ -13,7 +13,6 @@ host: 111.198.10.15 # port: 11412 port: 21903 -# password: ew5T4K3#203lwh password: ew5T4K3#203 database: 1 serializer: org.springframework.data.redis.serializer.StringRedisSerializer diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentColConfig.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentColConfig.java new file mode 100644 index 0000000..27b2ec6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentColConfig.java @@ -0,0 +1,25 @@ +package com.casic.missiles.service.Impl.eqpt.standard; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * 这里主要存放核查数据模板,列循环填充的列变量配置 + */ +@Data +@Component +@ConfigurationProperties(prefix = "casic.eqpt") +public class StandardEquipmentColConfig { + + /** + * 0.02活塞压力核查数据模板-电信号模板列数 + */ + private Integer electricSignal; + /** + * 多功能校准源核查数据模版 + */ + private Integer multiCalibration; + + +} diff --git a/casic-metering-api/src/main/resources/config/application-test.yml b/casic-metering-api/src/main/resources/config/application-test.yml index cd5d140..17b15a6 100644 --- a/casic-metering-api/src/main/resources/config/application-test.yml +++ b/casic-metering-api/src/main/resources/config/application-test.yml @@ -13,7 +13,6 @@ host: 111.198.10.15 # port: 11412 port: 21903 -# password: ew5T4K3#203lwh password: ew5T4K3#203 database: 1 serializer: org.springframework.data.redis.serializer.StringRedisSerializer diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentColConfig.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentColConfig.java new file mode 100644 index 0000000..27b2ec6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentColConfig.java @@ -0,0 +1,25 @@ +package com.casic.missiles.service.Impl.eqpt.standard; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * 这里主要存放核查数据模板,列循环填充的列变量配置 + */ +@Data +@Component +@ConfigurationProperties(prefix = "casic.eqpt") +public class StandardEquipmentColConfig { + + /** + * 0.02活塞压力核查数据模板-电信号模板列数 + */ + private Integer electricSignal; + /** + * 多功能校准源核查数据模版 + */ + private Integer multiCalibration; + + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 871dd00..3b3138b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -3,8 +3,11 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.casic.missiles.enums.business.MeasureCategoryEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; +import liquibase.pro.packaged.A; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import java.text.SimpleDateFormat; import java.util.Arrays; @@ -14,13 +17,17 @@ @Slf4j public class StandardEquipmentSupport implements MeasureCategoryEnum { + @Autowired + protected StandardEquipmentColConfig standardEquipmentColConfig; + /** * 替换map集合中的空值为斜杠/ + * * @param map */ protected void mapReplace(Map map) { List excludedKeys = Arrays.asList("approvalStatus", "processId", "createUserId", "createUserName", - "checkUserName", "approvalStatusName", "taskId", "decisionItem", "staffName","lessThan"); + "checkUserName", "approvalStatusName", "taskId", "decisionItem", "staffName", "lessThan"); map.forEach((k, v) -> { if (!excludedKeys.contains(k) && org.springframework.util.ObjectUtils.isEmpty(v)) { map.put(k, "/"); @@ -28,6 +35,14 @@ }); } + protected Boolean examineOriginalFile(BizBusinessDeviceMeasureApproval measureItemInfo) { + if ("校验".equals(measureItemInfo.getMeasureCategoryName())){ + return true; + } + return false; + } + + /** * 填充固定的信息参数 */ @@ -41,8 +56,8 @@ } map.put("technologyFile", technologyFiles); } - map.put("surveyor","{{@surveyor}}"); - map.put("auditor","{{@auditor}}"); + map.put("surveyor", "{{@surveyor}}"); + map.put("auditor", "{{@auditor}}"); //新增对检定地点的转换,如果找不到该地点,则显示为空 // String measureAddress = bizBusinessMapper.getMeasureAddress(request.getMeasureAddress()); // request.setMeasureAddress(StringUtils.isNoneEmpty(measureAddress) ? measureAddress : ""); @@ -56,7 +71,8 @@ case TEST_REPORT: map.put("title", "测试结果"); break; - case CALIBRATE_REPORT: ; + case CALIBRATE_REPORT: + ; map.put("title", "校准结果"); break; case MEASURE_REPORT: diff --git a/casic-metering-api/src/main/resources/config/application-test.yml b/casic-metering-api/src/main/resources/config/application-test.yml index cd5d140..17b15a6 100644 --- a/casic-metering-api/src/main/resources/config/application-test.yml +++ b/casic-metering-api/src/main/resources/config/application-test.yml @@ -13,7 +13,6 @@ host: 111.198.10.15 # port: 11412 port: 21903 -# password: ew5T4K3#203lwh password: ew5T4K3#203 database: 1 serializer: org.springframework.data.redis.serializer.StringRedisSerializer diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentColConfig.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentColConfig.java new file mode 100644 index 0000000..27b2ec6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentColConfig.java @@ -0,0 +1,25 @@ +package com.casic.missiles.service.Impl.eqpt.standard; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * 这里主要存放核查数据模板,列循环填充的列变量配置 + */ +@Data +@Component +@ConfigurationProperties(prefix = "casic.eqpt") +public class StandardEquipmentColConfig { + + /** + * 0.02活塞压力核查数据模板-电信号模板列数 + */ + private Integer electricSignal; + /** + * 多功能校准源核查数据模版 + */ + private Integer multiCalibration; + + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 871dd00..3b3138b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -3,8 +3,11 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.casic.missiles.enums.business.MeasureCategoryEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; +import liquibase.pro.packaged.A; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import java.text.SimpleDateFormat; import java.util.Arrays; @@ -14,13 +17,17 @@ @Slf4j public class StandardEquipmentSupport implements MeasureCategoryEnum { + @Autowired + protected StandardEquipmentColConfig standardEquipmentColConfig; + /** * 替换map集合中的空值为斜杠/ + * * @param map */ protected void mapReplace(Map map) { List excludedKeys = Arrays.asList("approvalStatus", "processId", "createUserId", "createUserName", - "checkUserName", "approvalStatusName", "taskId", "decisionItem", "staffName","lessThan"); + "checkUserName", "approvalStatusName", "taskId", "decisionItem", "staffName", "lessThan"); map.forEach((k, v) -> { if (!excludedKeys.contains(k) && org.springframework.util.ObjectUtils.isEmpty(v)) { map.put(k, "/"); @@ -28,6 +35,14 @@ }); } + protected Boolean examineOriginalFile(BizBusinessDeviceMeasureApproval measureItemInfo) { + if ("校验".equals(measureItemInfo.getMeasureCategoryName())){ + return true; + } + return false; + } + + /** * 填充固定的信息参数 */ @@ -41,8 +56,8 @@ } map.put("technologyFile", technologyFiles); } - map.put("surveyor","{{@surveyor}}"); - map.put("auditor","{{@auditor}}"); + map.put("surveyor", "{{@surveyor}}"); + map.put("auditor", "{{@auditor}}"); //新增对检定地点的转换,如果找不到该地点,则显示为空 // String measureAddress = bizBusinessMapper.getMeasureAddress(request.getMeasureAddress()); // request.setMeasureAddress(StringUtils.isNoneEmpty(measureAddress) ? measureAddress : ""); @@ -56,7 +71,8 @@ case TEST_REPORT: map.put("title", "测试结果"); break; - case CALIBRATE_REPORT: ; + case CALIBRATE_REPORT: + ; map.put("title", "校准结果"); break; case MEASURE_REPORT: 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 6446c7d..c5dd4d4 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 @@ -78,7 +78,7 @@ } } BizEquipmentStandardCheckDataCalibrator checkDataCalibrator = new BizEquipmentStandardCheckDataCalibrator(); - for (int k = repMapList.size(); k < 6; k++) { + for (int k = repMapList.size(); k < standardEquipmentColConfig.getMultiCalibration(); k++) { populateCheckData(repMapList, checkDataCalibrator); } map.put(REPEAT_PREFIX + (i + 1), repMapList); @@ -107,7 +107,7 @@ map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF052"); } } - for (int k = repMapList.size(); k < 6; k++) { + for (int k = repMapList.size(); k < standardEquipmentColConfig.getMultiCalibration(); k++) { populateCheckData(repMapList, checkDataCalibrator); } map.put(STA_PREFIX + (i + 1), repMapList); @@ -137,6 +137,10 @@ public List doCreateOriginalFile(BizBusinessDeviceMeasureApproval measureItemInfo) { //作为分发点 try { + if(examineOriginalFile(measureItemInfo)){ + log.debug("校验没有原始记录"); + return null; + } if (CollectionUtil.isEmpty(measureItemInfo.getMeasureDataCalibratorList())) { List bizBusinessDeviceMeasureDataCalibrators = new ArrayList<>(); bizBusinessDeviceMeasureDataCalibrators.add(new BizBusinessDeviceMeasureDataCalibrator()); diff --git a/casic-metering-api/src/main/resources/config/application-test.yml b/casic-metering-api/src/main/resources/config/application-test.yml index cd5d140..17b15a6 100644 --- a/casic-metering-api/src/main/resources/config/application-test.yml +++ b/casic-metering-api/src/main/resources/config/application-test.yml @@ -13,7 +13,6 @@ host: 111.198.10.15 # port: 11412 port: 21903 -# password: ew5T4K3#203lwh password: ew5T4K3#203 database: 1 serializer: org.springframework.data.redis.serializer.StringRedisSerializer diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentColConfig.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentColConfig.java new file mode 100644 index 0000000..27b2ec6 --- /dev/null +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentColConfig.java @@ -0,0 +1,25 @@ +package com.casic.missiles.service.Impl.eqpt.standard; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * 这里主要存放核查数据模板,列循环填充的列变量配置 + */ +@Data +@Component +@ConfigurationProperties(prefix = "casic.eqpt") +public class StandardEquipmentColConfig { + + /** + * 0.02活塞压力核查数据模板-电信号模板列数 + */ + private Integer electricSignal; + /** + * 多功能校准源核查数据模版 + */ + private Integer multiCalibration; + + +} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 871dd00..3b3138b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -3,8 +3,11 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.casic.missiles.enums.business.MeasureCategoryEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; +import liquibase.pro.packaged.A; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import java.text.SimpleDateFormat; import java.util.Arrays; @@ -14,13 +17,17 @@ @Slf4j public class StandardEquipmentSupport implements MeasureCategoryEnum { + @Autowired + protected StandardEquipmentColConfig standardEquipmentColConfig; + /** * 替换map集合中的空值为斜杠/ + * * @param map */ protected void mapReplace(Map map) { List excludedKeys = Arrays.asList("approvalStatus", "processId", "createUserId", "createUserName", - "checkUserName", "approvalStatusName", "taskId", "decisionItem", "staffName","lessThan"); + "checkUserName", "approvalStatusName", "taskId", "decisionItem", "staffName", "lessThan"); map.forEach((k, v) -> { if (!excludedKeys.contains(k) && org.springframework.util.ObjectUtils.isEmpty(v)) { map.put(k, "/"); @@ -28,6 +35,14 @@ }); } + protected Boolean examineOriginalFile(BizBusinessDeviceMeasureApproval measureItemInfo) { + if ("校验".equals(measureItemInfo.getMeasureCategoryName())){ + return true; + } + return false; + } + + /** * 填充固定的信息参数 */ @@ -41,8 +56,8 @@ } map.put("technologyFile", technologyFiles); } - map.put("surveyor","{{@surveyor}}"); - map.put("auditor","{{@auditor}}"); + map.put("surveyor", "{{@surveyor}}"); + map.put("auditor", "{{@auditor}}"); //新增对检定地点的转换,如果找不到该地点,则显示为空 // String measureAddress = bizBusinessMapper.getMeasureAddress(request.getMeasureAddress()); // request.setMeasureAddress(StringUtils.isNoneEmpty(measureAddress) ? measureAddress : ""); @@ -56,7 +71,8 @@ case TEST_REPORT: map.put("title", "测试结果"); break; - case CALIBRATE_REPORT: ; + case CALIBRATE_REPORT: + ; map.put("title", "校准结果"); break; case MEASURE_REPORT: 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 6446c7d..c5dd4d4 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 @@ -78,7 +78,7 @@ } } BizEquipmentStandardCheckDataCalibrator checkDataCalibrator = new BizEquipmentStandardCheckDataCalibrator(); - for (int k = repMapList.size(); k < 6; k++) { + for (int k = repMapList.size(); k < standardEquipmentColConfig.getMultiCalibration(); k++) { populateCheckData(repMapList, checkDataCalibrator); } map.put(REPEAT_PREFIX + (i + 1), repMapList); @@ -107,7 +107,7 @@ map.put(STA_PREFIX + (i + 1) + BELOW_STANDARD, "\uF052"); } } - for (int k = repMapList.size(); k < 6; k++) { + for (int k = repMapList.size(); k < standardEquipmentColConfig.getMultiCalibration(); k++) { populateCheckData(repMapList, checkDataCalibrator); } map.put(STA_PREFIX + (i + 1), repMapList); @@ -137,6 +137,10 @@ public List doCreateOriginalFile(BizBusinessDeviceMeasureApproval measureItemInfo) { //作为分发点 try { + if(examineOriginalFile(measureItemInfo)){ + log.debug("校验没有原始记录"); + return null; + } if (CollectionUtil.isEmpty(measureItemInfo.getMeasureDataCalibratorList())) { List bizBusinessDeviceMeasureDataCalibrators = new ArrayList<>(); bizBusinessDeviceMeasureDataCalibrators.add(new BizBusinessDeviceMeasureDataCalibrator()); 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 f7f97bb..e014064 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 @@ -106,6 +106,10 @@ public List doCreateOriginalFile(BizBusinessDeviceMeasureApproval measureItemInfo) { //作为分发点 try { + if(examineOriginalFile(measureItemInfo)){ + log.debug("校验没有原始记录"); + return null; + } if (CollectionUtil.isEmpty(measureItemInfo.getMeasureDataPistonGaugeList())) { List bizBusinessDeviceMeasureDataPistonGaugeList = new ArrayList<>(); bizBusinessDeviceMeasureDataPistonGaugeList.add(new BizBusinessDeviceMeasureDataPistonGauge()); @@ -284,7 +288,7 @@ List> maximumList = new ArrayList<>(); map.put(maximumKey, maximumList); //数据填充处理 - for (int i = 0; i < 3; i++) { + for (int i = 0; i < standardEquipmentColConfig.getElectricSignal(); i++) { if (i < dataPistonGaugeList.size()) { BizEquipmentStandardCheckDataPistonGauge checkDataPistonGauge = dataPistonGaugeList.get(i); map.put(unitParam, checkDataPistonGauge.getUnit());