machunlei/springboot-xinda-dev
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
LEED
2025-03-27 17:15:27 +08:00
parent 6a8cbff440
commit 988e68bdc7
47 changed files with 1051 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
xinda-gateway/xinda-mq/src/main/java/com/xinda/mq/redischannel/consumer/DeviceStatusConsumer.java
View File

@@ -91,9 +91,10 @@ public class DeviceStatusConsumer {
if (!containsKey && isOnline) {
bo.setStatus(DeviceStatus.OFFLINE);
}
// 判断下 项目id
// 判断下 项目机构tStatus().getDescription().equals("离线")){
if(bo.getStatus().getDescription().equals("离线")){
if (device.getGroupId().equals(0L) || device.getGroupId() == null) {
// if (device.getGroupId().equals(0L) || device.getGroupId() == null) {
if (device.getAgenciesId() == null) {
//设置删除状态 todo
device.setDelFlag("2");
}

3
xinda-gateway/xinda-mq/src/main/java/com/xinda/mq/service/impl/DeviceOtherMsgHandler.java
View File

@@ -50,7 +50,8 @@ public class DeviceOtherMsgHandler {
if (bo.getTopicName().startsWith(TopicType.PROPERTY_XINDA_DEV.getTopicSuffix()) || bo.getTopicName().startsWith(TopicType.FUNCTION_XINDA_DOWN.getTopicSuffix())) {
name = topicsUtils.parseNewTopicName(bo.getTopicName());
}else{
name = topicsUtils.parseTopicName(bo.getTopicName());
return;
// name = topicsUtils.parseTopicName(bo.getTopicName());
}
if (StringUtils.isEmpty(name) || name.endsWith(TopicType.FUNCTION_GET.getTopicSuffix()) || name.startsWith(TopicType.FUNCTION_XINDA_DOWN.getTopicSuffix()) ) return;
ReportDataBo data = this.buildReportData(bo);

1
xinda-gateway/xinda-mq/src/main/java/com/xinda/mq/service/impl/RuleEngineHandler.java
View File

@@ -84,6 +84,7 @@ public class RuleEngineHandler implements IRuleEngine {
for(Script script : list) {
requestId = requestId + "/" + script.getScriptId();
}
// String requestId = "scene/" + scene.getChainName();
flowExecutor.execute2FutureWithRid(scene.getChainName(), null, requestId, context);
}
}