diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java index 24696e9..873780d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java @@ -133,6 +133,20 @@ String DC_CURRENT_DIRECT_MEASUREMENT = "直接电流(直接测量)"; String DC_CURRENT_INDIRECT_MEASUREMENT = "直接电流(间接测量)"; String RIPPLE_VOLTAGE = "纹波电压"; + String NOMINAL_TEMPERATURE_ZERO = "0℃"; + String NOMINAL_TEMPERATURE_HUNDRED = "100℃"; + String RT_ZERO = "R'(0℃)/Ω"; + String RT_HUNDRED = "R'(100℃)/Ω"; + String ALPHA = "α"; + String DELTA_ZERO = "△t(0℃)/℃"; + String DELTA_HUNDRED = "△t(100℃)/℃"; + String DELTA_ALPHA = "△α"; + String THERMAL_RESISTANCE = "工业铂铜热电阻"; + String THERMOSTATIC_BATH = "恒温槽"; + String BIMETAL_THERMOMETER = "双金属温度计"; + String TEMPERATURE = "温度值"; + String RTP = "RTP值"; + String INSULATION_RESISTANCE_METER_CALIBRATION = "绝缘电阻表校准"; /** * 结论-合格 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java index 24696e9..873780d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureCategoryEnum.java @@ -133,6 +133,20 @@ String DC_CURRENT_DIRECT_MEASUREMENT = "直接电流(直接测量)"; String DC_CURRENT_INDIRECT_MEASUREMENT = "直接电流(间接测量)"; String RIPPLE_VOLTAGE = "纹波电压"; + String NOMINAL_TEMPERATURE_ZERO = "0℃"; + String NOMINAL_TEMPERATURE_HUNDRED = "100℃"; + String RT_ZERO = "R'(0℃)/Ω"; + String RT_HUNDRED = "R'(100℃)/Ω"; + String ALPHA = "α"; + String DELTA_ZERO = "△t(0℃)/℃"; + String DELTA_HUNDRED = "△t(100℃)/℃"; + String DELTA_ALPHA = "△α"; + String THERMAL_RESISTANCE = "工业铂铜热电阻"; + String THERMOSTATIC_BATH = "恒温槽"; + String BIMETAL_THERMOMETER = "双金属温度计"; + String TEMPERATURE = "温度值"; + String RTP = "RTP值"; + String INSULATION_RESISTANCE_METER_CALIBRATION = "绝缘电阻表校准"; /** * 结论-合格 */ 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 aadfaf9..88717fa 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 @@ -13,7 +13,6 @@ import com.casic.missiles.model.equipment.BizEquipmentStandardCheckRecordApproval; import com.casic.missiles.service.Impl.eqpt.standard.StandardEquipmentPrint; import com.casic.missiles.service.listeners.register.PrintFileRegister; -import com.casic.missiles.utils.SnowflakeUtil; import com.casic.missiles.utils.SpringContextUtil; import com.gexin.fastjson.JSON; import lombok.RequiredArgsConstructor; @@ -77,55 +76,64 @@ * @param id * @param oldCertificateFile */ - public void excuteMeasureTaskAsyn(Map map, Long id, String oldCertificateFile, String oldOriginRecordFile) { + public void excuteMeasureTaskAsyn(Map map, Long id, String oldCertificateFile,String oldOriginRecordFile) { ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100, TimeUnit.SECONDS, new LinkedBlockingQueue<>(2)); log.info("measure data is check,please wait ..."); List customTemplateUrls = new ArrayList<>(); - customTemplateUrls.add(oldCertificateFile); - CompletableFuture certificateFutureTask = null; - if (StringUtils.isNotEmpty(oldCertificateFile)) { + if(StringUtils.isNotEmpty(oldCertificateFile)){ + customTemplateUrls.add(oldCertificateFile); //生成证书报告的,需要改变为动态选择性 - certificateFutureTask = CompletableFuture.supplyAsync( + CompletableFuture certificateFutureTask = CompletableFuture.supplyAsync( () -> printFileRegister.registerPrintFile(MEASURE_DATA_APPROVAL, "数据打印", null, map, true, null, customTemplateUrls), threadPool); - } - CompletableFuture originFutureTask = null; - List customOriginUrls = new ArrayList<>(); - customOriginUrls.add(oldOriginRecordFile); - SnowflakeUtil snowflakeUtil = new SnowflakeUtil(); - map.put("id", snowflakeUtil.nextId()); - if (StringUtils.isNotEmpty(oldOriginRecordFile)) { - //生成证书报告的,需要改变为动态选择性 - originFutureTask = CompletableFuture.supplyAsync( - () -> printFileRegister.registerPrintFile(ORIGINAL_RECORD_APPROVAL, "数据打印", null, map, true, null, customOriginUrls), threadPool); - } - CompletableFuture tempCertificateFutureTask = certificateFutureTask; - CompletableFuture tempOriginFutureTask = originFutureTask; - //等到所有线程异步结束 - CompletableFuture combinedFuture = CompletableFuture.allOf(tempCertificateFutureTask, tempOriginFutureTask); - combinedFuture.thenRun( - () -> { - BizBusinessDeviceMeasureApproval measureApproval = new BizBusinessDeviceMeasureApproval(); - measureApproval.setId(id); - if(tempCertificateFutureTask!=null){ - measureApproval.setCertificateFile(tempCertificateFutureTask.join()); - } - if(tempOriginFutureTask!=null){ - measureApproval.setOriginalRecordFile(tempOriginFutureTask.join()); - } - BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); - if (StringUtils.isNotEmpty(measureApproval.getOriginalRecordFile())|| StringUtils.isNotEmpty(measureApproval.getCertificateFile())) { - if (!map.containsKey("id") || ObjectUtils.isEmpty(map.get("id"))) { - return; + certificateFutureTask.thenRun( + () -> { + String certificateFileUrl = certificateFutureTask.join(); + BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); + if (StringUtils.isNotEmpty(certificateFileUrl)) { + BizBusinessDeviceMeasureApproval bizBusinessDeviceMeasureApproval = new BizBusinessDeviceMeasureApproval(); + if (!map.containsKey("id") || ObjectUtils.isEmpty(map.get("id"))) { + return; + } + bizBusinessDeviceMeasureApproval.setId(id); + //原始记录文件 + bizBusinessDeviceMeasureApproval.setCertificateFile(certificateFileUrl); + //更新记录 + int updateFlag = bizBusinessMapper.updateById(bizBusinessDeviceMeasureApproval); + Assert.isFalse(updateFlag <= 0, () -> { + throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); + }); } - //更新记录 - int updateFlag = bizBusinessMapper.updateById(measureApproval); - Assert.isFalse(updateFlag <= 0, () -> { - throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); - }); } - } - ); + ); + } + if(StringUtils.isNotEmpty(oldOriginRecordFile)){ + List customOriginUrls = new ArrayList<>(); + customOriginUrls.add(oldOriginRecordFile); + //生成证书报告的,需要改变为动态选择性 + CompletableFuture originFutureTask = CompletableFuture.supplyAsync( + () -> printFileRegister.registerPrintFile(MEASURE_DATA_APPROVAL, "数据打印", null, map, true, null, customOriginUrls), threadPool); + originFutureTask.thenRun( + () -> { + String originFileUrl = originFutureTask.join(); + BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); + if (StringUtils.isNotEmpty(originFileUrl)) { + BizBusinessDeviceMeasureApproval bizBusinessDeviceMeasureApproval = new BizBusinessDeviceMeasureApproval(); + if (!map.containsKey("id") || ObjectUtils.isEmpty(map.get("id"))) { + return; + } + bizBusinessDeviceMeasureApproval.setId(id); + //原始记录文件 + bizBusinessDeviceMeasureApproval.setOriginalRecordFile(originFileUrl); + //更新记录 + int updateFlag = bizBusinessMapper.updateById(bizBusinessDeviceMeasureApproval); + Assert.isFalse(updateFlag <= 0, () -> { + throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); + }); + } + } + ); + } } /**