修改--查看告警消息详情, 添加返回参数Temperature

app/api/v1/endpoints/events.py

@@ -322,9 +322,10 @@ async def get_alert_detail(
     return BaseResponse(code=200, msg="success", data=alert_message[0])
 
 # 前端查看告警详情
-@router.get("/events/alertFront/{messageId}", response_model=BaseResponse[CommonAlertMessage])
+@router.get("/events/alertFront/{messageId}", response_model=BaseResponse[OcrAlertMessage])
 async def get_alert_front_detail(
     messageId:int,
+    # number: Optional[str] = None,
     db: AsyncSession = Depends(get_db),
 ):
     

app/crud/event.py

@@ -241,16 +241,18 @@ class CRUDEvent(CRUDBase[Event, EventUpdate, EventUpdate]):
         skip:int,
         limit:int,
         condition: list = []
-    ) -> Optional[List[CommonAlertMessage]]:
+    ) -> Optional[List[OcrAlertMessage]]:
         query_stmt = (
             select(Message.messageId,Message.eventId ,Message.messageType, Message.eventType, Message.handle, Message.remark, Message.createTime,
                    Event.number,Event.name,
                 #    Image.imageUrl, Image.localPath,
-                   RobotInfo.flvPtz, RobotInfo.flvTherm, RobotInfo.flvThermLight)
+                   RobotInfo.flvPtz, RobotInfo.flvTherm, RobotInfo.flvThermLight,
+                   Temperature.temperature)
             .select_from(Message)
             .outerjoin(Event, Message.eventId == Event.eventId)
             # .outerjoin(Image, Message.eventId == Image.eventId)
             .outerjoin(RobotInfo, RobotInfo.number == Event.number)
+            .outerjoin(Temperature, Message.eventId == Temperature.eventId)
             .where(*condition)
             .order_by(Message.createTime.desc())
             .offset(skip)

change_log.md

@@ -11,3 +11,4 @@
 - 修改event_sync_service.py 批量同步数据时,添加插入message消息
 - 修改/events/handleOcrAlerts, 添加可选的查询参数number
 - 修改/events/handleOcrAlert接口, 添加json参数number指定机器人.
+- 修改查看告警消息详情, 添加返回参数Temperature.