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 1e0a930e..0812d2b1 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 @@ -8,6 +8,7 @@ import com.das.modules.equipment.mapper.SysEquipmentMapper; import com.das.modules.equipment.mapper.SysIotModelMapper; import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -16,6 +17,7 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.ConcurrentHashMap; +@Slf4j @Service public class EquipmentCacheImpl implements EquipmentCache { @Autowired @@ -46,8 +48,10 @@ public class EquipmentCacheImpl implements EquipmentCache { deviceInfoCache.setMadeinFactory(equipment.getMadeinFactory()); deviceInfoCache.setParentDeviceId(equipment.getParentEquipmentId()); deviceInfoCache.setIotModelId(equipment.getIotModelId()); - String iotModelCode = sysIotModelMapper.getIotModel(equipment.getIotModelId()); + String iotModelCode = sysIotModelMapper.getIodModelCode(equipment.getIotModelId()); + log.debug("iotModelId: {}", equipment.getIotModelId()); if (StrUtil.isNotBlank(iotModelCode)){ + log.debug("iotModelCode: {}", iotModelCode); deviceInfoCache.setIotModelCode(iotModelCode); } //创建Code索引 diff --git a/das/src/main/java/com/das/modules/equipment/mapper/SysIotModelMapper.java b/das/src/main/java/com/das/modules/equipment/mapper/SysIotModelMapper.java index 71fad7fd..8b6950ee 100644 --- a/das/src/main/java/com/das/modules/equipment/mapper/SysIotModelMapper.java +++ b/das/src/main/java/com/das/modules/equipment/mapper/SysIotModelMapper.java @@ -31,6 +31,8 @@ public interface SysIotModelMapper extends BaseMapper { String getIotModel(Long id); + String getIodModelCode(Long id); + List getAllIotModelField(Long id); SysIotModelVo selectIotModelByCode(String code); diff --git a/das/src/main/resources/mapper/SysIotModelMapper.xml b/das/src/main/resources/mapper/SysIotModelMapper.xml index 271248f8..297189d5 100644 --- a/das/src/main/resources/mapper/SysIotModelMapper.xml +++ b/das/src/main/resources/mapper/SysIotModelMapper.xml @@ -77,6 +77,10 @@ select sim.iot_model_code from sys_iot_model sim left join sys_equipment se on sim.id = se.iot_model_id where se.id = #{id} + +