From 55b8adf7b267993ed964e394ace3b57f45faed83 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期三, 30 七月 2025 08:34:07 +0800
Subject: [PATCH] 修改
---
src/main/java/com/gkhy/testFourierSpecialGasMonitor/service/impl/MonitorDataServiceImpl.java | 45 +++++++++++++++++++++++++++++----------------
1 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/gkhy/testFourierSpecialGasMonitor/service/impl/MonitorDataServiceImpl.java b/src/main/java/com/gkhy/testFourierSpecialGasMonitor/service/impl/MonitorDataServiceImpl.java
index bdfff64..f356c1d 100644
--- a/src/main/java/com/gkhy/testFourierSpecialGasMonitor/service/impl/MonitorDataServiceImpl.java
+++ b/src/main/java/com/gkhy/testFourierSpecialGasMonitor/service/impl/MonitorDataServiceImpl.java
@@ -16,6 +16,7 @@
import com.gkhy.testFourierSpecialGasMonitor.service.*;
import com.gkhy.testFourierSpecialGasMonitor.utils.AreaHandle;
import com.gkhy.testFourierSpecialGasMonitor.utils.PositionHandle;
+import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
import io.micrometer.core.instrument.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -93,12 +94,16 @@
if (reqDto.getPosition()!=null && reqDto.getGasName()!=null){
GasCategoryConfiguration byGasCateGoryIdAndOrientation = gasCategoryConfigurationRepository.findByGasCategoryIdAndOrientation(reqDto.getGasName(),reqDto.getPosition());
GasCategoryConfigurationRespDTO gasCategoryConfigurationRespDTO = new GasCategoryConfigurationRespDTO();
- BeanUtils.copyProperties(byGasCateGoryIdAndOrientation,gasCategoryConfigurationRespDTO);
+ if (byGasCateGoryIdAndOrientation!=null){
+ BeanUtils.copyProperties(byGasCateGoryIdAndOrientation,gasCategoryConfigurationRespDTO);
+ }
gasLineChartRespDTO.setGasCategoryConfigurationRespDTO(gasCategoryConfigurationRespDTO);
} else if (reqDto.getPosition()!=null){
GasCategoryConfiguration byOrientation = gasCategoryConfigurationRepository.findByOrientation(reqDto.getPosition());
GasCategoryConfigurationRespDTO gasCategoryConfigurationRespDTO = new GasCategoryConfigurationRespDTO();
- BeanUtils.copyProperties(byOrientation,gasCategoryConfigurationRespDTO);
+ if (byOrientation!=null){
+ BeanUtils.copyProperties(byOrientation,gasCategoryConfigurationRespDTO);
+ }
gasLineChartRespDTO.setGasCategoryConfigurationRespDTO(gasCategoryConfigurationRespDTO);
}
@@ -164,12 +169,16 @@
if (searchParams.getPosition()!=null && searchParams.getGasName()!=null){
GasCategoryConfiguration byGasCateGoryIdAndOrientation = gasCategoryConfigurationRepository.findByGasCategoryIdAndOrientation(searchParams.getGasName(),searchParams.getPosition());
GasCategoryConfigurationRespDTO gasCategoryConfigurationRespDTO = new GasCategoryConfigurationRespDTO();
- BeanUtils.copyProperties(byGasCateGoryIdAndOrientation,gasCategoryConfigurationRespDTO);
+ if(byGasCateGoryIdAndOrientation!=null){
+ BeanUtils.copyProperties(byGasCateGoryIdAndOrientation,gasCategoryConfigurationRespDTO);
+ }
gasLineChartRespDTO.setGasCategoryConfigurationRespDTO(gasCategoryConfigurationRespDTO);
} else if (searchParams.getPosition()!=null){
GasCategoryConfiguration byOrientation = gasCategoryConfigurationRepository.findByOrientation(searchParams.getPosition());
GasCategoryConfigurationRespDTO gasCategoryConfigurationRespDTO = new GasCategoryConfigurationRespDTO();
- BeanUtils.copyProperties(byOrientation,gasCategoryConfigurationRespDTO);
+ if(byOrientation!=null){
+ BeanUtils.copyProperties(byOrientation,gasCategoryConfigurationRespDTO);
+ }
gasLineChartRespDTO.setGasCategoryConfigurationRespDTO(gasCategoryConfigurationRespDTO);
}
gasLineChartRespDTO.setGasName(gasName);
@@ -468,33 +477,37 @@
gasConcentrationExportDTO.setPosition(positionHandle.positionHandleMethod(gasConcentration.getPosition()));
gasConcentrationExportDTO.setGasName01("甲烷CH4");
- gasConcentrationExportDTO.setGasName02("乙烷C2H6");
- gasConcentrationExportDTO.setGasName03("丙烷C3H8");
- gasConcentrationExportDTO.setGasName04("丁烷C4H10");
- gasConcentrationExportDTO.setGasName05("硫化氢H2S");
- gasConcentrationExportDTO.setGasName06("乙烯C2H4");
- gasConcentrationExportDTO.setGasName07("异丁烷C4H10");
+ gasConcentrationExportDTO.setGasName02("丁烷C4H10");
+ gasConcentrationExportDTO.setGasName03("二氯丙烯C3H4C12");
+ gasConcentrationExportDTO.setGasName04("乙醛C2H4O");
+ gasConcentrationExportDTO.setGasName05("异丁烷H4h10_1");
+ gasConcentrationExportDTO.setGasName06("臭氧O3");
+ gasConcentrationExportDTO.setGasName07("丙醛C3H6O_2");
+ gasConcentrationExportDTO.setGasName08("甲苯C7H8_1");
if (gasConcentrationExportBO.getCh4() == 0){
gasConcentrationExportDTO.setGasValue01(null);
}
- if (gasConcentrationExportBO.getC2h6() == 0){
+ if (gasConcentrationExportBO.getC4h10() == 0){
gasConcentrationExportDTO.setGasValue02(null);
}
- if (gasConcentrationExportBO.getC3H8() == 0){
+ if (gasConcentrationExportBO.getC3h4cl2() == 0){
gasConcentrationExportDTO.setGasValue03(null);
}
- if (gasConcentrationExportBO.getC4h101() == 0){
+ if (gasConcentrationExportBO.getC2h4o() == 0){
gasConcentrationExportDTO.setGasValue04(null);
}
- if (gasConcentrationExportBO.getH2s() == 0){
+ if (gasConcentrationExportBO.getC4h10_1() == 0){
gasConcentrationExportDTO.setGasValue05(null);
}
- if (gasConcentrationExportBO.getC2h4() == 0){
+ if (gasConcentrationExportBO.getO3() == 0){
gasConcentrationExportDTO.setGasValue06(null);
}
- if (gasConcentrationExportBO.getC4h102() == 0){
+ if (gasConcentrationExportBO.getC3h6o_2() == 0){
gasConcentrationExportDTO.setGasValue07(null);
}
+ if (gasConcentrationExportBO.getC7h8_1() == 0){
+ gasConcentrationExportDTO.setGasValue08(null);
+ }
exportLists.add(gasConcentrationExportDTO);
}
--
Gitblit v1.9.2