提交修改

xinda-gateway/xinda-mq/src/main/java/com/xinda/mq/ruleEngine/SceneContext.java

@@ -391,7 +391,7 @@ public class SceneContext {
         alertLog.setSerialNumber(deviceNum);
         alertLog.setStatus(2);
         alertLog.setCreateBy(sceneId.toString());
-        Long count = alertLogService.selectAlertLogListCount(alertLog);
+        Long count = alertLogService.selectSceneAlertLogListCount(alertLog);
         // 查询设备告警对应的场景是否有未处理告警
         if (count > 0) {
             return true;

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

@@ -69,6 +69,12 @@ public class DeviceOtherMsgHandler {
                 data.setRuleEngine(true);
                 dataHandler.reportData(data);
                 break;
+//            case FUNCTION_POST:
+//                data.setShadow(false);
+//                data.setType(2);
+//                data.setRuleEngine(true);
+//                dataHandler.reportData(data);
+//                break;
             case EVENT_POST:
                 data.setType(3);
                 data.setRuleEngine(true);

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

@@ -84,7 +84,6 @@ 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);
         }
     }