no message

config.py

@@ -38,7 +38,8 @@ class Settings(BaseSettings):
     REDIS_DB_URL = {
         'host': '127.0.0.1',
         'port': 6379,
-        'password': 'c0b0Info@)!%',
+        'user': 'default',
+        'password': 'c0b0Info',
         'db': 0
     }
 
@@ -108,7 +109,8 @@ class ProdConfig(Settings):
     REDIS_DB_URL = {
         'host': '127.0.0.1',
         'port': 6379,
-        'password': 'c0b0Info@)!%',
+        'user': 'default',
+        'password': 'c0b0Info',
         'db': 0
     }
     
@@ -151,7 +153,8 @@ class StageConfig(Settings):
     REDIS_DB_URL = {
         'host': '127.0.0.1',
         'port': 6379,
-        'password': 'c0b0Info@)!%',
+        'user': 'default',
+        'password': 'c0b0Info',
         'db': 0
     }
 

routers/api/eventManagement/command_system.py

@@ -98,8 +98,12 @@ async def delete_system_dept(
     db.query(CommandSystemUser).filter(and_(CommandSystemUser.event_id == eventId, CommandSystemUser.system_dept_id == deptId, CommandSystemUser.user_category == "temp")).delete()
     db.commit()              
 
+    dept_list_dict = get_dept_list_by_event_id(db, eventId)
+
     return {
         "code": 200,
+        "data": dept_list_dict,
+
         "msg": "操作成功"
     }
 
@@ -154,98 +158,100 @@ async def get_system_user_list(
     user_id = Depends(valid_access_token)
 ):
     try:
+        user_list = selected_user_list = []
         row = db.query(CommandSystemDept).filter(CommandSystemDept.id == int(deptId)).first()
-        systemDeptId = row.id
-        deptCategory = row.dept_category
-        deptId = row.dept_id
-
-        if deptCategory == '0':
-            # 虚拟部门，总指挥或者副总指挥，其他部门已被tree下来忽略
-            query = db.query(CommandSystemUser)
-            query = query.filter(and_(CommandSystemUser.event_id == eventId, CommandSystemUser.system_dept_id == deptId))
-            if nickName:
-                query =query.filter(CommandSystemUser.nick_name.like(f'%{nickName}%'))
-
-            user_list = []
-            users = query.all()
-            for user in users:
-                user_info = {
-                    "id": user.id,
-                    "userId": user.user_id,
-                    "systemDeptId": user.system_dept_id,
-                    "deptId": user.dept_id,
-                    "deptName": user.dept_name,
-                    "userName": user.user_name,
-                    "nickName": user.nick_name,
-                    "position": user.position
-                }
-                user_list.append(user_info)
-            # 返回结果
-            return {
-                "code": 200,
-                "msg": "成功用户列表",
-                "rows": user_list,
-                "selected_rows": user_list
-            }
-        else:
-            # 真实部门
-            # 查询部门用户
-            def get_dept_chli(dept_list : list,parent_id : int):
-                depts = parent_id_get_dept_info(db,parent_id)
-                if depts:
-                    for dept in depts:
-                        dept_list.append(dept.dept_id)
-                        get_dept_chli(dept_list, dept.dept_id)
-                return dept_list
-
-            query = db.query(SysUser).filter(and_(SysUser.status == 0))
-            query = query.filter(SysUser.dept_id.in_(get_dept_chli([deptId],deptId)))
-            query = query.order_by(SysUser.create_time.desc())
-            users = query.all()
-
-            user_list = []
-            for user in users:
-                user_info = {
-                    "userId": user.user_id,
-                    "deptId": user.dept_id,
-                    "deptName": user.dept_name,
-                    "userName": mpfun.dec_data(user.user_name),
-                    "nickName": user.nick_name,
-                    "systemDeptId": systemDeptId,
-                    "position": ""
-                }
-                user_list.append(user_info)
-
-            # 查询已勾选用户
-            query = db.query(CommandSystemUser)
-            query = query.filter(CommandSystemUser.system_dept_id == systemDeptId)
-            if nickName:
-                query =query.filter(CommandSystemUser.nick_name.like(f'%{nickName}%'))
-
-            users = query.all()
-            
-            # 将查询结果转换为列表形式的字典
-            selected_user_list = []
-            for user in users:
-                user_info = {
-                    "id": user.id,
-                    "userId": user.user_id,
-                    "systemDeptId": user.system_dept_id,
-                    "deptId": user.dept_id,
-                    "deptName": user.dept_name,
-                    "userName": user.user_name,
-                    "nickName": user.nick_name,
-                    "position": user.position
+        if row is not None:
+            systemDeptId = row.id
+            deptCategory = row.dept_category
+            deptId = row.dept_id
+
+            if deptCategory == '0':
+                # 虚拟部门，总指挥或者副总指挥，其他部门已被tree下来忽略
+                query = db.query(CommandSystemUser)
+                query = query.filter(and_(CommandSystemUser.event_id == eventId, CommandSystemUser.system_dept_id == deptId))
+                if nickName:
+                    query =query.filter(CommandSystemUser.nick_name.like(f'%{nickName}%'))
+
+                user_list = []
+                users = query.all()
+                for user in users:
+                    user_info = {
+                        "id": user.id,
+                        "userId": user.user_id,
+                        "systemDeptId": user.system_dept_id,
+                        "deptId": user.dept_id,
+                        "deptName": user.dept_name,
+                        "userName": user.user_name,
+                        "nickName": user.nick_name,
+                        "position": user.position
+                    }
+                    user_list.append(user_info)
+                # 返回结果
+                return {
+                    "code": 200,
+                    "msg": "成功用户列表",
+                    "rows": user_list,
+                    "selected_rows": user_list
                 }
-                selected_user_list.append(user_info)
-
-            # 返回结果
-            return {
-                "code": 200,
-                "msg": "成功用户列表",
-                "rows": user_list,
-                "selected_rows": selected_user_list
-            }
+            else:
+                # 真实部门
+                # 查询部门用户
+                def get_dept_chli(dept_list : list,parent_id : int):
+                    depts = parent_id_get_dept_info(db,parent_id)
+                    if depts:
+                        for dept in depts:
+                            dept_list.append(dept.dept_id)
+                            get_dept_chli(dept_list, dept.dept_id)
+                    return dept_list
+
+                query = db.query(SysUser).filter(and_(SysUser.status == 0))
+                query = query.filter(SysUser.dept_id.in_(get_dept_chli([deptId],deptId)))
+                query = query.order_by(SysUser.create_time.desc())
+                users = query.all()
+
+                user_list = []
+                for user in users:
+                    user_info = {
+                        "userId": user.user_id,
+                        "deptId": user.dept_id,
+                        "deptName": user.dept_name,
+                        "userName": mpfun.dec_data(user.user_name),
+                        "nickName": user.nick_name,
+                        "systemDeptId": systemDeptId,
+                        "position": ""
+                    }
+                    user_list.append(user_info)
+
+                # 查询已勾选用户
+                query = db.query(CommandSystemUser)
+                query = query.filter(CommandSystemUser.system_dept_id == systemDeptId)
+                if nickName:
+                    query =query.filter(CommandSystemUser.nick_name.like(f'%{nickName}%'))
+
+                users = query.all()
+                
+                # 将查询结果转换为列表形式的字典
+                selected_user_list = []
+                for user in users:
+                    user_info = {
+                        "id": user.id,
+                        "userId": user.user_id,
+                        "systemDeptId": user.system_dept_id,
+                        "deptId": user.dept_id,
+                        "deptName": user.dept_name,
+                        "userName": user.user_name,
+                        "nickName": user.nick_name,
+                        "position": user.position
+                    }
+                    selected_user_list.append(user_info)
+
+        # 返回结果
+        return {
+            "code": 200,
+            "msg": "成功用户列表",
+            "rows": user_list,
+            "selected_rows": selected_user_list
+        }
 
 
     except Exception as e:
@@ -292,7 +298,7 @@ async def get_list(request: Request,
         deptName = node['deptName']
         
         # 只能是部门才可以加上去
-        if deptName.find("局") != -1 :
+        if deptName.find("局") != -1 or deptName.find("中心") != -1 :
             ok_nodes.append(node)
 
     if len(ok_nodes) > 0:

utils/redis_util.py

@@ -6,7 +6,7 @@ import json
 import time
 
 def get_redis():
-    redis = StrictRedis(host=settings.REDIS_DB_URL['host'], port=settings.REDIS_DB_URL['port'], db=settings.REDIS_DB_URL['db'], password=settings.REDIS_DB_URL['password'])
+    redis = StrictRedis(host=settings.REDIS_DB_URL['host'], port=settings.REDIS_DB_URL['port'], username=settings.REDIS_DB_URL['user'], db=settings.REDIS_DB_URL['db'], password=settings.REDIS_DB_URL['password'])
     return redis
 
 def redis_set(name: str, val: str):
@@ -49,3 +49,24 @@ def redis_get_json(name: str):
     if json_str is not None:
         return json.loads(json_str)
 
+
+if __name__ == '__main__':
+    try:
+        # 连接 Redis（指定 username 和 password）
+        r = StrictRedis(
+            host='localhost',
+            port=6379,
+            username='default',  # Redis 6.0+ 支持
+            password='c0b0Info'
+        )
+        
+        # 测试连接
+        r.ping()
+        print("✅ 连接成功！")
+        
+        # 执行一些操作
+        r.set('test_key', 'hello')
+        print("test_key:", r.get('test_key').decode('utf-8'))
+        
+    except Exception as e:
+        print(f"❌ 连接失败: {e}")