修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/config/EquipmentIotMqttReceiveConfig.java

@@ -156,7 +156,8 @@ public class EquipmentIotMqttReceiveConfig {
         return message -> {
 
             String topic = message.getHeaders().get("mqtt_receivedTopic").toString();
-
+            //异步处理
+            EquipmentIotMqttReceiveConfig controllerProxy = SpringUtils.getBean(EquipmentIotMqttReceiveConfig.class);
             String msg = message.getPayload().toString();
             int endIndex = topic.lastIndexOf("/");
             if (endIndex > 0 && StringUtil.isNotEmpty(message)) {
@@ -164,14 +165,13 @@ public class EquipmentIotMqttReceiveConfig {
                 if (dataType.equals("property") && StringUtil.isNotEmpty(msg)) {
 
                     //mqttReceiveService.handlerMqttIncrementMessage(topic, msg);
-                    //异步处理
-                    EquipmentIotMqttReceiveConfig controllerProxy = SpringUtils.getBean(EquipmentIotMqttReceiveConfig.class);
+
                     controllerProxy.namePrefixhandlerMqttIncrementMessage(topic, msg);
 
                 } else if (dataType.equals("event") && StringUtil.isNotEmpty(msg)) {
 
-                    mqttEventReceiveService.handlerMqttIncrementMessage(topic, msg);
-
+                   // mqttEventReceiveService.handlerMqttIncrementMessage(topic, msg);
+                    controllerProxy.namePrefixhandlerMqttIncrementMessageEven(topic, msg);
                 }
             }
         };
@@ -181,7 +181,10 @@ public class EquipmentIotMqttReceiveConfig {
         this.mqttReceiveService = mqttReceiveService;
     }
 
-
+    @Async("equipAsyncExecutor")
+    public void namePrefixhandlerMqttIncrementMessageEven(String topic, String msg) {
+        mqttEventReceiveService.handlerMqttIncrementMessage(topic, msg);
+    }
 
     @Async("equipAsyncExecutor")
     public void namePrefixhandlerMqttIncrementMessage(String topic, String msg) {
@@ -192,18 +195,10 @@ public class EquipmentIotMqttReceiveConfig {
             RLock lock = redisson.getLock(topic);
             try {
                 //拿锁失败10停止尝试，20秒后直接释放锁 无论是返回 true 还是 false，都会继续执行之后的代码。
-            boolean flag= lock.tryLock(2, 20, TimeUnit.SECONDS);
-                System.out.println("msg==================================="+flag);
-                for (int i = 0; i <= 1000000; i++)
-                {
-
-                    System.out.println("msg==================================="+i);
-                }
-
-
-                //为了防止重复
+            boolean flag= lock.tryLock(10, 20, TimeUnit.SECONDS);
+            
                 mqttReceiveService.handlerMqttIncrementMessage(topic, msg);
-                System.out.println("msg==================================="+msg);
+
             } catch (Exception e) {
                 e.printStackTrace();
             } finally {