diff --git a/das/src/main/java/com/das/modules/data/service/impl/DataServiceImpl.java b/das/src/main/java/com/das/modules/data/service/impl/DataServiceImpl.java index 432fa733..1c471f97 100644 --- a/das/src/main/java/com/das/modules/data/service/impl/DataServiceImpl.java +++ b/das/src/main/java/com/das/modules/data/service/impl/DataServiceImpl.java @@ -9,11 +9,12 @@ import com.das.modules.data.domain.TSValueQueryParam; import com.das.modules.data.service.DataService; import com.das.modules.data.service.TDEngineService; import com.das.modules.equipment.domain.vo.IotModelFieldVo; +import com.das.modules.equipment.domain.vo.SysEquipmentVo; import com.das.modules.equipment.entity.SysIotModelField; +import com.das.modules.equipment.mapper.SysEquipmentMapper; import com.das.modules.equipment.mapper.SysIotModelFieldMapper; import com.das.modules.equipment.mapper.SysIotModelMapper; import com.das.modules.node.domain.bo.CalculateRTData; -import com.das.modules.node.service.impl.NodeMessageServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -36,10 +37,10 @@ public class DataServiceImpl implements DataService { private SysIotModelFieldMapper sysIotModelFieldMapper; @Autowired - private TDEngineService tdEngineService; + private SysEquipmentMapper sysEquipmentMapper; @Autowired - private NodeMessageServiceImpl dataService; + private TDEngineService tdEngineService; @Autowired SysIotModelMapper sysIotModelMapper; @@ -50,13 +51,13 @@ public class DataServiceImpl implements DataService { //key:modelId value:modelCode public ConcurrentHashMap iotModelMap = new ConcurrentHashMap<>(10000); - //key:modelCode value:Filed:Code,dataType + //key:modelCode value:FiledCode,dataType public ConcurrentHashMap> highIotFieldMap = new ConcurrentHashMap<>(10000); - //key:modelCode value:Filed:Code,dataType + //key:modelCode value:FiledCode,dataType public ConcurrentHashMap> lowIotFieldMap = new ConcurrentHashMap<>(10000); - //key:modelCode value:Filed:Code,dataType + //key:modelCode value:FiledCode,dataType public ConcurrentHashMap> calculateIotFieldMap = new ConcurrentHashMap<>(10000); /** @@ -182,6 +183,10 @@ public class DataServiceImpl implements DataService { @Override public void createTdStable() { + List sysEquipmentVos = sysEquipmentMapper.queryAllIdModelCodeMapping(); + for (SysEquipmentVo item : sysEquipmentVos){ + deviceModelMap.put(item.getId().toString(), item.getModel()); + } List allIotModel = sysIotModelMapper.getAllIotModel(); for (IotModelFieldVo item : allIotModel) { String key = String.valueOf(item.getId()); diff --git a/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java b/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java index 2f5372b4..3bc0e5ca 100644 --- a/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java +++ b/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java @@ -54,5 +54,7 @@ public interface SysEquipmentMapper extends BaseMapperPlus queryEquipmentList(@Param("info") SysEquipmentDto sysEquipmentDto); + List queryAllIdModelCodeMapping(); + } diff --git a/das/src/main/resources/mapper/SysEquipmentMapper.xml b/das/src/main/resources/mapper/SysEquipmentMapper.xml index 364fa5ca..2f2488ed 100644 --- a/das/src/main/resources/mapper/SysEquipmentMapper.xml +++ b/das/src/main/resources/mapper/SysEquipmentMapper.xml @@ -168,5 +168,10 @@ order by t.name +