241117-1代码。

common/websocketManager.py

@@ -86,7 +86,7 @@ def user_id_and_pattern_id_get_tp_pattern_ws_info(user_id:str,pattern_id:str,db:
     query = query.filter(TpPatternWSList.del_flag != '2')
     query = query.filter(TpPatternWSList.pattern_id == pattern_id)
     query = query.filter(TpPatternWSList.create_by == user_id)
-    query.order_by(TpPatternWSList.create_time.desc())
+    query = query.order_by(TpPatternWSList.create_time.desc())
     return query.first()
 
 def pattern_id_get_tp_pattern_ws_users(pattern_id:str,db: Session):
@@ -100,7 +100,7 @@ def pattern_id_get_tp_pattern_ws_list(pattern_id:str,db: Session):
     query = db.query(TpPatternWSList)
     query = query.filter(TpPatternWSList.del_flag != '2')
     query = query.filter(TpPatternWSList.pattern_id == pattern_id)
-    query.order_by(TpPatternWSList.create_time.desc())
+    query = query.order_by(TpPatternWSList.create_time)
     # query = query.group_by(TpPatternWSList.create_id)
     return query.all()
 
@@ -114,28 +114,28 @@ def pattern_id_get_tp_pattern_ws_max_time(pattern_id:str,db: Session):
     query = db.query(TpPatternWSList.update_time)
     query = query.filter(TpPatternWSList.del_flag != '2')
     query = query.filter(TpPatternWSList.pattern_id == pattern_id)
-    query.order_by(TpPatternWSUserList.update_time.desc())
+    query = query.order_by(TpPatternWSUserList.update_time.desc())
     return query.first()
 
 def pattern_id_get_tp_pattern_ws_user_list(pattern_id:str,db: Session):
     query = db.query(TpPatternWSUserList)
     query = query.filter(TpPatternWSUserList.del_flag != '2')
     query = query.filter(TpPatternWSUserList.pattern_id == pattern_id)
-    query.order_by(TpPatternWSUserList.create_time.desc())
+    query = query.order_by(TpPatternWSUserList.create_time.desc())
     return query.all()
 
 def pattern_id_get_tp_pattern_ws_group_def_info(pattern_id:str,db: Session):
     query = db.query(TpPatternWSGroupList)
     query = query.filter(TpPatternWSGroupList.del_flag != '2')
     query = query.filter(TpPatternWSGroupList.pattern_id == pattern_id)
-    query.order_by(TpPatternWSGroupList.create_time.desc())
+    query = query.order_by(TpPatternWSGroupList.create_time.desc())
     return query.first()
 
 def user_id_get_tp_pattern_ws_user_list(user_id:str,db: Session):
     query = db.query(TpPatternWSUserList)
     query = query.filter(TpPatternWSUserList.del_flag != '2')
     query = query.filter(TpPatternWSUserList.user_id == user_id)
-    query.order_by(TpPatternWSUserList.create_time.desc())
+    query = query.order_by(TpPatternWSUserList.create_time.desc())
     return query.all()
 
 def user_id_and_pattern_id_get_tp_pattern_ws_user_info(user_id:str,pattern_id:str,db: Session):
@@ -143,11 +143,11 @@ def user_id_and_pattern_id_get_tp_pattern_ws_user_info(user_id:str,pattern_id:st
     query = query.filter(TpPatternWSUserList.del_flag != '2')
     query = query.filter(TpPatternWSUserList.user_id == user_id)
     query = query.filter(TpPatternWSUserList.pattern_id == pattern_id)
-    query.order_by(TpPatternWSUserList.create_time.desc())
+    query = query.order_by(TpPatternWSUserList.create_time.desc())
     return query.first()
 def pattern_id_get_tp_pattern_ws_group_list(pattern_id:str,db: Session):
     query = db.query(TpPatternWSGroupList)
     query = query.filter(TpPatternWSGroupList.del_flag != '2')
     query = query.filter(TpPatternWSGroupList.pattern_id == pattern_id)
-    query.order_by(TpPatternWSGroupList.create_time.desc())
+    query = query.order_by(TpPatternWSGroupList.create_time.desc())
     return query.all()

routers/api/pattern/__init__.py

@@ -200,6 +200,18 @@ async def websocket_endpoint(pattern_id:str ,websocket: WebSocket,db: Session =
                         db.commit()
                         await websocket.send_text('{"code": 200, "msg": "更新成功", "data": null}')
                         await manager.broadcast(pattern_id, db,websocket)
+                    elif data['operation'] == 'delete':
+                        if 'id' in data:
+                            id = data['id']
+                            query = db.query(TpPatternWSList)
+                            query = query.filter(TpPatternWSList.del_flag != '2')
+                            query = query.filter(TpPatternWSList.id == id)
+                            info = query.first()
+                            info.del_flag='2'
+                            info.update_by = user_id
+                            db.commit()
+                            await websocket.send_text('{"code": 200, "msg": "更新成功", "data": null}')
+                            await manager.broadcast(pattern_id, db, websocket)
                     else:
                         await websocket.send_text('{"code": 404, "msg": "更新数据 id为必填","data":null}')
                 elif data['operation'] == 'heartCheck':