sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

device event修改

Browse Source
This commit is contained in:
huguanghan 2024-11-22 09:38:34 +08:00
parent b8a88ea9d9
commit 63f961ec21
5 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
das/src/main/java/com/das/modules/data/domain/DeviceEventInfo.java
View File

@ -11,6 +11,8 @@ public class DeviceEventInfo {
@JsonSerialize(using = ToStringSerializer.class)
private Long eventId;
private String attributeCode;
private Integer eventType;
private Integer eventLevel;

2
das/src/main/java/com/das/modules/data/service/TDEngineService.java
View File

@ -400,6 +400,8 @@ public class TDEngineService {
sb.append(",");
sb.append(dv.getEventId());
sb.append(",");
sb.append(dv.getAttributeCode());
sb.append(",");
sb.append(dv.getEventType());
sb.append(",");
sb.append(dv.getEventLevel());

2
das/src/main/java/com/das/modules/data/service/impl/DataServiceImpl.java
View File

@ -218,7 +218,7 @@ public class DataServiceImpl implements DataService {
Map<String, String> HighModelFieldList = allIotModelField.stream().filter(field -> field.getHighSpeed() == 1 && field.getAttributeType() != 199).collect(Collectors.toMap(SysIotModelField::getAttributeCode, SysIotModelField::getDataType, (value1, value2) -> value1));
Map<String, String> calculateFieldList = allIotModelField.stream().filter(field -> field.getAttributeType() == 199).collect(Collectors.toMap(SysIotModelField::getAttributeCode, SysIotModelField::getDataType, (value1, value2) -> value1));
Map<String, String> fieldCodeNameList = allIotModelField.stream().collect(Collectors.toMap(SysIotModelField::getAttributeCode, SysIotModelField::getAttributeName, (value1, value2) -> value1));
Map<String, Integer> eventLevelList = allIotModelField.stream().filter(field -> field.getAttributeType() == 140 && field.getLevel() != null).collect(Collectors.toMap(SysIotModelField::getAttributeCode, SysIotModelField::getLevel, (value1, value2) -> value1));
Map<String, Integer> eventLevelList = allIotModelField.stream().filter(field -> field.getAttributeType() == 140).collect(Collectors.toMap(SysIotModelField::getAttributeCode, SysIotModelField::getLevel, (value1, value2) -> value1));
Map<String, Object> map = new HashMap<>();
for (String field : HighModelFieldList.keySet()) {
map.put(field, HighModelFieldList.get(field));

3
das/src/main/java/com/das/modules/node/service/impl/NodeMessageServiceImpl.java
View File

@ -346,6 +346,7 @@ public class NodeMessageServiceImpl extends TextWebSocketHandler implements Node
DeviceEventInfo deviceEventInfo = new DeviceEventInfo();
deviceEventInfo.setEventTime(item.getEventTime());
deviceEventInfo.setEventId(IdWorker.getId());
deviceEventInfo.setAttributeCode(item.getAttrCode());
deviceEventInfo.setDeviceId(item.getDeviceId());
deviceEventInfo.setDeviceName(deviceInfoCache.getDeviceName());
deviceEventInfo.setDeviceCode(deviceInfoCache.getDeviceCode());
@ -367,7 +368,7 @@ public class NodeMessageServiceImpl extends TextWebSocketHandler implements Node
deviceEventInfo.setEventLevel(0);
} else {
deviceEventInfo.setEventText(fieldName + " 动作");
Integer level = dataService.eventLevelMap.get(model).get(fieldName);
Integer level = dataService.eventLevelMap.get(model).get(item.getAttrCode());
log.info("缓存为：{}",dataService.eventLevelMap.get(model));
log.info("level:{}",level);
log.info("fieldname{}",fieldName);

2
das/src/main/resources/mapper/SysIotModelMapper.xml
View File

@ -78,7 +78,7 @@
where se.id = #{id}
</select>
<select id="getAllIotModelField" resultType="com.das.modules.equipment.entity.SysIotModelField">
select simf.attribute_name as attributeName, simf.attribute_code as attributeCode,simf.highspeed as highSpeed,simf.datatype as dataType,simf.attribute_type as attributeType from sys_iot_model_field simf where simf.iot_model_id = #{id} order by simf.attribute_code
select simf.attribute_name as attributeName, simf.attribute_code as attributeCode,simf.highspeed as highSpeed,simf.datatype as dataType,simf.attribute_type as attributeType,simf.level as level from sys_iot_model_field simf where simf.iot_model_id = #{id} order by simf.attribute_code
</select>