From 633566bda89feab89806d60f0cb26ed41c1bfd1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= Date: Tue, 31 Dec 2024 16:43:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BC=93=E5=AD=98=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0iotModelCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/das/modules/cache/domain/DeviceInfoCache.java | 2 ++ .../modules/cache/service/impl/EquipmentCacheImpl.java | 9 ++++++++- .../com/das/modules/node/command/AnalogDataCommand.java | 4 ++-- .../com/das/modules/node/command/StateDataCommand.java | 5 +++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/das/src/main/java/com/das/modules/cache/domain/DeviceInfoCache.java b/das/src/main/java/com/das/modules/cache/domain/DeviceInfoCache.java index 892f7f9b..60e1f351 100644 --- a/das/src/main/java/com/das/modules/cache/domain/DeviceInfoCache.java +++ b/das/src/main/java/com/das/modules/cache/domain/DeviceInfoCache.java @@ -34,6 +34,8 @@ public class DeviceInfoCache { */ private Long iotModelId; + private String iotModelCode; + /** * 制造商 */ diff --git a/das/src/main/java/com/das/modules/cache/service/impl/EquipmentCacheImpl.java b/das/src/main/java/com/das/modules/cache/service/impl/EquipmentCacheImpl.java index 6426fa40..1e0a930e 100644 --- a/das/src/main/java/com/das/modules/cache/service/impl/EquipmentCacheImpl.java +++ b/das/src/main/java/com/das/modules/cache/service/impl/EquipmentCacheImpl.java @@ -1,9 +1,11 @@ package com.das.modules.cache.service.impl; +import cn.hutool.core.util.StrUtil; import com.das.modules.cache.domain.DeviceInfoCache; import com.das.modules.cache.service.EquipmentCache; import com.das.modules.equipment.entity.SysEquipment; import com.das.modules.equipment.mapper.SysEquipmentMapper; +import com.das.modules.equipment.mapper.SysIotModelMapper; import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import org.springframework.beans.factory.annotation.Autowired; @@ -18,7 +20,8 @@ import java.util.concurrent.ConcurrentHashMap; public class EquipmentCacheImpl implements EquipmentCache { @Autowired SysEquipmentMapper sysEquipmentMapper; - + @Autowired + SysIotModelMapper sysIotModelMapper; /** * 设备CODE索引，用于通过设备CODE访问设备缓存信息 @@ -43,6 +46,10 @@ public class EquipmentCacheImpl implements EquipmentCache { deviceInfoCache.setMadeinFactory(equipment.getMadeinFactory()); deviceInfoCache.setParentDeviceId(equipment.getParentEquipmentId()); deviceInfoCache.setIotModelId(equipment.getIotModelId()); + String iotModelCode = sysIotModelMapper.getIotModel(equipment.getIotModelId()); + if (StrUtil.isNotBlank(iotModelCode)){ + deviceInfoCache.setIotModelCode(iotModelCode); + } //创建Code索引 deviceCodeIndex.put(deviceInfoCache.getDeviceCode(),deviceInfoCache); //创建Id索引 diff --git a/das/src/main/java/com/das/modules/node/command/AnalogDataCommand.java b/das/src/main/java/com/das/modules/node/command/AnalogDataCommand.java index 8a59b3e1..7ab7ddd4 100644 --- a/das/src/main/java/com/das/modules/node/command/AnalogDataCommand.java +++ b/das/src/main/java/com/das/modules/node/command/AnalogDataCommand.java @@ -102,8 +102,8 @@ public class AnalogDataCommand implements BaseCommand { } hiSpeedData.setValues(hiSpeedValues); lowSpeedData.setValues(lowSpeedValues); - tdEngineService.updateYCHighValues(List.of(hiSpeedData), dev.getModel()); - tdEngineService.updateYCLowValues(List.of(lowSpeedData), dev.getModel()); + tdEngineService.updateYCHighValues(List.of(hiSpeedData), dev.getIotModelCode()); + tdEngineService.updateYCLowValues(List.of(lowSpeedData), dev.getIotModelCode()); } redisTemplate.opsForValue().multiSet(redisValues); } diff --git a/das/src/main/java/com/das/modules/node/command/StateDataCommand.java b/das/src/main/java/com/das/modules/node/command/StateDataCommand.java index db719dd4..97e12964 100644 --- a/das/src/main/java/com/das/modules/node/command/StateDataCommand.java +++ b/das/src/main/java/com/das/modules/node/command/StateDataCommand.java @@ -86,8 +86,9 @@ public class StateDataCommand implements BaseCommand { } hiSpeedData.setValues(hiSpeedValues); lowSpeedData.setValues(lowSpeedValues); - tdEngineService.updateYCHighValues(List.of(hiSpeedData), dev.getModel()); - tdEngineService.updateYCLowValues(List.of(lowSpeedData), dev.getModel()); + + tdEngineService.updateYCHighValues(List.of(hiSpeedData), dev.getIotModelCode()); + tdEngineService.updateYCLowValues(List.of(lowSpeedData),dev.getIotModelCode()); } redisTemplate.opsForValue().multiSet(redisValues); }