From deaaf771005065d9951a6df4df3e8baade2acca2 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期五, 15 十一月 2024 15:02:18 +0800
Subject: [PATCH] 增加数据同步机制
---
app/models/user_model.py | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/app/models/user_model.py b/app/models/user_model.py
index 8736ba0..2f87e11 100644
--- a/app/models/user_model.py
+++ b/app/models/user_model.py
@@ -28,8 +28,8 @@
phone = Column(String(255), nullable=False, default="")
email = Column(String(255), nullable=False, default="")
description = Column(String(255), nullable=False, default="")
- ragflow_id = Column(String(32), unique=True, index=True)
- bisheng_id = Column(Integer, unique=True, index=True)
+ ragflow_id = Column(String(32))
+ bisheng_id = Column(Integer)
login_name = Column(String(100))
status = Column(String(10), nullable=False, default="1")
creator = Column(String(36))
@@ -112,6 +112,49 @@
json['roles'] = roles
return json
+ def to_login_json(self):
+ json = {
+ 'userId': self.id,
+ 'createTime': self.created_at.strftime('%Y-%m-%d %H:%M:%S') if self.created_at else "",
+ 'updateTime': self.updated_at.strftime('%Y-%m-%d %H:%M:%S') if self.created_at else "",
+ 'userName': self.username,
+ 'loginName': self.login_name,
+ 'sex': self.sex,
+ 'age': self.age,
+ "status": self.status,
+ 'phone': self.phone,
+ 'email': self.email,
+ # 'phoneNumber': self.phone_number
+ }
+ parent_dict = {}
+ children_dict = {}
+ for role in self.roles:
+ for r in role.to_json().get("resources", []):
+ if r["menuType"] != "1":
+ parent_dict[r["menuId"]] = r
+ else:
+ if r["parentId"] in children_dict:
+ children_dict[r["parentId"]].append(r)
+ else:
+ children_dict[r["parentId"]] = [r]
+ organization_roles = [role.to_json() for organization in self.organizations for role in
+ organization.roles]
+ for role in organization_roles:
+ for r in role.to_json().get("resources", []):
+ if r["menuType"] != "1":
+ parent_dict[r["menuId"]] = r
+ else:
+ if r["parentId"] in children_dict:
+ children_dict[r["parentId"]].append(r)
+ else:
+ children_dict[r["parentId"]] = [r]
+ resources = []
+ for resource in parent_dict.values():
+ resource["children"] = children_dict.get(resource["menuId"], [])
+ resources.append(resource)
+ json['resources'] = resources
+ return json
+
def get_children(self):
"""閫掑綊鑾峰彇鎸囧畾鐢ㄦ埛鐨勫瓙鐢ㄦ埛ID鍒楄〃"""
--
Gitblit v1.8.0