no message

routers/prod_api/system/user/__init__.py

@@ -292,6 +292,7 @@ async def deptTree(request: Request,db: Session = Depends(get_db), user_id: int
 
 @router.get('/avcon/deptTree')
 async def deptTree(request: Request,label: str = Query(None, description='部门名称'),db: Session = Depends(get_db), user_id: int = Depends(valid_access_token)):
+    """
     def build_dept_tree(depts, parent_dept):
         dept_tree = []
         for dept_info in depts:
@@ -328,6 +329,26 @@ async def deptTree(request: Request,label: str = Query(None, description='部门
         result=build_dept_tree(query.all(), None)
     else:
         result=build_dept_tree(parent_id_get_dept_info(db, 0),None)
+    """
+
+    result = []
+    # 暂时写死
+    result.append({
+        "id": "G2@mm.zw.yj",
+        "label": "指挥终端",
+        "isLeaf": True
+    })
+    result.append({
+        "id": "G5@mm.zw.yj",
+        "label": "移动视频",
+        "isLeaf": True
+    })
+    result.append({
+        "id": "G6@mm.zw.yj",
+        "label": "H323会议",
+        "isLeaf": True
+    })
+    
     return {
         "code": 200,
         "msg": "操作成功",
@@ -380,12 +401,24 @@ async def deptTree(request: Request,label: str = Query(None, description='部门
 @router.get('/avcon/list/dept/{dept_id}')
 async def get_dept_user_list(
     # request: Request,
-    dept_id: int,
+    dept_id: str,
     name: str = Query(None, description='昵称'),
     db: Session = Depends(get_db),
     body = Depends(remove_xss_json),
     user_id = Depends(valid_access_token)
 ):
+    def get_avcon_type_text(type: str) -> str:
+        if type == '001':
+            return '指挥视频终端'
+        elif type == '060':
+            return '营区监控'
+        elif type == '085':
+            return '监控网关服务器'
+        elif type == '100':
+            return 'H.323终端'
+        
+        return "未知终端"
+    """
     query = db.query(SysUser)
     query = query.filter(SysUser.del_flag != '2')
 
@@ -419,7 +452,20 @@ async def get_dept_user_list(
             "mobile": dev_id,
             "duty": '/'.join([i["roleName"] for i in user_roles])
         } )
-
+    """
+    user_list_dict = []
+    query = db.query(AvconDevice).filter(AvconDevice.group_id == dept_id)
+    query = query.filter(AvconDevice.dev_type == '001')
+    # query = query.filter(AvconDevice.status == 1) # 上线状态
+    query = query.order_by(AvconDevice.group_id.asc(), AvconDevice.dev_id.asc())
+    rows = query.all()
+    for row in rows:
+        user_list_dict.append({
+            "id": row.dev_id,
+            "dept": get_avcon_type_text(row.dev_type),
+            "name": row.dev_name,
+            "mobile": row.dev_id
+        })
 
     return {
         "code": 200,