瀏覽代碼

241114-3代码。

baoyubo 6 月之前
父節點
當前提交
30d1b0219e
共有 2 個文件被更改,包括 8 次插入5 次删除
  1. 2 2
      routers/api/pattern/__init__.py
  2. 6 3
      routers/api/upload_file/__init__.py

+ 2 - 2
routers/api/pattern/__init__.py

@@ -644,12 +644,12 @@ async def get_pattern_list(
         group_list = pattern_id_get_tp_pattern_ws_group_list(pattern_id,db)
         message = []
         for group in group_list:
-            query = db.query(TpPatternWSList.create_by)
+            query = db.query(TpPatternWSList)
             query = query.filter(TpPatternWSList.del_flag != '2')
             query = query.filter(TpPatternWSList.pattern_id == group.group_id)
             # total_items = query.count()
             # 排序
-            query = query.order_by(TpPatternWSUserList.create_time.desc())
+            query = query.order_by(TpPatternWSList.create_time.desc())
             # 执行分页查询
             patterns = query.all()  # .offset((page - 1) * pageSize).limit(pageSize)
             for info in patterns:

+ 6 - 3
routers/api/upload_file/__init__.py

@@ -60,7 +60,7 @@ async def upload_img(
     print('file_path:', file_path)
 
     return {
-        'code': 0,
+        'code': 200,
         'msg': '上传成功',
         'data': file_name
     }
@@ -96,7 +96,7 @@ async def upload_big_file(        request: Request,
         raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="文件字段缺失")
     if len(chunknumber) == 0 or len(identifier) == 0:
         return {"eroor": "没有传递相关参数"}
-    print(1111)
+    # print(1111)
     task = identifier  # 获取文件唯一标识符
     chunk = chunknumber  # 获取该分片在所有分片中的序号【客户端设定】
     filename = '%s%s' % (task, chunk)  # 构成该分片唯一标识符
@@ -106,7 +106,10 @@ async def upload_big_file(        request: Request,
     contents = await file.read()  # 异步读取文件
     with open(file_dir+f"{filename}", "wb") as f:
         f.write(contents)
-    return {"filename": file.filename}
+    return {
+        'code': 200,
+        'msg': '成功',
+        "filename": file.filename}