修改--task实体类添加taskName字段
This commit is contained in:
parent
88a756a7cf
commit
1666d6f66a
@ -542,9 +542,10 @@ class CRUDEvent(CRUDBase[Event, EventUpdate, EventUpdate]):
|
||||
select(Task).where(Task.robotId == robotId)
|
||||
)
|
||||
result = await db.execute(query_stmt)
|
||||
result = result.mappings().all()
|
||||
result = result.scalars().all()
|
||||
return result
|
||||
# print(result)
|
||||
return [Task(**t) for t in result]
|
||||
# return [Task(**t) for t in result]
|
||||
except Exception as e:
|
||||
print(f"{e}")
|
||||
async def get_messages_st(
|
||||
|
||||
@ -250,6 +250,7 @@ class Task(Base):
|
||||
robotId = Column(String(100), primary_key=True, comment='机器人ID')
|
||||
robotNumber = Column(String(50), comment='机器人编号')
|
||||
routeNumber = Column(String(50), comment='路线编号')
|
||||
taskName = Column(String(20), comment="任务名称")
|
||||
routeId = Column(String(100), comment='路线ID')
|
||||
coordId = Column(String(100), comment='坐标ID')
|
||||
camera = Column(String(100), comment='摄像头信息')
|
||||
@ -283,5 +284,6 @@ class Task(Base):
|
||||
__table_args__ = (
|
||||
{'comment': '机器人任务表'},
|
||||
)
|
||||
|
||||
|
||||
|
||||
@ -217,4 +217,8 @@ class AllMessageDto(BaseModel):
|
||||
handle: Optional[str] = None
|
||||
remark: Optional[str] = None
|
||||
createTime: Optional[datetime] = None
|
||||
|
||||
|
||||
class TaskListDto(BaseModel):
|
||||
robotId : str
|
||||
|
||||
@ -50,6 +50,7 @@ class RobotSyncService:
|
||||
for k, v in task.items():
|
||||
if hasattr(t, k):
|
||||
setattr(t, k, v)
|
||||
t.taskName="巡检"
|
||||
await db.flush()
|
||||
await db.commit()
|
||||
except Exception as e:
|
||||
|
||||
@ -23,3 +23,4 @@
|
||||
- 添加 /events/getAllAlertMessage/{number} 接口, 查看全部--获取所有输入该机器人的所有告警消息.
|
||||
- 修改 /events/messagesHandled, /api/v1/events/messagesUnhandled, 添加可选的查询参数 etypeName
|
||||
- 添加 /events/getEtypeNameList 接口, 获取事件类型下拉框
|
||||
- task实体类添加 taskName字段
|
||||
|
||||
Loading…
Reference in New Issue
Block a user