From 82f2a2d493932c8e5de7ae8a62212125e777cd58 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Thu, 27 Mar 2025 15:51:15 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=BA=A2=E5=A4=96?=
 =?UTF-8?q?=E6=B5=8B=E6=B8=A9=E9=87=87=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cac/thermal/ThermalCollectService.java    | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/xydl/cac/thermal/ThermalCollectService.java b/src/main/java/com/xydl/cac/thermal/ThermalCollectService.java
index d76f81f..6c6557d 100644
--- a/src/main/java/com/xydl/cac/thermal/ThermalCollectService.java
+++ b/src/main/java/com/xydl/cac/thermal/ThermalCollectService.java
@@ -8,6 +8,7 @@ import com.xydl.cac.entity.ThermalConfig;
 import com.xydl.cac.service.DataService;
 import com.xydl.cac.util.DateUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -30,11 +31,21 @@ public class ThermalCollectService {
             String time = DateUtil.format(new Date());
             for (NSensor item : list) {
                 NetSDKLib.NET_RADIOMETRYINFO data = ThermalCameraModule.queryItemTemper(0, 0, sensor.getTmId(), sensor.getTmType());
-                log.info("采集到序号" + item.getTmId() + "测量项目" + sensor.getTmType() + "的max="
-                        + data.fTemperMax + ", min=" + data.fTemperMin + ", aver=" + data.fTemperAver);
-                dataService.insertData(item.getTableName(), item.getDevId(), time, config.getMaxtemp(), String.valueOf(data.fTemperMax));
-                dataService.insertData(item.getTableName(), item.getDevId(), time, config.getMintemp(), String.valueOf(data.fTemperMin));
-                dataService.insertData(item.getTableName(), item.getDevId(), time, config.getAvertemp(), String.valueOf(data.fTemperAver));
+                if (data == null) {
+                    log.warn("没有采集到数据, 序号" + item.getTmId() + "测量项目" + sensor.getTmType());
+                } else {
+                    log.info("采集到序号" + item.getTmId() + "测量项目" + sensor.getTmType() + "的max="
+                            + data.fTemperMax + ", min=" + data.fTemperMin + ", aver=" + data.fTemperAver);
+                    if (StringUtils.isNotBlank(config.getMaxtemp())) {
+                        dataService.insertData(item.getTableName(), item.getDevId(), time, config.getMaxtemp(), String.valueOf(data.fTemperMax));
+                    }
+                    if (StringUtils.isNotBlank(config.getMintemp())) {
+                        dataService.insertData(item.getTableName(), item.getDevId(), time, config.getMintemp(), String.valueOf(data.fTemperMin));
+                    }
+                    if (StringUtils.isNotBlank(config.getAvertemp())) {
+                        dataService.insertData(item.getTableName(), item.getDevId(), time, config.getAvertemp(), String.valueOf(data.fTemperAver));
+                    }
+                }
             }
 
             LoginModule.logout();