From e9214fc631ff7e40aa1827bbbb96cf0ed85d3a5e Mon Sep 17 00:00:00 2001
From: haotian <2421912570@qq.com>
Date: Fri, 6 Jun 2025 15:47:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9--=E5=A4=84=E7=90=86=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AA=E5=91=8A=E8=AD=A6=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8F=AF=E9=80=89=E7=9A=84json=E5=8F=82=E6=95=B0number?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/crud/event.py    | 33 +++++++++++++++++++++++----------
 app/schemas/event.py |  1 +
 change_log.md        | 13 +++++++++++++
 3 files changed, 37 insertions(+), 10 deletions(-)
 create mode 100644 change_log.md

diff --git a/app/crud/event.py b/app/crud/event.py
index 0837a0d..58e2285 100644
--- a/app/crud/event.py
+++ b/app/crud/event.py
@@ -367,18 +367,31 @@ class CRUDEvent(CRUDBase[Event, EventUpdate, EventUpdate]):
     async def handle_ocr_alert(
         self, 
         db: AsyncSession,
-        ocrAlertMessageDto: OcrAlertMessageDto
+        ocrAlertMessageDto: OcrAlertMessageDto,
         ):
         try:
-            update_stmt = (
-                update(Message)
-                .where(Message.messageId == ocrAlertMessageDto.messageId)
-                .values(
-                    handle = "1",
-                    remark = ocrAlertMessageDto.remark,
-                    updateTime=datetime.now()
-                    )
-            )
+            if ocrAlertMessageDto.number and len(ocrAlertMessageDto.number) > 0:
+                update_stmt = (
+                    update(Message)
+                    .where(Message.eventId == Event.eventId)
+                    .where(Event.number == ocrAlertMessageDto.number)
+                    .where(Message.messageId == ocrAlertMessageDto.messageId)
+                    .values(
+                        handle = "1",
+                        remark = ocrAlertMessageDto.remark,
+                        updateTime=datetime.now()
+                        )
+                )
+            else:
+                update_stmt = (
+                    update(Message)
+                    .where(Message.messageId == ocrAlertMessageDto.messageId)
+                    .values(
+                        handle = "1",
+                        remark = ocrAlertMessageDto.remark,
+                        updateTime=datetime.now()
+                        )
+                )
             await db.execute(update_stmt)
             await db.commit()
             return True
diff --git a/app/schemas/event.py b/app/schemas/event.py
index 5800b2f..14a7b2d 100644
--- a/app/schemas/event.py
+++ b/app/schemas/event.py
@@ -198,6 +198,7 @@ class OcrAlertMessage(CommonAlertMessage):
 class OcrAlertMessageDto(BaseModel):
     messageId: int 
     remark: Optional[str] = None 
+    number: Optional[str] = None
     
 
 
diff --git a/change_log.md b/change_log.md
new file mode 100644
index 0000000..d627ed8
--- /dev/null
+++ b/change_log.md
@@ -0,0 +1,13 @@
+# target
+
+- 实现机器人页告警列表接口
+
+# 20250606
+
+- 修改/events/messagesHandled 接口, 添加可选的查询参数number.
+- 修改/events/messagesUnhandled 接口, 添加可选的查询参数number
+- 修改/events/alertCount 接口, 添加可选的查询参数number
+- 添加/alertFront/{messageId} 接口, 前端获取告警消息详情
+- 修改event_sync_service.py 批量同步数据时,添加插入message消息
+- 修改/events/handleOcrAlerts, 添加可选的查询参数number
+- 修改/events/handleOcrAlert接口, 添加json参数number指定机器人.