refactor: switch upload to new POST /api/upload with flat FormData

Replace the old nested upload_info JSON approach with flat
multipart fields (typeId, region, fileRole, createdBy, autoRun,
speed) matching the new leaudit-platform backend.

- uploadDocumentToServer: POST ${API_BASE_URL}/api/upload
- handleFileUpload: pass region from userInfo.area, derive speed
  from priority enum, pass createdBy from JWT user_id
- UploadResult replaces FileUploadResponse with documentId/fileId
  replacing the old nested result.id/result.file_name pattern
This commit is contained in:
wren
2026-04-30 12:16:24 +08:00
parent 185f55cec6
commit 73fd8617e1
2 changed files with 139 additions and 228 deletions
+51 -109
View File
@@ -21,7 +21,7 @@ import {
checkDocumentDuplicate,
type Document,
type DocumentType,
type FileUploadResponse,
type UploadResult,
DocumentStatus
} from "~/api/files/files-upload";
import { updateDocumentAuditStatus } from "~/api/evaluation_points/rules-files";
@@ -126,52 +126,30 @@ async function handleFileUpload(
fileType: string,
documentType: FileType,
priority: Priority,
documentNumber: string | null,
remark: string | null,
isTestDocument: boolean,
documentId?: number | null,
isReupload: boolean = false,
region: string,
createdBy?: number,
jwtToken?: string,
attachments?: File[],
attributeType?: string
): Promise<FileUploadResponse> {
// console.log('【handleFileUpload】开始上传:', {
// fileName,
// fileSize: binaryData.byteLength,
// documentType,
// hasAttachments: !!(attachments && attachments.length > 0),
// attachmentCount: attachments?.length || 0
// });
): Promise<UploadResult> {
const speed = priority === Priority.NORMAL ? "normal" : "urgent";
const response = await uploadDocumentToServer(
binaryData,
fileName,
fileType,
documentType,
priority,
documentNumber,
remark,
isTestDocument,
documentId,
isReupload,
Number(documentType),
region,
createdBy,
true,
speed,
jwtToken,
attachments,
attributeType
);
// console.log('【handleFileUpload】uploadDocumentToServer返回:', {
// hasError: !!response.error,
// hasData: !!response.data,
// error: response.error,
// dataKeys: response.data ? Object.keys(response.data) : []
// });
if (response.error || !response.data) {
console.error('【handleFileUpload】上传失败:', response.error);
throw new Error(response.error || '上传失败');
if ("error" in response || !response.data) {
const errMsg = "error" in response ? response.error : "上传响应为空";
console.error("上传失败:", errMsg);
throw new Error(errMsg || "上传失败");
}
// console.log('【handleFileUpload】返回数据:', response.data);
return response.data;
}
@@ -1184,39 +1162,20 @@ export default function FilesUpload() {
// 转二进制
const binaryData = await uploadFileToBinary(mainFile);
// 首传:将附件通过 attachments 一起带上
// 首传
const region = (loaderData.userInfo?.area as string) || "default";
const createdBy = loaderData.userInfo?.user_id as number | undefined;
const uploadResp = await handleFileUpload(
binaryData,
mainFile.name,
mainFile.type,
fileType as FileType,
priority,
documentNumber || null,
remark || null,
isTestDocument,
null,
false,
loaderData.frontendJWT || undefined,
attachmentFiles,
attributeType
binaryData, mainFile.name, mainFile.type,
fileType as FileType, priority,
region, createdBy, loaderData.frontendJWT || undefined,
);
// console.log('【合同上传】服务器响应数据:', uploadResp);
// console.log('【合同上传】响应详情:', {
// success: uploadResp.success,
// hasResult: !!uploadResp.result,
// error: uploadResp.error,
// fullResponse: JSON.stringify(uploadResp)
// });
if (!uploadResp.success) {
throw new Error(uploadResp.error || '上传失败,服务器返回success=false');
throw new Error(uploadResp.error || "上传失败");
}
if (!uploadResp.result) {
throw new Error('主文件上传失败:服务器未返回文档信息');
}
const documentId = uploadResp.result.id;
const documentId = uploadResp.documentId;
// 可选:模板上传
if (templateFiles && templateFiles.length > 0) {
@@ -1240,14 +1199,13 @@ export default function FilesUpload() {
setUploadProgress(100);
setUploadSpeed('完成');
toastService.success('上传成功');
toastService.success("上传成功");
// 构造已上传文件并进入处理流程(保持与旧逻辑一致,点亮步骤条)
const uploadedFiles: UploadedFile[] = [
{
id: uploadResp.result.id,
name: uploadResp.result.file_name,
size: uploadResp.result.file_size,
id: uploadResp.documentId,
name: uploadResp.fileName,
size: uploadResp.fileSize,
type: mainFile.type,
fileType: fileType as FileType,
priority,
@@ -1499,15 +1457,10 @@ export default function FilesUpload() {
throw new Error(`文件 ${file.name} 转换失败: ${binaryError instanceof Error ? binaryError.message : '未知错误'}`);
}
let response: FileUploadResponse;
// console.log(`【调试-startUpload】开始上传文件 ${file.name} 到服务器,文件类型: ${fileType}`);
let response: UploadResult;
try {
// 上传文件
// 检查组件是否已卸载
if (!isMountedRef.current) {
console.error('【调试-startUpload】组件已卸载,取消上传');
return { success: false, error: '组件已卸载' } as FileUploadResponse;
return { success: false, error: "组件已卸载", documentId: 0, fileId: 0, fileName: "", fileSize: 0, typeId: 0, region: "", processingStatus: "", duplicateUpload: false } as UploadResult;
}
// console.log(`【调试-startUpload】准备上传文件 ${file.name} 到服务器`);
@@ -1544,26 +1497,18 @@ export default function FilesUpload() {
});
// 使用Promise.race添加超时处理
const region = (loaderData.userInfo?.area as string) || "default";
const createdBy = loaderData.userInfo?.user_id as number | undefined;
const uploadPromise = handleFileUpload(
binaryData,
file.name,
file.type,
fileType as FileType,
priority,
documentNumber || null,
remark || null,
isTestDocument,
temp_n > 1 ? firstFileDocumentId : null, // 第二个文件及以后使用第一个文件的document_id
false,
loaderData.frontendJWT || undefined,
undefined,
attributeType
binaryData, file.name, file.type,
fileType as FileType, priority,
region, createdBy, loaderData.frontendJWT || undefined,
);
const timeoutPromise = new Promise<FileUploadResponse>((_, reject) => {
const timeoutPromise = new Promise<UploadResult>((_, reject) => {
setTimeout(() => {
reject(new Error('上传超时'));
}, 600000); // 10分钟超时
reject(new Error("上传超时"));
}, 600000);
});
// 并行执行上传和进度更新
@@ -1584,16 +1529,15 @@ export default function FilesUpload() {
}
// 检查上传结果
if (!uploadResult.success || !uploadResult.result) {
throw new Error(uploadResult.error || '上传失败');
if (!uploadResult.success) {
throw new Error(uploadResult.error || "上传失败");
}
response = uploadResult;
// 保存第一个文件的document_id,用于后续附件上传
if (temp_n === 1 && response.result?.id) {
firstFileDocumentId = response.result.id;
console.log('【调试-startUpload】保存第一个文件的document_id:', firstFileDocumentId);
// 保存第一个文件的 documentId
if (temp_n === 1 && response.documentId) {
firstFileDocumentId = response.documentId;
}
// console.log(`【调试-startUpload】文件 ${file.name} 上传响应:`, response);
@@ -1608,19 +1552,17 @@ export default function FilesUpload() {
throw new Error(`文件 ${file.name} 上传失败: ${error instanceof Error ? error.message : '未知错误'}`);
}
if (!response.success || !response.result) {
console.error(`【调试-startUpload】文件 ${file.name} 上传失败:`, response.error);
if (!response.success) {
console.error(`上传文件 ${file.name} 失败:`, response.error);
throw new Error(response.error || `文件 ${file.name} 上传失败`);
}
// 更新已上传大小
uploadedSize += file.size;
// 创建新的文件对象
const newFile: UploadedFile = {
id: response.result.id,
name: response.result.file_name,
size: response.result.file_size,
id: response.documentId,
name: response.fileName,
size: response.fileSize,
type: file.type,
fileType: fileType as FileType,
priority,