新增挪车功能

routes/admin.py

@@ -80,17 +80,19 @@ async def get_items(
             items = results
         item = []
         for i in items:
+            print(i)
             item.append(Item(
                 id=i[0],
-                key=i[1],
-                name=i[2],
-                icon=i[3],
-                status=i[4],
-                phone=i[5],
-                lost_description=i[6],
-                find_ip=i[7],
-                create_time=i[8],
-                lost_time=i[9]
+                type=i[1],
+                key=i[2],
+                name=i[3],
+                icon=i[4],
+                status=i[5],
+                phone=i[6],
+                lost_description=i[7],
+                find_ip=i[8],
+                create_time=i[9],
+                lost_time=i[10]
             ))
         return DefaultResponse(data=item)
     else:
@@ -105,13 +107,16 @@ async def get_items(
 )
 async def add_items(
     key: str,
+    type: Literal['normal', 'car'],
     name: str,
     icon: str,
-    phone: str) -> DefaultResponse:
+    phone: str
+) -> DefaultResponse:
     '''
     添加物品信息。
     
     - **key**: 物品的关键字
+    - **type**: 物品的类型
     - **name**: 物品的名称
     - **icon**: 物品的图标
     - **phone**: 联系电话
@@ -119,7 +124,12 @@ async def add_items(
     
     try:
         await database.Database().add_object(
-            key=key, name=name, icon=icon, phone=phone)
+            key=key, 
+            type=type,
+            name=name, 
+            icon=icon, 
+            phone=phone
+        )
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))
     else:

routes/object.py

@@ -4,6 +4,7 @@ from fastapi.responses import JSONResponse
 from model.database import Database
 from model.response import DefaultResponse, ObjectData
 import asyncio
+import aiohttp
 
 Router = APIRouter(prefix='/api/object', tags=['物品 Object'])
 
@@ -24,23 +25,25 @@ async def get_object(item_key: str, request: Request):
     object_data = await db.get_object(key=item_key)
     
     if object_data:
-        if object_data[4] == 'lost':
+        if object_data[5] == 'lost':
             # 物品已标记为丢失，更新IP地址
             await db.update_object(id=object_data[0], find_ip=str(request.client.host))
             
-            # 添加一些随机延迟，类似JWT身份验证时根据延迟爆破引发的问题
-            await asyncio.sleep(random.uniform(0.10, 0.30))
-        else:
-            await asyncio.sleep(random.uniform(0.10, 0.30))
+        # 添加一些随机延迟，类似JWT身份验证时根据延迟爆破引发的问题
+        await asyncio.sleep(random.uniform(0.10, 0.30))
         
+        print(object_data)
         return DefaultResponse(data=ObjectData(
             id=object_data[0],
-            key=object_data[1],
-            name=object_data[2],
-            icon=object_data[3],
-            status=object_data[4],
-            phone=object_data[5],
-            context=object_data[6]
+            type=object_data[1],
+            key=object_data[2],
+            name=object_data[3],
+            icon=object_data[4],
+            status=object_data[5],
+            phone=object_data[6],
+            lost_description=object_data[7],
+            create_time=object_data[9],
+            lost_time=object_data[10]
         ).model_dump())
     else: return JSONResponse(
         status_code=404,
@@ -48,4 +51,91 @@ async def get_object(item_key: str, request: Request):
             code=404,
             msg='物品不存在或出现异常'
         ).model_dump()
-    )
+    )
+
+@Router.put(
+    path='/{item_id}',
+    summary="通知车主进行挪车",
+    description="向车主发送挪车通知",
+    response_model=DefaultResponse,
+    response_description="挪车通知结果"
+)
+async def notify_move_car(
+    item_id: int,
+    phone: str = None,
+):
+    """通知车主进行挪车 / Notify car owner to move the car
+
+    Args:
+        item_id (int): 物品ID / Item ID
+        phone (str, optional): 挪车发起者电话 / Phone number of the person initiating the move. Defaults to None.
+    """
+    db = Database()
+    await db.init_db()
+    
+    # 检查是否存在该物品
+    object_data = await db.get_object(id=item_id)
+    if not object_data:
+        return JSONResponse(
+            status_code=404,
+            content=DefaultResponse(
+                code=404,
+                msg='物品不存在或出现异常'
+            ).model_dump()
+        )
+    
+    # 检查物品类型是否为车辆
+    if object_data[1] != 'car':
+        return JSONResponse(
+            status_code=400,
+            content=DefaultResponse(
+                code=400,
+                msg='该物品不是车辆，无法发送挪车通知'
+            ).model_dump()
+        )
+    
+    # 发起挪车通知（目前仅适配Server酱）
+    server_chan_key = await db.get_setting('server_chan_key')
+    if not server_chan_key:
+        return JSONResponse(
+            status_code=500,
+            content=DefaultResponse(
+                code=500,
+                msg='未配置Server酱，无法发送挪车通知'
+            ).model_dump()
+        )
+    
+    title = "挪车通知 - Findreve"
+    description = f"您的车辆“{object_data[3]}”被请求挪车。\n\n"
+    if phone:
+        description += f"请求挪车者电话：[{phone}](tel:{phone})\n\n"    
+    description += "请尽快联系请求者并挪车。"
+    
+    async with aiohttp.ClientSession() as session:
+        async with session.post(
+            url=f"https://sctapi.ftqq.com/{server_chan_key}.send",
+            data={
+                "title": title,
+                "desp": description
+            }
+        ) as resp:
+            if resp.status == 200:
+                resp_json = await resp.json()
+                if resp_json.get('code') == 0:
+                    return DefaultResponse(msg='挪车通知发送成功')
+                else:
+                    return JSONResponse(
+                        status_code=500,
+                        content=DefaultResponse(
+                            code=500,
+                            msg=f"挪车通知发送失败，Server酱返回错误：{resp_json.get('message')}"
+                        ).model_dump()
+                    )
+            else:
+                return JSONResponse(
+                    status_code=500,
+                    content=DefaultResponse(
+                        code=500,
+                        msg=f"挪车通知发送失败，HTTP状态码：{resp.status}"
+                    ).model_dump()
+                )