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 73531bd..e01649b 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 @@ -36,6 +36,7 @@ String ELECTRICAL_SAFETY_CHECK_DATA = "多功能电气安全核查数据"; String DC_POWER_SUPPLY = "直流稳压电源"; String SAFETY_VALVE = "安全阀"; + String SAFETY_VALVE_APPROVAL = "安全阀校验审批"; String DC_POWER_SUPPLY_CHECK_DATA = "直流稳压电源核查数据"; String RESISTANCE_THERMOMETER = "二等铂电阻温度计"; String RESISTANCE_THERMOMETER_CHECK_DATA = "二等铂电阻温度计核查数据"; 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 73531bd..e01649b 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 @@ -36,6 +36,7 @@ String ELECTRICAL_SAFETY_CHECK_DATA = "多功能电气安全核查数据"; String DC_POWER_SUPPLY = "直流稳压电源"; String SAFETY_VALVE = "安全阀"; + String SAFETY_VALVE_APPROVAL = "安全阀校验审批"; String DC_POWER_SUPPLY_CHECK_DATA = "直流稳压电源核查数据"; String RESISTANCE_THERMOMETER = "二等铂电阻温度计"; String RESISTANCE_THERMOMETER_CHECK_DATA = "二等铂电阻温度计核查数据"; diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml index 196b532..32618c5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml @@ -94,7 +94,7 @@ WHERE template_name= #{templateName} AND template_type= #{coverModuleName} - AND template_desc = #{descn} + AND template_desc like concat('%',#{descn},'%') 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 73531bd..e01649b 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 @@ -36,6 +36,7 @@ String ELECTRICAL_SAFETY_CHECK_DATA = "多功能电气安全核查数据"; String DC_POWER_SUPPLY = "直流稳压电源"; String SAFETY_VALVE = "安全阀"; + String SAFETY_VALVE_APPROVAL = "安全阀校验审批"; String DC_POWER_SUPPLY_CHECK_DATA = "直流稳压电源核查数据"; String RESISTANCE_THERMOMETER = "二等铂电阻温度计"; String RESISTANCE_THERMOMETER_CHECK_DATA = "二等铂电阻温度计核查数据"; diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml index 196b532..32618c5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml @@ -94,7 +94,7 @@ WHERE template_name= #{templateName} AND template_type= #{coverModuleName} - AND template_desc = #{descn} + AND template_desc like concat('%',#{descn},'%') diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index ca8d41f..b38e729 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -27,7 +27,9 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; @@ -87,8 +89,8 @@ public void excuteMeasureTaskAsyn(BizBusinessDeviceMeasureApproval deviceMeasureApproval, Long id, String oldCertificateFile, String oldOriginRecordFile) { ThreadPoolExecutor threadPool = new ThreadPoolExecutor(2, 2, 200, TimeUnit.SECONDS, new LinkedBlockingQueue<>(2)); - String originFileName = deviceMeasureApproval.getCertificateName() + deviceMeasureApproval.getCertificateNo()+"原始记录"; - String certificateFileName = deviceMeasureApproval.getCertificateName() + deviceMeasureApproval.getCertificateNo()+"检定证书"; + String originFileName = deviceMeasureApproval.getCertificateName() + deviceMeasureApproval.getCertificateNo() + "原始记录"; + String certificateFileName = deviceMeasureApproval.getCertificateName() + deviceMeasureApproval.getCertificateNo() + "检定证书"; log.info("measure data is check,please wait ..."); List customTemplateUrls = new ArrayList<>(); customTemplateUrls.add(oldCertificateFile); @@ -96,6 +98,16 @@ Map map = BeanUtil.beanToMap(deviceMeasureApproval); if (StringUtils.isNotEmpty(oldCertificateFile)) { //生成证书报告审批的,需要改变为动态选择性 +// if (SAFETY_VALVE.equals(deviceMeasureApproval.getItemCategoryName())) { +// certificateFutureTask = CompletableFuture.supplyAsync( +// () -> printFileRegister.registerPrintFile(SAFETY_VALVE_APPROVAL, "数据打印", null, +// RegisterCustomParameters.builder() +// .customParam(map) +// .customFileName(certificateFileName) +// .pdf(true) +// .customTemplateUrls(customTemplateUrls) +// .build()), threadPool); +// } else { certificateFutureTask = CompletableFuture.supplyAsync( () -> printFileRegister.registerPrintFile(MEASURE_DATA_APPROVAL, "数据打印", null, RegisterCustomParameters.builder() @@ -104,6 +116,7 @@ .pdf(true) .customTemplateUrls(customTemplateUrls) .build()), threadPool); +// } } CompletableFuture originFutureTask = null; List customOriginUrls = new ArrayList<>(); 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 73531bd..e01649b 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 @@ -36,6 +36,7 @@ String ELECTRICAL_SAFETY_CHECK_DATA = "多功能电气安全核查数据"; String DC_POWER_SUPPLY = "直流稳压电源"; String SAFETY_VALVE = "安全阀"; + String SAFETY_VALVE_APPROVAL = "安全阀校验审批"; String DC_POWER_SUPPLY_CHECK_DATA = "直流稳压电源核查数据"; String RESISTANCE_THERMOMETER = "二等铂电阻温度计"; String RESISTANCE_THERMOMETER_CHECK_DATA = "二等铂电阻温度计核查数据"; diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml index 196b532..32618c5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml @@ -94,7 +94,7 @@ WHERE template_name= #{templateName} AND template_type= #{coverModuleName} - AND template_desc = #{descn} + AND template_desc like concat('%',#{descn},'%') diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index ca8d41f..b38e729 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -27,7 +27,9 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; @@ -87,8 +89,8 @@ public void excuteMeasureTaskAsyn(BizBusinessDeviceMeasureApproval deviceMeasureApproval, Long id, String oldCertificateFile, String oldOriginRecordFile) { ThreadPoolExecutor threadPool = new ThreadPoolExecutor(2, 2, 200, TimeUnit.SECONDS, new LinkedBlockingQueue<>(2)); - String originFileName = deviceMeasureApproval.getCertificateName() + deviceMeasureApproval.getCertificateNo()+"原始记录"; - String certificateFileName = deviceMeasureApproval.getCertificateName() + deviceMeasureApproval.getCertificateNo()+"检定证书"; + String originFileName = deviceMeasureApproval.getCertificateName() + deviceMeasureApproval.getCertificateNo() + "原始记录"; + String certificateFileName = deviceMeasureApproval.getCertificateName() + deviceMeasureApproval.getCertificateNo() + "检定证书"; log.info("measure data is check,please wait ..."); List customTemplateUrls = new ArrayList<>(); customTemplateUrls.add(oldCertificateFile); @@ -96,6 +98,16 @@ Map map = BeanUtil.beanToMap(deviceMeasureApproval); if (StringUtils.isNotEmpty(oldCertificateFile)) { //生成证书报告审批的,需要改变为动态选择性 +// if (SAFETY_VALVE.equals(deviceMeasureApproval.getItemCategoryName())) { +// certificateFutureTask = CompletableFuture.supplyAsync( +// () -> printFileRegister.registerPrintFile(SAFETY_VALVE_APPROVAL, "数据打印", null, +// RegisterCustomParameters.builder() +// .customParam(map) +// .customFileName(certificateFileName) +// .pdf(true) +// .customTemplateUrls(customTemplateUrls) +// .build()), threadPool); +// } else { certificateFutureTask = CompletableFuture.supplyAsync( () -> printFileRegister.registerPrintFile(MEASURE_DATA_APPROVAL, "数据打印", null, RegisterCustomParameters.builder() @@ -104,6 +116,7 @@ .pdf(true) .customTemplateUrls(customTemplateUrls) .build()), threadPool); +// } } CompletableFuture originFutureTask = null; List customOriginUrls = new ArrayList<>(); 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 42bab1a..3b3c3bd 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 @@ -328,10 +328,7 @@ } protected Boolean examineOriginalFile(BizBusinessDeviceMeasureApproval measureItemInfo) { - if ("校验".equals(measureItemInfo.getMeasureCategoryName())) { - return true; - } - return false; + return "校验".equals(measureItemInfo.getMeasureCategoryName()); } } 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 73531bd..e01649b 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 @@ -36,6 +36,7 @@ String ELECTRICAL_SAFETY_CHECK_DATA = "多功能电气安全核查数据"; String DC_POWER_SUPPLY = "直流稳压电源"; String SAFETY_VALVE = "安全阀"; + String SAFETY_VALVE_APPROVAL = "安全阀校验审批"; String DC_POWER_SUPPLY_CHECK_DATA = "直流稳压电源核查数据"; String RESISTANCE_THERMOMETER = "二等铂电阻温度计"; String RESISTANCE_THERMOMETER_CHECK_DATA = "二等铂电阻温度计核查数据"; diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml index 196b532..32618c5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml @@ -94,7 +94,7 @@ WHERE template_name= #{templateName} AND template_type= #{coverModuleName} - AND template_desc = #{descn} + AND template_desc like concat('%',#{descn},'%') diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index ca8d41f..b38e729 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -27,7 +27,9 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; @@ -87,8 +89,8 @@ public void excuteMeasureTaskAsyn(BizBusinessDeviceMeasureApproval deviceMeasureApproval, Long id, String oldCertificateFile, String oldOriginRecordFile) { ThreadPoolExecutor threadPool = new ThreadPoolExecutor(2, 2, 200, TimeUnit.SECONDS, new LinkedBlockingQueue<>(2)); - String originFileName = deviceMeasureApproval.getCertificateName() + deviceMeasureApproval.getCertificateNo()+"原始记录"; - String certificateFileName = deviceMeasureApproval.getCertificateName() + deviceMeasureApproval.getCertificateNo()+"检定证书"; + String originFileName = deviceMeasureApproval.getCertificateName() + deviceMeasureApproval.getCertificateNo() + "原始记录"; + String certificateFileName = deviceMeasureApproval.getCertificateName() + deviceMeasureApproval.getCertificateNo() + "检定证书"; log.info("measure data is check,please wait ..."); List customTemplateUrls = new ArrayList<>(); customTemplateUrls.add(oldCertificateFile); @@ -96,6 +98,16 @@ Map map = BeanUtil.beanToMap(deviceMeasureApproval); if (StringUtils.isNotEmpty(oldCertificateFile)) { //生成证书报告审批的,需要改变为动态选择性 +// if (SAFETY_VALVE.equals(deviceMeasureApproval.getItemCategoryName())) { +// certificateFutureTask = CompletableFuture.supplyAsync( +// () -> printFileRegister.registerPrintFile(SAFETY_VALVE_APPROVAL, "数据打印", null, +// RegisterCustomParameters.builder() +// .customParam(map) +// .customFileName(certificateFileName) +// .pdf(true) +// .customTemplateUrls(customTemplateUrls) +// .build()), threadPool); +// } else { certificateFutureTask = CompletableFuture.supplyAsync( () -> printFileRegister.registerPrintFile(MEASURE_DATA_APPROVAL, "数据打印", null, RegisterCustomParameters.builder() @@ -104,6 +116,7 @@ .pdf(true) .customTemplateUrls(customTemplateUrls) .build()), threadPool); +// } } CompletableFuture originFutureTask = null; List customOriginUrls = new ArrayList<>(); 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 42bab1a..3b3c3bd 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 @@ -328,10 +328,7 @@ } protected Boolean examineOriginalFile(BizBusinessDeviceMeasureApproval measureItemInfo) { - if ("校验".equals(measureItemInfo.getMeasureCategoryName())) { - return true; - } - return false; + return "校验".equals(measureItemInfo.getMeasureCategoryName()); } } 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 445b6e7..92fa356 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 @@ -177,7 +177,8 @@ List dataItems = checkParamRemoveItem(measureItemInfo, map); //检定数据 //这一块逻辑比较复杂 - customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(RESISTANCE_CHECK_DATA, "1", measureItemInfo.getItemCategoryName())); + customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(RESISTANCE_CHECK_DATA, "1", measureItemInfo.getItemCategoryName().contains("电接点一般压力表") ? "电接点" : + measureItemInfo.getItemCategoryName())); map.put("id", snowflakeUtil.nextId()); map.put("pdfStatus", 1); //除了选用的模板不一致，模板配置流程是一致的 @@ -255,7 +256,8 @@ List customTemplateUrls = new ArrayList<>(); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", measureItemInfo.getMeasureCategoryName())); - customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(RESISTANCE_CHECK_DATA,"4", measureItemInfo.getItemCategoryName())); + customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(RESISTANCE_CHECK_DATA, "4", measureItemInfo.getItemCategoryName().equals("电接点一般压力表") ? "电接点" : + measureItemInfo.getItemCategoryName())); map.put("id", snowflakeUtil.nextId()); map.put("pdfStatus", 1); List urlList = new ArrayList<>(); 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 73531bd..e01649b 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 @@ -36,6 +36,7 @@ String ELECTRICAL_SAFETY_CHECK_DATA = "多功能电气安全核查数据"; String DC_POWER_SUPPLY = "直流稳压电源"; String SAFETY_VALVE = "安全阀"; + String SAFETY_VALVE_APPROVAL = "安全阀校验审批"; String DC_POWER_SUPPLY_CHECK_DATA = "直流稳压电源核查数据"; String RESISTANCE_THERMOMETER = "二等铂电阻温度计"; String RESISTANCE_THERMOMETER_CHECK_DATA = "二等铂电阻温度计核查数据"; diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml index 196b532..32618c5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml @@ -94,7 +94,7 @@ WHERE template_name= #{templateName} AND template_type= #{coverModuleName} - AND template_desc = #{descn} + AND template_desc like concat('%',#{descn},'%') diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index ca8d41f..b38e729 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -27,7 +27,9 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; @@ -87,8 +89,8 @@ public void excuteMeasureTaskAsyn(BizBusinessDeviceMeasureApproval deviceMeasureApproval, Long id, String oldCertificateFile, String oldOriginRecordFile) { ThreadPoolExecutor threadPool = new ThreadPoolExecutor(2, 2, 200, TimeUnit.SECONDS, new LinkedBlockingQueue<>(2)); - String originFileName = deviceMeasureApproval.getCertificateName() + deviceMeasureApproval.getCertificateNo()+"原始记录"; - String certificateFileName = deviceMeasureApproval.getCertificateName() + deviceMeasureApproval.getCertificateNo()+"检定证书"; + String originFileName = deviceMeasureApproval.getCertificateName() + deviceMeasureApproval.getCertificateNo() + "原始记录"; + String certificateFileName = deviceMeasureApproval.getCertificateName() + deviceMeasureApproval.getCertificateNo() + "检定证书"; log.info("measure data is check,please wait ..."); List customTemplateUrls = new ArrayList<>(); customTemplateUrls.add(oldCertificateFile); @@ -96,6 +98,16 @@ Map map = BeanUtil.beanToMap(deviceMeasureApproval); if (StringUtils.isNotEmpty(oldCertificateFile)) { //生成证书报告审批的,需要改变为动态选择性 +// if (SAFETY_VALVE.equals(deviceMeasureApproval.getItemCategoryName())) { +// certificateFutureTask = CompletableFuture.supplyAsync( +// () -> printFileRegister.registerPrintFile(SAFETY_VALVE_APPROVAL, "数据打印", null, +// RegisterCustomParameters.builder() +// .customParam(map) +// .customFileName(certificateFileName) +// .pdf(true) +// .customTemplateUrls(customTemplateUrls) +// .build()), threadPool); +// } else { certificateFutureTask = CompletableFuture.supplyAsync( () -> printFileRegister.registerPrintFile(MEASURE_DATA_APPROVAL, "数据打印", null, RegisterCustomParameters.builder() @@ -104,6 +116,7 @@ .pdf(true) .customTemplateUrls(customTemplateUrls) .build()), threadPool); +// } } CompletableFuture originFutureTask = null; List customOriginUrls = new ArrayList<>(); 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 42bab1a..3b3c3bd 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 @@ -328,10 +328,7 @@ } protected Boolean examineOriginalFile(BizBusinessDeviceMeasureApproval measureItemInfo) { - if ("校验".equals(measureItemInfo.getMeasureCategoryName())) { - return true; - } - return false; + return "校验".equals(measureItemInfo.getMeasureCategoryName()); } } 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 445b6e7..92fa356 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 @@ -177,7 +177,8 @@ List dataItems = checkParamRemoveItem(measureItemInfo, map); //检定数据 //这一块逻辑比较复杂 - customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(RESISTANCE_CHECK_DATA, "1", measureItemInfo.getItemCategoryName())); + customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(RESISTANCE_CHECK_DATA, "1", measureItemInfo.getItemCategoryName().contains("电接点一般压力表") ? "电接点" : + measureItemInfo.getItemCategoryName())); map.put("id", snowflakeUtil.nextId()); map.put("pdfStatus", 1); //除了选用的模板不一致，模板配置流程是一致的 @@ -255,7 +256,8 @@ List customTemplateUrls = new ArrayList<>(); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", measureItemInfo.getMeasureCategoryName())); - customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(RESISTANCE_CHECK_DATA,"4", measureItemInfo.getItemCategoryName())); + customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(RESISTANCE_CHECK_DATA, "4", measureItemInfo.getItemCategoryName().equals("电接点一般压力表") ? "电接点" : + measureItemInfo.getItemCategoryName())); map.put("id", snowflakeUtil.nextId()); map.put("pdfStatus", 1); List urlList = new ArrayList<>(); 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 72669ed..c4fe2b2 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 @@ -9,9 +9,11 @@ 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.BizBusinessOrderInfoMapper; import com.casic.missiles.model.business.BizBusinessDeviceMeasureApproval; import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataResistanceThermometer; import com.casic.missiles.model.business.BizBusinessDeviceMeasureDataSafetyValue; +import com.casic.missiles.model.business.BizBusinessOrderInfo; 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; @@ -25,10 +27,7 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -45,6 +44,8 @@ private final BizBusinessDeviceMeasureApprovalMapper bizBusinessDeviceMeasureApprovalMapper; + private final BizBusinessOrderInfoMapper orderInfoMapper; + @Override public List doCheckCertificateFile(BizEquipmentStandardCheckRecordApproval request) { return null; @@ -144,46 +145,57 @@ @Override public List doCreateCertificateFile(BizBusinessDeviceMeasureApproval request) { try { - DictCodeUtils.convertDictCodeToName(request); - Map map = BeanUtil.beanToMap(request); - String customUrl = readyForCoverParams(map, request.getLabCode()); - List safetyValveList = request.getMeasureDataSafetyValueList(); - List list = new ArrayList<>(); - for (BizBusinessDeviceMeasureDataSafetyValue safetyValue : safetyValveList) { - BizBusinessDeviceMeasureDataSafetyValue value = (BizBusinessDeviceMeasureDataSafetyValue) BeanUtils.cloneBean(safetyValue); - value.applyStrategyBasedOnDataType(); - list.add(value); - } - assblemParams(list, map); - List dataItems = checkParamAddRemoveItem(request, 4, map); - List customTemplateUrls = new ArrayList<>(); - log.debug("--------get Certificate template is ...."); - //查询对应封面模板和检定证书模板 - customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : - bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); - customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(SAFETY_VALVE, "2", request.getItemCategoryName())); - SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); - map.put("id", snowflakeUtil.nextId()); - map.put("pdfStatus", 1); - List urlList = new ArrayList<>(); - //除了选用的模板不一致，模板配置流程是一致的 - log.debug("certificate before------------"); - String wordUrl = printFileRegister.registerPrintFile(SAFETY_VALVE, "证书打印", null, - RegisterCustomParameters.builder() - .customParam(map) - .dataItems(dataItems) - .pdf(false) - .customTemplateUrls(customTemplateUrls) - .build()); - if (StringUtils.isEmpty(wordUrl)) { - return urlList; - } - urlList.add(wordUrl); - if (map.containsKey("pdfUrl")) { - urlList.add((String) map.get("pdfUrl")); - } - log.debug("certificate after------------{}", wordUrl); - return urlList; +// DictCodeUtils.convertDictCodeToName(request); +// Map map = BeanUtil.beanToMap(request); +// String customUrl = readyForCoverParams(map, request.getLabCode()); +// List safetyValveList = request.getMeasureDataSafetyValueList(); +// List list = new ArrayList<>(); +// for (BizBusinessDeviceMeasureDataSafetyValue safetyValue : safetyValveList) { +// BizBusinessDeviceMeasureDataSafetyValue value = (BizBusinessDeviceMeasureDataSafetyValue) BeanUtils.cloneBean(safetyValue); +// value.applyStrategyBasedOnDataType(); +// list.add(value); +// } +// BizBusinessOrderInfo orderInfo = orderInfoMapper.selectById(request.getOrderId()); +// String deliverer = orderInfo.getDeliverer(); +// String delivererTel = orderInfo.getDelivererTel(); +// String nominalValue = list.get(0).getNominalValue(); +// String beforeAdjustAverage = list.get(0).getBeforeAdjustAverage(); +// map.put("deliverer", deliverer); +// map.put("delivererTel", delivererTel); +// map.put("nominalValue", nominalValue); +// map.put("average", beforeAdjustAverage); +// assblemParams(list, map); +// List dataItems = checkParamAddRemoveItem(request, 4, map); +// List customTemplateUrls = new ArrayList<>(); +// log.debug("--------get Certificate template is ...."); +// map.put("time2","{{approvalTime2}}"); +// map.put("time3","{{approvalTime3}}"); +// //查询对应封面模板和检定证书模板 +//// customTemplateUrls.add(StringUtils.isNotEmpty(customUrl) ? customUrl : +//// bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(MEASURE_DATA, "2", request.getMeasureCategoryName())); +// customTemplateUrls.add(bizBusinessDeviceMeasureApprovalMapper.customTemplateUrl(SAFETY_VALVE, "2", request.getItemCategoryName())); +// SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); +// map.put("id", snowflakeUtil.nextId()); +// map.put("pdfStatus", 1); +// List urlList = new ArrayList<>(); +// //除了选用的模板不一致，模板配置流程是一致的 +// log.debug("certificate before------------"); +// String wordUrl = printFileRegister.registerPrintFile(SAFETY_VALVE, "证书打印", null, +// RegisterCustomParameters.builder() +// .customParam(map) +// .dataItems(dataItems) +// .pdf(false) +// .customTemplateUrls(customTemplateUrls) +// .build()); +// if (StringUtils.isEmpty(wordUrl)) { +// return urlList; +// } +// urlList.add(wordUrl); +// if (map.containsKey("pdfUrl")) { +// urlList.add((String) map.get("pdfUrl")); +// } +// log.debug("certificate after------------{}", wordUrl); + return Collections.emptyList(); } catch (Exception ex) { log.debug("doCreateOriginalFile Exception is -----------{}", ex); throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED);