zgty/zt-qms
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

荧光数据错误修复

Browse Source
This commit is contained in:
王兴荣
2025-11-17 20:38:23 +08:00
parent 376902462b
commit 18e4245eff
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/controller/vo/XRFDeviceSampleProjectReqVO.java
View File

@@ -14,19 +14,19 @@ public class XRFDeviceSampleProjectReqVO implements Serializable {
* 检测项目名称 * 检测项目名称
*/ */
@Schema(description = "检测项目名称") @Schema(description = "检测项目名称")
private String xRFProjectName; private String xrfProjectName;
/** /**
* 检测项目单位 * 检测项目单位
*/ */
@Schema(description = "检测项目单位") @Schema(description = "检测项目单位")
private String xRFProjectUnit; private String xrfProjectUnit;
/** /**
* 检测项目值 * 检测项目值
*/ */
@Schema(description = "检测项目值") @Schema(description = "检测项目值")
private String xRFProjectValue; private String xrfProjectValue;
/** /**
* 小数位数 * 小数位数

16
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/service/XRFDataServiceImpl.java
View File

@@ -138,20 +138,20 @@ public class XRFDataServiceImpl implements XRFDataService {
for (XRFDeviceSampleProjectReqVO ygDeviceSampleElement : sampleElements) { for (XRFDeviceSampleProjectReqVO ygDeviceSampleElement : sampleElements) {
//如果设备上来的元素值为空，则跳过继续 //如果设备上来的元素值为空，则跳过继续
if (ygDeviceSampleElement.getXRFProjectValue() == null) { if (ygDeviceSampleElement.getXrfProjectValue() == null) {
continue; continue;
} }
//查询是否有特殊转换率 //查询是否有特殊转换率
// QmsConYgConverRate conYgConverRate = conYgConverRateService.getOne(Wrappers.<QmsConYgConverRate>query().lambda().eq(QmsConYgConverRate::getDeviceNo, ygDeviceSample.getDeviceNo()) // QmsConYgConverRate conYgConverRate = conYgConverRateService.getOne(Wrappers.<QmsConYgConverRate>query().lambda().eq(QmsConYgConverRate::getDeviceNo, ygDeviceSample.getDeviceNo())
// .eq(QmsConYgConverRate::getLineName, ygDeviceSample.getLineName()).eq(QmsConYgConverRate::getElementName, ygDeviceSampleElement.getElementName())); // .eq(QmsConYgConverRate::getLineName, ygDeviceSample.getLineName()).eq(QmsConYgConverRate::getElementName, ygDeviceSampleElement.getElementName()));
ConfigXRFConversionRateDO conYgConverRate = configXRFConversionRateMapper.selectBy(ygDeviceSample.getDeviceNo(), ygDeviceSample.getLineName(), ygDeviceSampleElement.getXRFProjectName()); ConfigXRFConversionRateDO conYgConverRate = configXRFConversionRateMapper.selectBy(ygDeviceSample.getDeviceNo(), ygDeviceSample.getLineName(), ygDeviceSampleElement.getXrfProjectName());
ConfigXRFProjectDO conYgElement = null; ConfigXRFProjectDO conYgElement = null;
if(conYgConverRate != null && conYgConverRate.getConversionRate() != null) { if(conYgConverRate != null && conYgConverRate.getConversionRate() != null) {
conYgElement = conYgElementList.stream().filter(f -> f.getXRFProjectName().equals(ygDeviceSampleElement.getXRFProjectName()) && f.getConversionRate().equals(conYgConverRate.getConversionRate())).findFirst().orElse(null); conYgElement = conYgElementList.stream().filter(f -> f.getXRFProjectName().equals(ygDeviceSampleElement.getXrfProjectName()) && f.getConversionRate().equals(conYgConverRate.getConversionRate())).findFirst().orElse(null);
} else { } else {
conYgElement = conYgElementList.stream().filter(f -> f.getXRFProjectName().equals(ygDeviceSampleElement.getXRFProjectName()) && (StringUtils.isBlank(f.getXRFProjectUnit()) || StringUtils.isBlank(ygDeviceSampleElement.getXRFProjectUnit()) || f.getXRFProjectUnit().equals(ygDeviceSampleElement.getXRFProjectUnit()))).findFirst().orElse(null); conYgElement = conYgElementList.stream().filter(f -> f.getXRFProjectName().equals(ygDeviceSampleElement.getXrfProjectName()) && (StringUtils.isBlank(f.getXRFProjectUnit()) || StringUtils.isBlank(ygDeviceSampleElement.getXrfProjectUnit()) || f.getXRFProjectUnit().equals(ygDeviceSampleElement.getXrfProjectUnit()))).findFirst().orElse(null);
} }
if(conYgElement != null) { if(conYgElement != null) {
//数据转换 //数据转换
@@ -159,10 +159,10 @@ public class XRFDataServiceImpl implements XRFDataService {
Integer conYgElementDataType = 0; Integer conYgElementDataType = 0;
if(conYgConverRate != null && conYgConverRate.getConversionRate() != null) { if(conYgConverRate != null && conYgConverRate.getConversionRate() != null) {
BigDecimal convertRate = new BigDecimal(conYgConverRate.getConversionRate().toString()); BigDecimal convertRate = new BigDecimal(conYgConverRate.getConversionRate().toString());
elementValue = new BigDecimal(ygDeviceSampleElement.getXRFProjectValue()).multiply(convertRate); elementValue = new BigDecimal(ygDeviceSampleElement.getXrfProjectValue()).multiply(convertRate);
} else { } else {
BigDecimal convertRate = new BigDecimal(conYgElement.getConversionRate().toString()); BigDecimal convertRate = new BigDecimal(conYgElement.getConversionRate().toString());
elementValue = new BigDecimal(ygDeviceSampleElement.getXRFProjectValue()).multiply(convertRate); elementValue = new BigDecimal(ygDeviceSampleElement.getXrfProjectValue()).multiply(convertRate);
} }
if(elementValue.compareTo(BigDecimal.ZERO) < 0) { if(elementValue.compareTo(BigDecimal.ZERO) < 0) {
elementValue = BigDecimal.ZERO; elementValue = BigDecimal.ZERO;
@@ -185,10 +185,10 @@ public class XRFDataServiceImpl implements XRFDataService {
ReportFieldValueData reportFieldValueData = new ReportFieldValueData(); ReportFieldValueData reportFieldValueData = new ReportFieldValueData();
reportFieldValueData.setFieldName(conYgElement.getSaveColumn()); reportFieldValueData.setFieldName(conYgElement.getSaveColumn());
reportFieldValueData.setFieldValue(ygDeviceSampleElement.getXRFProjectName()); reportFieldValueData.setFieldValue(ygDeviceSampleElement.getXrfProjectName());
reportFieldValueData.setDecimalPosition(ygDeviceSampleElement.getValueDecimals()); reportFieldValueData.setDecimalPosition(ygDeviceSampleElement.getValueDecimals());
reportFieldValueData.setMathSymbol("="); reportFieldValueData.setMathSymbol("=");
reportFieldValueData.setUnit(ygDeviceSampleElement.getXRFProjectUnit()); reportFieldValueData.setUnit(ygDeviceSampleElement.getXrfProjectUnit());
assayDataJson.put(conYgElement.getSaveColumn(), reportFieldValueData); assayDataJson.put(conYgElement.getSaveColumn(), reportFieldValueData);
// if(conYgElementDataType != null && conYgElementDataType.intValue() > -1) { // if(conYgElementDataType != null && conYgElementDataType.intValue() > -1) {