fix:规则删除失败

iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/JsonUtils.java

@@ -5,12 +5,10 @@ import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import lombok.SneakyThrows;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -22,8 +20,7 @@ import java.util.Objects;
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class JsonUtils {
-
-    private static final ObjectMapper OBJECT_MAPPER = SpringUtils.getBean(ObjectMapper.class);
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
     public static ObjectMapper getObjectMapper() {
         return OBJECT_MAPPER;
@@ -119,11 +116,12 @@ public class JsonUtils {
             throw new RuntimeException(e);
         }
     }
+
     public static <T> T objectToJavaBean(Object obj, Class<T> clazz) {
         if (Objects.isNull(obj)) {
             return null;
         }
-        return OBJECT_MAPPER.convertValue(obj,clazz);
+        return OBJECT_MAPPER.convertValue(obj, clazz);
     }
 
 }

iot-components/iot-mqtt-component/src/main/java/cc/iotkit/comp/mqtt/MqttVerticle.java

@@ -103,7 +103,9 @@ public class MqttVerticle extends AbstractVerticle {
             endpoint.accept(false);
             endpoint.closeHandler((v) -> {
                 log.warn("client connection closed,clientId:{}", clientId);
-                if (mqttConnectPool.get(clientId) == false) return;
+                if (!mqttConnectPool.get(clientId)) {
+                    return;
+                }
                 executor.onReceive(new HashMap<>(), "disconnect", clientId, (r) -> {
                     //删除设备与连接关系
                     endpointMap.remove(getEndpointKey(r));

iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/impl/RuleEngineServiceImpl.java

@@ -146,9 +146,13 @@ public class RuleEngineServiceImpl implements IRuleEngineService {
             throw new BizException(ErrCode.RULE_NOT_FOUND);
         }
         dataOwnerService.checkOwner(ruleInfo);
-        ruleInfoData.deleteById(ruleInfo.getId());
-        ruleManager.remove(ruleInfo.getId());
-        ruleLogData.deleteByRuleId(ruleId);
+        try {
+            ruleInfoData.deleteById(ruleInfo.getId());
+            ruleManager.remove(ruleInfo.getId());
+            ruleLogData.deleteByRuleId(ruleId);
+        } catch (Throwable e) {
+            log.warn("删除失败", e);
+        }
         return true;
     }