From 057f034d4cd728c1bd0284e7c6b4a47739d5220d Mon Sep 17 00:00:00 2001 From: zhaoqingang <zhaoqg0118@163.com> Date: 星期四, 12 十二月 2024 19:57:41 +0800 Subject: [PATCH] yonghu --- app/models/dialog_model.py | 37 ++++++++++++++++++++++++++++--------- 1 files changed, 28 insertions(+), 9 deletions(-) diff --git a/app/models/dialog_model.py b/app/models/dialog_model.py index 7a1848a..1934388 100644 --- a/app/models/dialog_model.py +++ b/app/models/dialog_model.py @@ -1,5 +1,7 @@ from datetime import datetime +from typing import Optional +from pydantic import BaseModel from sqlalchemy import Column, Integer, String, BigInteger, ForeignKey, DateTime, Text, JSON from sqlalchemy.orm import relationship, backref @@ -11,14 +13,15 @@ # "order_by": 'SEQ' } id = Column(String(32), primary_key=True) # id - create_date = Column(DateTime) # 鍒涘缓鏃堕棿 - update_date = Column(DateTime) # 鏇存柊鏃堕棿 + create_date = Column(DateTime, default=datetime.now()) # 鍒涘缓鏃堕棿 + update_date = Column(DateTime, default=datetime.now(), onupdate=datetime.now()) # 鏇存柊鏃堕棿 tenant_id = Column(String(32)) # 鍒涘缓浜� name = Column(String(255)) # 鍚嶇О description = Column(Text) # 璇存槑 icon = Column(Text) # 鍥炬爣 - status = Column(String(1)) # 鐘舵�� - # dialog_type = Column(String(1)) # # 骞冲彴 + status = Column(String(1), default="1") # 鐘舵�� + dialog_type = Column(String(1)) # # 骞冲彴 + agent_id = Column(String(32)) def get_id(self): return str(self.id) @@ -26,13 +29,15 @@ def to_json(self): return { 'id': self.id, - 'create_date': self.create_date, - 'update_date': self.update_date, - 'tenant_id': self.tenant_id, + 'create_date': self.create_date.strftime('%Y-%m-%d %H:%M:%S'), + 'update_date': self.update_date.strftime('%Y-%m-%d %H:%M:%S'), + 'user_id': self.tenant_id, 'name': self.name, 'description': self.description, 'icon': self.icon, - 'status': self.status + 'status': self.status, + 'agentType': self.dialog_type, + 'agentId': self.agent_id, } @@ -57,5 +62,19 @@ return { 'id': self.id, 'updated_time': self.update_time, + 'update_date': datetime.fromtimestamp(self.update_time / 1000.0).strftime('%Y-%m-%d %H:%M:%S'), 'name': self.name, - } \ No newline at end of file + } + + +class dialogData(BaseModel): + id: str + name: str + description: Optional[str] = "" + dialogType: str + icon: str + + +class dialogDataUpdate(BaseModel): + id: str + status: Optional[str] = "1" \ No newline at end of file -- Gitblit v1.8.0