From 40408073a234dc2bdd917ff7f1fe4d2edf001032 Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期三, 18 十二月 2024 14:10:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/models/knowledge_model.py | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/app/models/knowledge_model.py b/app/models/knowledge_model.py
index 1990e6e..30aca5d 100644
--- a/app/models/knowledge_model.py
+++ b/app/models/knowledge_model.py
@@ -9,19 +9,21 @@
from app.models.base_model import Base
class KnowledgeModel(Base):
- __tablename__ = 'knowledgebase'
+ __tablename__ = 'knowledgebases'
__mapper_args__ = {
# "order_by": 'SEQ'
}
- id = Column(String(32), primary_key=True) # id
+ id = Column(String(36), primary_key=True) # id
name = Column(String(128)) # 鍚嶇О
- create_date = Column(DateTime) # 鍒涘缓鏃堕棿
- update_date = Column(DateTime) # 鏇存柊鏃堕棿
- avatar = Column(Text) # 鍥炬爣
+ create_date = Column(DateTime, default=datetime.now()) # 鍒涘缓鏃堕棿
+ update_date = Column(DateTime, default=datetime.now(), onupdate=datetime.now()) # 鏇存柊鏃堕棿
+ permission = Column(String(32), default="me")
tenant_id = Column(String(32)) # 鍒涘缓浜篿d
description = Column(Text) # 璇存槑
status = Column(String(1)) # 鐘舵��
- # kld_type = Column(String(1)) # 鐭ヨ瘑搴撳钩鍙�
+ documents = Column(Integer, default=0) # 鏂囨。
+ icon = Column(String(128)) # 鏂囨。
+ knowledge_type = Column(String(1)) # 鐭ヨ瘑搴撳钩鍙�
def get_id(self):
@@ -31,17 +33,22 @@
return {
'id': self.id,
'name': self.name,
- 'create_time': self.create_date,
- 'update_time': self.update_date,
- 'avatar': self.avatar,
- 'tenant_id': self.tenant_id,
+ 'create_time': self.create_date.strftime('%Y-%m-%d %H:%M:%S'),
+ 'update_time': self.update_date.strftime('%Y-%m-%d %H:%M:%S'),
+ 'permission': self.permission,
+ 'user_id': self.tenant_id,
'description': self.description,
'status': self.status,
- # 'kld_type': self.kld_type
+ 'documents': self.documents if self.documents else 0,
+ 'icon': self.icon
}
def __repr__(self):
return '<Knowledge name:%r url:%r>\n' % (self.name, self.id)
-class RoleParameter(BaseModel):
- role: str
\ No newline at end of file
+class klgParameter(BaseModel):
+ id: str
+ name: str
+ description: Optional[str] = ""
+ icon: str
+ klgType: str
\ No newline at end of file
--
Gitblit v1.8.0