From e8b88343e145c5ceb3563cb33d18c4f595210545 Mon Sep 17 00:00:00 2001 From: huguanghan Date: Fri, 20 Dec 2024 13:14:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/das/modules/data/service/TDEngineService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/das/src/main/java/com/das/modules/data/service/TDEngineService.java b/das/src/main/java/com/das/modules/data/service/TDEngineService.java index bd7b7efc..172a5075 100644 --- a/das/src/main/java/com/das/modules/data/service/TDEngineService.java +++ b/das/src/main/java/com/das/modules/data/service/TDEngineService.java @@ -1,6 +1,7 @@ package com.das.modules.data.service; import cn.hutool.core.collection.ListUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.das.common.utils.PageDataInfo; import com.das.modules.cache.domain.DeviceInfoCache; @@ -896,7 +897,7 @@ public class TDEngineService { deviceEventInfo.setDeviceId(rs.getString("device_id")); DeviceInfoCache deviceInfoCache = cacheService.getEquipmentCache().getDeviceInfoCacheById(rs.getLong("device_id")); deviceEventInfo.setDeviceName(rs.getString("device_name")); - deviceEventInfo.setFirstTriggeredCode(rs.getInt("first_triggered_code")); + deviceEventInfo.setFirstTriggeredCode(ObjectUtil.isEmpty(rs.getString("first_triggered_code")) ? null : Integer.valueOf(rs.getString("first_triggered_code"))); deviceEventInfo.setMadeinFactory(deviceInfoCache.getMadeinFactory()); deviceEventInfo.setModel(deviceInfoCache.getModel()); result.add(deviceEventInfo);