241127-2代码。

common/websocketManager.py

@@ -45,7 +45,18 @@ class ConnectionManager:
         if not self.active_connections[pattern_id]:
             del self.active_connections[pattern_id]
     async def broadcast(self,pattern_id:str,db: Session, websocket: WebSocket):#, message: str
-        data = pattern_id_get_tp_pattern_ws_list(pattern_id,db)
+        query = db.query(TpPatternWSGroupList)
+        query = query.filter(TpPatternWSGroupList.del_flag != '2')
+        query = query.filter(TpPatternWSGroupList.pattern_id == pattern_id)
+        query = query.filter(TpPatternWSGroupList.visible == '1')
+        query = query.order_by(TpPatternWSGroupList.create_time.desc())
+        group_list= query.all()
+        if len(group_list)>1:
+            data = pattern_id_get_tp_pattern_ws_list(pattern_id,db)
+        elif len(group_list)==1:
+            data = pattern_id_get_tp_pattern_ws_list(group_list[0].group_id, db)
+        else:
+            data=[]
         message = []
         for info in data:
             user= user_id_get_user_info(db,info.create_by)