diff --git a/src/main/java/com/xydl/cac/thermal/ThermalCollectService.java b/src/main/java/com/xydl/cac/thermal/ThermalCollectService.java index e6254ad..3b13272 100644 --- a/src/main/java/com/xydl/cac/thermal/ThermalCollectService.java +++ b/src/main/java/com/xydl/cac/thermal/ThermalCollectService.java @@ -5,6 +5,7 @@ import com.netsdk.module.LoginModule; import com.netsdk.module.ThermalCameraModule; import com.xydl.cac.entity.NSensor; import com.xydl.cac.entity.ThermalConfig; +import com.xydl.cac.model.StaticVariable; import com.xydl.cac.service.DataService; import com.xydl.cac.util.DateUtil; import lombok.extern.slf4j.Slf4j; @@ -42,13 +43,22 @@ public class ThermalCollectService { 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)); + String value = String.valueOf(data.fTemperMax); + dataService.insertData(item.getTableName(), item.getDevId(), time, config.getMaxtemp(), value); + // 更新最新数据缓存 + StaticVariable.updateLastData(item.getDevId(), config.getMaxtemp(), value, time); } if (StringUtils.isNotBlank(config.getMintemp())) { - dataService.insertData(item.getTableName(), item.getDevId(), time, config.getMintemp(), String.valueOf(data.fTemperMin)); + String value = String.valueOf(data.fTemperMin); + dataService.insertData(item.getTableName(), item.getDevId(), time, config.getMintemp(), value); + // 更新最新数据缓存 + StaticVariable.updateLastData(item.getDevId(), config.getMintemp(), value, time); } if (StringUtils.isNotBlank(config.getAvertemp())) { - dataService.insertData(item.getTableName(), item.getDevId(), time, config.getAvertemp(), String.valueOf(data.fTemperAver)); + String value = String.valueOf(data.fTemperAver); + dataService.insertData(item.getTableName(), item.getDevId(), time, config.getAvertemp(), value); + // 更新最新数据缓存 + StaticVariable.updateLastData(item.getDevId(), config.getAvertemp(), value, time); } } }