From fa7bbd77cc161a3c91742adc910d8c5ccc8e3459 Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期三, 23 十月 2024 21:14:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/api/excel.py | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/app/api/excel.py b/app/api/excel.py
index e8d2bdd..ef46fe3 100644
--- a/app/api/excel.py
+++ b/app/api/excel.py
@@ -56,8 +56,7 @@
if file.filename == '':
return JSONResponse(content={"error": "娌℃湁閫夋嫨鏂囦欢"}, status_code=400)
if file and allowed_file(file.filename):
- filename = secure_filename(file.filename)
- save_path = os.path.join(SOURCE_FILES_PATH, filename)
+ save_path = os.path.join(SOURCE_FILES_PATH, file.filename)
with open(save_path, 'wb') as buffer:
shutil.copyfileobj(file.file, buffer)
save_path_list.append(save_path)
@@ -79,17 +78,37 @@
while True:
data = await websocket.receive_text()
try:
- if data == "鍚堝苟Excel鏂囦欢":
+ if data == "\"鍚堝苟Excel\"":
clear_directory(EXCEL_FILES_PATH)
output_file_path = run_conformity()
- await websocket.send_json({"step_message": "寮�濮嬪悎骞�", "type": "stream", "files": []})
- elif data == "鏌ヨ鍚堝苟杩涘害":
+ clear_directory(EXCEL_FILES_PATH)
+ output_file_path = run_conformity()
+ files = os.listdir(EXCEL_FILES_PATH)
+ if files:
+ first_file = files[0]
+ file_name = os.path.basename(first_file)
+ file_url = f"./api/document/download/{first_file}"
+ await websocket.send_json({
+ "message": "鏂囨。鍚堝苟鎴愬姛锛�",
+ "type": "stream",
+ "files": [{
+ "file_name": file_name,
+ "file_url": file_url
+ }]
+ })
+ await websocket.send_json({
+ "message": "鏂囨。鍚堝苟鎴愬姛锛�",
+ "type": "close",
+ })
+ else:
+ await websocket.send_json({"error": "鍚堝苟鎿嶄綔鏈敓鎴愭枃浠�", "type": "stream", "files": []})
+ elif data == "\"鏌ヨ鍚堝苟杩涘害\"":
files = os.listdir(EXCEL_FILES_PATH)
if not files:
await websocket.send_json({"step_message": "姝ｅ湪鍚堝苟涓�", "type": "stream", "files": []})
else:
await websocket.send_json({"step_message": "鏂囨。鍚堝苟鎴愬姛锛�", "type": "stream", "files": []})
- elif data == "鑾峰彇鏂囦欢":
+ elif data == "\"鑾峰彇鏂囦欢\"":
files = os.listdir(EXCEL_FILES_PATH)
if not files:
await websocket.send_json({"error": "鐩綍涓嬫病鏈夌敓鎴愮殑鏂囦欢", "type": "stream", "files": []})
@@ -106,9 +125,11 @@
}]
})
else:
- await websocket.send_json({"error": "鏈煡鎸囦护"})
+ print(f"Received data: {data}")
+ await websocket.send_json({"error": "鏈煡鎸囦护", "data": str(data)})
except Exception as e:
await websocket.send_json({"error": str(e)})
+ await websocket.close()
@router.get("/download/{filename}")
--
Gitblit v1.8.0