bug修复

ems/ems-cloud/ems-dev-adapter/src/main/java/com/ruoyi/ems/handle/GeekOpenCbHandler.java

@@ -90,7 +90,7 @@ public class GeekOpenCbHandler extends MqttBaseHandler {
 
         JSONObject sendObject = JSONObject.parseObject(abilityParam.getAbilityParam());
         String type = sendObject.getString("type");
-
+        String system = sendObject.getString("system");
         String deviceCode = abilityParam.getObjCode();
         String messageId = StringUtils.equals("syncStatistic", type) ? "auto" : ("CALL-" + IdUtils.generateMessageId());
         String msgBody = addMsgId(abilityParam.getAbilityParam(), "messageId", messageId);
@@ -103,7 +103,7 @@ public class GeekOpenCbHandler extends MqttBaseHandler {
         // 写入日志
         EmsObjAbilityCallLog logItem = saveCallLog(abilityParam, sendTime, 1);
 
-        if (StringUtils.equals(type, "event") || StringUtils.equals(type, "setting")) {
+        if (StringUtils.equals(type, "event") || (StringUtils.equals(type, "setting") && StringUtils.isEmpty(system))) {
             while (true) {
                 MqttCacheMsg cacheMsg = messageCache.getAndRemoveMqttMessage(messageId);
 
@@ -132,6 +132,9 @@ public class GeekOpenCbHandler extends MqttBaseHandler {
                 }
             }
         }
+        else {
+            callResponse = new CallResponse<>(0, "执行成功!");
+        }
 
         return callResponse;
     }
@@ -357,7 +360,7 @@ public class GeekOpenCbHandler extends MqttBaseHandler {
                     String receiveTimerEnableValue = receiveObject.getString("timerEnable");
                     Assert.isTrue(StringUtils.equals(sendTimerEnableValue, receiveTimerEnableValue), -1,
                         "响应参数timerEnable校验失败!");
-                    String sendTimerIntervalValue = sendObject.getString("keyLock");
+                    String sendTimerIntervalValue = sendObject.getString("timerInterval");
                     String receiveTimerIntervalValue = receiveObject.getString("timerInterval");
                     Assert.isTrue(StringUtils.equals(sendTimerIntervalValue, receiveTimerIntervalValue), -1,
                         "响应参数timerInterval校验失败!");