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();