修改的标签走队列模式

Zmq/zmqServer.py

@@ -355,7 +355,6 @@ class zmqServer(threading.Thread):
             
             # 写入范式缓冲区
             with self.paradigmBufferLock:
-                self.paradigmBuffer.appendBuffer(data_np)
                 if self.interval_inited:
                     self.epoch_finished = self.detect_event(data_np)
                     if self.pack_contain_event:
@@ -420,8 +419,7 @@ class zmqServer(threading.Thread):
 
     # -------------------------- 事件检测 --------------------------
     def detect_event(self, samples):
-        pack_contain_event = False
-        epoch_finished = False
+        self.pack_contain_event = False
         # 第65通道为事件通道
         events = np.array(samples[-2], dtype=np.int32).tolist()
         for idx, event in enumerate(events):
@@ -433,21 +431,15 @@ class zmqServer(threading.Thread):
                                                 -%H-%M-%S"),
                     ]
                 )
-                if len(self.count_events) > 0:
-                    algo_log(f"当前有事件未采集完成，新事件{new_key}非法，被忽略")
-                    return pack_contain_event, epoch_finished
+                self.currentLabel = event
+                if event == self.predict_event:
+                    self.count_events[new_key] = self.latency + 1
                 else:
-                    self.currentLabel = event
-                    pack_contain_event = True
-                    if event == self.predict_event:
-                        self.count_events[new_key] = self.latency + 1
-                    else:
-                        self.count_events[new_key] = self.train_latency + 1
-                    self.event_inner_idx = idx
-                    algo_log(f"事件检测到: {events}，索引: {idx}", level="DEBUG")
-            else:
-                pack_contain_event = False
-                
+                    self.count_events[new_key] = self.train_latency + 1
+                self.event_inner_idx = idx
+                algo_log(f"事件检测到: {events}，索引: {idx}", level="DEBUG")
+                self.pack_contain_event = True
+
         # 倒计时并清理过期事件
         drop_items = []
         for key, value in self.count_events.items():
@@ -455,15 +447,13 @@ class zmqServer(threading.Thread):
             if value == 0:
                 drop_items.append(key)
             self.count_events[key] = value
-            
+
         for key in drop_items:
             del self.count_events[key]
-            
-        if len(drop_items) > 0:
-            epoch_finished = True
-        else:
-            epoch_finished = False
-        return pack_contain_event, epoch_finished
+
+        if drop_items:
+            return True
+        return False
     
     
     # -------------------------- 主循环 --------------------------