From c6a3b39fadd345d94331b91e2bb6a2b2724faf23 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期四, 26 十二月 2024 16:49:19 +0800
Subject: [PATCH] 修改
---
src/main/java/com/gkhy/testFourierSpecialGasMonitor/service/impl/MonitorDataServiceImpl.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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..fb8c5c2 100644
--- a/src/main/java/com/gkhy/testFourierSpecialGasMonitor/service/impl/MonitorDataServiceImpl.java
+++ b/src/main/java/com/gkhy/testFourierSpecialGasMonitor/service/impl/MonitorDataServiceImpl.java
@@ -93,12 +93,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 +168,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);
--
Gitblit v1.9.2