-
- 已处理文件
- {{ splitSummary.total }}
-
-
- 成功结果
- {{ splitSummary.successCount }}
-
-
- 失败文件
- {{ splitSummary.failedCount }}
-
+
拆分模式
+
+
+
-
-
@@ -360,8 +354,8 @@ async function downloadSplitResult(item: SplitResultItem) {
}
const filename = item.outputFilename || `${new Date().toISOString().slice(0, 10).replace(/-/g, '')}.zip`
- if (api?.save_file_from_url) {
- const result = await api.save_file_from_url(item.downloadUrl, filename)
+ if (api?.save_file_from_url_new) {
+ const result = await api.save_file_from_url_new(item.downloadUrl, filename)
if (result.success) {
ElMessage.success(`已保存：${result.path || filename}`)
} else if (result.error && result.error !== '用户取消') {
@@ -379,75 +373,516 @@ onMounted(() => {
diff --git a/frontend-vue/src/shared/api/java-modules.ts b/frontend-vue/src/shared/api/java-modules.ts
index 2cffca2..a4a4833 100644
--- a/frontend-vue/src/shared/api/java-modules.ts
+++ b/frontend-vue/src/shared/api/java-modules.ts
@@ -1,461 +1,581 @@
-import { del, get, http, post, put, type JavaApiResponse, unwrapJavaResponse } from '@/shared/api/http'
+import {
+ del,
+ get,
+ http,
+ post,
+ put,
+ type JavaApiResponse,
+ unwrapJavaResponse,
+} from "@/shared/api/http";
-const JAVA_API_PREFIX = '/newApi/api'
+const JAVA_API_PREFIX = "/newApi/api";
function getCurrentUserId() {
- const raw = typeof window === 'undefined' ? '' : window.localStorage.getItem('uid') || ''
- const value = Number(raw)
+ const raw =
+ typeof window === "undefined"
+ ? ""
+ : window.localStorage.getItem("uid") || "";
+ const value = Number(raw);
if (!Number.isFinite(value) || value <= 0) {
- throw new Error('未获取到用户ID')
+ throw new Error("未获取到用户ID");
}
- return value
+ return value;
}
export interface UploadedFileRef {
- fileKey: string
- originalFilename?: string
- relativePath?: string
+ fileKey: string;
+ originalFilename?: string;
+ relativePath?: string;
}
export interface UploadFileVo {
- fileKey: string
- originalFilename: string
- localPath: string
- size: number
- relativePath?: string
+ fileKey: string;
+ originalFilename: string;
+ localPath: string;
+ size: number;
+ relativePath?: string;
}
export interface DedupeResultItem {
- resultId?: number
- sourceFilename: string
- outputFilename?: string
- success: boolean
- error?: string
- downloadUrl?: string
+ resultId?: number;
+ sourceFilename: string;
+ outputFilename?: string;
+ success: boolean;
+ error?: string;
+ downloadUrl?: string;
}
export interface DedupeRunVo {
- total: number
- successCount: number
- failedCount: number
- items: DedupeResultItem[]
+ total: number;
+ successCount: number;
+ failedCount: number;
+ items: DedupeResultItem[];
}
export interface DedupeHistoryVo {
- items: DedupeResultItem[]
+ items: DedupeResultItem[];
}
export interface DedupeRunRequest {
- files: UploadedFileRef[]
- selectedColumns: string[]
- keepIntegerIds: boolean
- keepUnderscoreIds: boolean
- keepIntegerMainIdsWhenNoSubIds: boolean
- archiveName?: string
- user_id: number
+ files: UploadedFileRef[];
+ selectedColumns: string[];
+ keepIntegerIds: boolean;
+ keepUnderscoreIds: boolean;
+ keepIntegerMainIdsWhenNoSubIds: boolean;
+ archiveName?: string;
+ user_id: number;
}
export interface SplitArchiveEntry {
- filename: string
- rowCount?: number
+ filename: string;
+ rowCount?: number;
}
export interface SplitResultItem {
- resultId?: number
- sourceFilename: string
- outputFilename?: string
- success: boolean
- error?: string
- rowCount?: number
- downloadUrl?: string
- entryCount?: number
- entries?: SplitArchiveEntry[]
+ resultId?: number;
+ sourceFilename: string;
+ outputFilename?: string;
+ success: boolean;
+ error?: string;
+ rowCount?: number;
+ downloadUrl?: string;
+ entryCount?: number;
+ entries?: SplitArchiveEntry[];
}
export interface SplitRunVo {
- total: number
- successCount: number
- failedCount: number
- items: SplitResultItem[]
+ total: number;
+ successCount: number;
+ failedCount: number;
+ items: SplitResultItem[];
}
export interface SplitHistoryVo {
- items: SplitResultItem[]
+ items: SplitResultItem[];
}
export interface SplitRunRequest {
- files: UploadedFileRef[]
- selectedColumns: string[]
- splitMode: 'rows_per_file' | 'parts'
- rowsPerFile?: number
- parts?: number
- archiveName?: string
- user_id: number
+ files: UploadedFileRef[];
+ selectedColumns: string[];
+ splitMode: "rows_per_file" | "parts";
+ rowsPerFile?: number;
+ parts?: number;
+ archiveName?: string;
+ user_id: number;
}
export interface ConvertResultItem {
- resultId?: number
- sourceFilename: string
- outputFilename?: string
- success: boolean
- error?: string
- downloadUrl?: string
+ resultId?: number;
+ sourceFilename: string;
+ outputFilename?: string;
+ success: boolean;
+ error?: string;
+ downloadUrl?: string;
}
export interface ConvertRunVo {
- total: number
- successCount: number
- failedCount: number
- items: ConvertResultItem[]
+ total: number;
+ successCount: number;
+ failedCount: number;
+ items: ConvertResultItem[];
}
export interface ConvertHistoryVo {
- items: ConvertResultItem[]
+ items: ConvertResultItem[];
}
export interface ConvertRunRequest {
- files: UploadedFileRef[]
- templateId: string
- archiveName?: string
- user_id: number
+ files: UploadedFileRef[];
+ templateId: string;
+ archiveName?: string;
+ user_id: number;
}
export interface DeleteBrandPreviewRow {
- rowIndex: number
- country: string
- asin: string
- status: string
+ rowIndex: number;
+ country: string;
+ asin: string;
+ status: string;
}
export interface DeleteBrandCountryAsinItem {
- rowIndex: number
- asin: string
- status: string
+ rowIndex: number;
+ asin: string;
+ status: string;
}
export interface DeleteBrandCountryGroup {
- country: string
- asinCount: number
- items: DeleteBrandCountryAsinItem[]
+ country: string;
+ asinCount: number;
+ items: DeleteBrandCountryAsinItem[];
}
export interface DeleteBrandCountryResultItem {
- asin: string
- status?: string
+ asin: string;
+ status?: string;
}
export interface DeleteBrandProcessedCountry {
- country: string
- items: DeleteBrandCountryResultItem[]
+ country: string;
+ items: DeleteBrandCountryResultItem[];
}
export interface DeleteBrandResultFile {
- fileKey?: string
- sourceFilename: string
- fileIndex?: number
- fileTotal?: number
- chunkIndex?: number
- chunkTotal?: number
- processedRows?: number
- totalRows?: number
- currentCountry?: string
- currentAsin?: string
- countries: DeleteBrandProcessedCountry[]
+ fileKey?: string;
+ sourceFilename: string;
+ fileIndex?: number;
+ fileTotal?: number;
+ chunkIndex?: number;
+ chunkTotal?: number;
+ processedRows?: number;
+ totalRows?: number;
+ currentCountry?: string;
+ currentAsin?: string;
+ countries: DeleteBrandProcessedCountry[];
}
export interface DeleteBrandSubmitResultRequest {
- submissionId?: string
- files: DeleteBrandResultFile[]
+ submissionId?: string;
+ files: DeleteBrandResultFile[];
}
export interface DeleteBrandLineProgressInfo {
- file_index?: number
- file_total?: number
- file_name?: string
- current_line?: number
- total_lines?: number
- current_country?: string
- current_asin?: string
- finished_files?: number
- phase?: string
+ file_index?: number;
+ file_total?: number;
+ file_name?: string;
+ current_line?: number;
+ total_lines?: number;
+ current_country?: string;
+ current_asin?: string;
+ finished_files?: number;
+ phase?: string;
}
export interface DeleteBrandLineProgress {
- has_progress: boolean
- info?: DeleteBrandLineProgressInfo
+ has_progress: boolean;
+ info?: DeleteBrandLineProgressInfo;
}
export interface DeleteBrandTaskItem {
- id: number
- taskNo?: string
- status?: string
- sourceFileCount?: number
- successFileCount?: number
- failedFileCount?: number
- errorMessage?: string
- createdAt?: string
- updatedAt?: string
- finishedAt?: string
- downloadUrl?: string
- downloadFilename?: string
+ id: number;
+ taskNo?: string;
+ status?: string;
+ sourceFileCount?: number;
+ successFileCount?: number;
+ failedFileCount?: number;
+ errorMessage?: string;
+ createdAt?: string;
+ updatedAt?: string;
+ finishedAt?: string;
+ downloadUrl?: string;
+ downloadFilename?: string;
}
export interface DeleteBrandTaskFileProgress {
- fileKey?: string
- sourceFilename?: string
- processedRows?: number
- totalRows?: number
- percent?: number
- status?: 'PENDING' | 'RUNNING' | 'COMPLETED' | 'FAILED'
+ fileKey?: string;
+ sourceFilename?: string;
+ processedRows?: number;
+ totalRows?: number;
+ percent?: number;
+ status?: "PENDING" | "RUNNING" | "COMPLETED" | "FAILED";
}
export interface DeleteBrandTaskDetailVo {
- task: DeleteBrandTaskItem
- line_progress: DeleteBrandLineProgress
- items?: DeleteBrandResultItem[]
- fileProgress?: DeleteBrandTaskFileProgress[]
+ task: DeleteBrandTaskItem;
+ line_progress: DeleteBrandLineProgress;
+ items?: DeleteBrandResultItem[];
+ fileProgress?: DeleteBrandTaskFileProgress[];
}
export interface DeleteBrandTaskBatchVo {
- items: DeleteBrandTaskDetailVo[]
- missingTaskIds: number[]
+ items: DeleteBrandTaskDetailVo[];
+ missingTaskIds: number[];
}
-export type DeleteBrandMatchStatus = 'MATCHED' | 'PENDING' | 'CONFLICT' | 'INDEX_STALE'
+export type DeleteBrandMatchStatus =
+ | "MATCHED"
+ | "PENDING"
+ | "CONFLICT"
+ | "INDEX_STALE";
export interface DeleteBrandResultItem {
- resultId?: number
- fileKey?: string
- sourceFilename: string
- shopName?: string
- matched?: boolean
- matchStatus?: DeleteBrandMatchStatus
- matchMessage?: string
- shopId?: string
- platform?: string
- openStoreUrl?: string
- outputFilename?: string
- downloadUrl?: string
- taskId?: number
- countryCount?: number
- countries?: DeleteBrandCountryGroup[]
- totalRows?: number
- truncated?: boolean
- previewRows?: DeleteBrandPreviewRow[]
- success: boolean
- error?: string
- taskStatus?: string
+ resultId?: number;
+ fileKey?: string;
+ sourceFilename: string;
+ shopName?: string;
+ matched?: boolean;
+ matchStatus?: DeleteBrandMatchStatus;
+ matchMessage?: string;
+ shopId?: string;
+ platform?: string;
+ openStoreUrl?: string;
+ outputFilename?: string;
+ downloadUrl?: string;
+ taskId?: number;
+ countryCount?: number;
+ countries?: DeleteBrandCountryGroup[];
+ totalRows?: number;
+ truncated?: boolean;
+ previewRows?: DeleteBrandPreviewRow[];
+ success: boolean;
+ error?: string;
+ taskStatus?: string;
}
export interface DeleteBrandRunVo {
- total: number
- successCount: number
- failedCount: number
- items: DeleteBrandResultItem[]
+ total: number;
+ successCount: number;
+ failedCount: number;
+ items: DeleteBrandResultItem[];
}
export interface DeleteBrandHistoryVo {
- items: DeleteBrandResultItem[]
+ items: DeleteBrandResultItem[];
}
export interface DeleteBrandRunRequest {
- files: UploadedFileRef[]
- user_id: number
+ files: UploadedFileRef[];
+ user_id: number;
}
export interface ConvertTemplateVo {
- id: string
- templateCode: string
- templateName: string
- outputFilename: string
- isDefault?: boolean
- builtIn?: boolean
+ id: string;
+ templateCode: string;
+ templateName: string;
+ outputFilename: string;
+ isDefault?: boolean;
+ builtIn?: boolean;
}
export interface ConvertTemplateImportRequest {
- templateName: string
- templateContent: string
+ templateName: string;
+ templateContent: string;
}
export interface ExcelInfoVo {
- headers: string[]
- totalRows: number
+ headers: string[];
+ totalRows: number;
}
export function getExcelInfo(fileKey: string) {
- return unwrapJavaResponse(get
>(`${JAVA_API_PREFIX}/files/excel-info`, {
- params: { fileKey },
- }))
+ return unwrapJavaResponse(
+ get>(`${JAVA_API_PREFIX}/files/excel-info`, {
+ params: { fileKey },
+ }),
+ );
}
-export function runDedupe(request: Omit | DedupeRunRequest) {
- return unwrapJavaResponse(post, DedupeRunRequest>(`${JAVA_API_PREFIX}/dedupe/run`, {
- ...request,
- user_id: getCurrentUserId(),
- }))
+export function runDedupe(
+ request: Omit | DedupeRunRequest,
+) {
+ return unwrapJavaResponse(
+ post, DedupeRunRequest>(
+ `${JAVA_API_PREFIX}/dedupe/run`,
+ {
+ ...request,
+ user_id: getCurrentUserId(),
+ },
+ ),
+ );
}
export function getDedupeHistory() {
- return unwrapJavaResponse(get>(`${JAVA_API_PREFIX}/dedupe/history`, {
- params: { user_id: getCurrentUserId() },
- }))
+ return unwrapJavaResponse(
+ get>(`${JAVA_API_PREFIX}/dedupe/history`, {
+ params: { user_id: getCurrentUserId() },
+ }),
+ );
}
export function deleteDedupeHistory(resultId: number) {
- return unwrapJavaResponse(del>(`${JAVA_API_PREFIX}/dedupe/history/${resultId}`, {
- params: { user_id: getCurrentUserId() },
- }))
+ return unwrapJavaResponse(
+ del>(
+ `${JAVA_API_PREFIX}/dedupe/history/${resultId}`,
+ {
+ params: { user_id: getCurrentUserId() },
+ },
+ ),
+ );
}
-export function runSplit(request: Omit | SplitRunRequest) {
- return unwrapJavaResponse(post, SplitRunRequest>(`${JAVA_API_PREFIX}/split/run`, {
- ...request,
- user_id: getCurrentUserId(),
- }))
+export function runSplit(
+ request: Omit | SplitRunRequest,
+) {
+ return unwrapJavaResponse(
+ post, SplitRunRequest>(
+ `${JAVA_API_PREFIX}/split/run`,
+ {
+ ...request,
+ user_id: getCurrentUserId(),
+ },
+ ),
+ );
}
export function getSplitHistory() {
- return unwrapJavaResponse(get>(`${JAVA_API_PREFIX}/split/history`, {
- params: { user_id: getCurrentUserId() },
- }))
+ return unwrapJavaResponse(
+ get>(`${JAVA_API_PREFIX}/split/history`, {
+ params: { user_id: getCurrentUserId() },
+ }),
+ );
}
export function deleteSplitHistory(resultId: number) {
- return unwrapJavaResponse(del>(`${JAVA_API_PREFIX}/split/history/${resultId}`, {
- params: { user_id: getCurrentUserId() },
- }))
+ return unwrapJavaResponse(
+ del>(`${JAVA_API_PREFIX}/split/history/${resultId}`, {
+ params: { user_id: getCurrentUserId() },
+ }),
+ );
}
export function getConvertTemplates() {
- return unwrapJavaResponse(get>(`${JAVA_API_PREFIX}/convert/templates`))
+ return unwrapJavaResponse(
+ get>(
+ `${JAVA_API_PREFIX}/convert/templates`,
+ ),
+ );
}
export function importConvertTemplate(request: ConvertTemplateImportRequest) {
return unwrapJavaResponse(
- post, ConvertTemplateImportRequest>(`${JAVA_API_PREFIX}/convert/templates/import`, request),
- )
+ post, ConvertTemplateImportRequest>(
+ `${JAVA_API_PREFIX}/convert/templates/import`,
+ request,
+ ),
+ );
}
export function setDefaultConvertTemplate(templateCode: string) {
- return unwrapJavaResponse(post>(`${JAVA_API_PREFIX}/convert/templates/${templateCode}/default`))
+ return unwrapJavaResponse(
+ post>(
+ `${JAVA_API_PREFIX}/convert/templates/${templateCode}/default`,
+ ),
+ );
}
export function deleteConvertTemplate(templateCode: string) {
- return unwrapJavaResponse(del>(`${JAVA_API_PREFIX}/convert/templates/${templateCode}`))
+ return unwrapJavaResponse(
+ del>(
+ `${JAVA_API_PREFIX}/convert/templates/${templateCode}`,
+ ),
+ );
}
-export function runConvert(request: Omit | ConvertRunRequest) {
- return unwrapJavaResponse(post, ConvertRunRequest>(`${JAVA_API_PREFIX}/convert/run`, {
- ...request,
- user_id: getCurrentUserId(),
- }))
+export function runConvert(
+ request: Omit | ConvertRunRequest,
+) {
+ return unwrapJavaResponse(
+ post, ConvertRunRequest>(
+ `${JAVA_API_PREFIX}/convert/run`,
+ {
+ ...request,
+ user_id: getCurrentUserId(),
+ },
+ ),
+ );
}
export function getConvertHistory() {
- return unwrapJavaResponse(get>(`${JAVA_API_PREFIX}/convert/history`, {
- params: { user_id: getCurrentUserId() },
- }))
+ return unwrapJavaResponse(
+ get>(
+ `${JAVA_API_PREFIX}/convert/history`,
+ {
+ params: { user_id: getCurrentUserId() },
+ },
+ ),
+ );
}
export function deleteConvertHistory(resultId: number) {
- return unwrapJavaResponse(del>(`${JAVA_API_PREFIX}/convert/history/${resultId}`, {
- params: { user_id: getCurrentUserId() },
- }))
+ return unwrapJavaResponse(
+ del>(
+ `${JAVA_API_PREFIX}/convert/history/${resultId}`,
+ {
+ params: { user_id: getCurrentUserId() },
+ },
+ ),
+ );
}
-export function runDeleteBrand(request: Omit | DeleteBrandRunRequest) {
- return unwrapJavaResponse(post, DeleteBrandRunRequest>(`${JAVA_API_PREFIX}/delete-brand/run`, {
- ...request,
- user_id: getCurrentUserId(),
- }))
+export function runDeleteBrand(
+ request: Omit | DeleteBrandRunRequest,
+) {
+ return unwrapJavaResponse(
+ post, DeleteBrandRunRequest>(
+ `${JAVA_API_PREFIX}/delete-brand/run`,
+ {
+ ...request,
+ user_id: getCurrentUserId(),
+ },
+ ),
+ );
}
export function getDeleteBrandHistory() {
- return unwrapJavaResponse(get>(`${JAVA_API_PREFIX}/delete-brand/history`, {
- params: { user_id: getCurrentUserId() },
- }))
+ return unwrapJavaResponse(
+ get>(
+ `${JAVA_API_PREFIX}/delete-brand/history`,
+ {
+ params: { user_id: getCurrentUserId() },
+ },
+ ),
+ );
}
export function deleteDeleteBrandHistory(resultId: number) {
- return unwrapJavaResponse(del>(`${JAVA_API_PREFIX}/delete-brand/history/${resultId}`, {
- params: { user_id: getCurrentUserId() },
- }))
+ return unwrapJavaResponse(
+ del>(
+ `${JAVA_API_PREFIX}/delete-brand/history/${resultId}`,
+ {
+ params: { user_id: getCurrentUserId() },
+ },
+ ),
+ );
}
export function getDeleteBrandTaskDetail(taskId: number) {
- return unwrapJavaResponse(get>(`${JAVA_API_PREFIX}/delete-brand/tasks/${taskId}`))
+ return unwrapJavaResponse(
+ get>(
+ `${JAVA_API_PREFIX}/delete-brand/tasks/${taskId}`,
+ ),
+ );
}
export function getDeleteBrandTaskDetails(taskIds: number[]) {
- return unwrapJavaResponse(post, { taskIds: number[] }>(`${JAVA_API_PREFIX}/delete-brand/tasks/batch`, { taskIds }))
+ return unwrapJavaResponse(
+ post, { taskIds: number[] }>(
+ `${JAVA_API_PREFIX}/delete-brand/tasks/batch`,
+ { taskIds },
+ ),
+ );
}
export function getDeleteBrandTaskDownloadUrl(taskId: number) {
- return getJavaDownloadUrl(`/delete-brand/tasks/${taskId}/download`)
+ return getJavaDownloadUrl(`/delete-brand/tasks/${taskId}/download`);
}
-export function submitDeleteBrandResult(taskId: number, request: DeleteBrandSubmitResultRequest) {
- return unwrapJavaResponse(post, DeleteBrandSubmitResultRequest>(`${JAVA_API_PREFIX}/delete-brand/tasks/${taskId}/result`, request))
+export function submitDeleteBrandResult(
+ taskId: number,
+ request: DeleteBrandSubmitResultRequest,
+) {
+ return unwrapJavaResponse(
+ post, DeleteBrandSubmitResultRequest>(
+ `${JAVA_API_PREFIX}/delete-brand/tasks/${taskId}/result`,
+ request,
+ ),
+ );
}
/** 商品风险解决：备选店铺与匹配（推队列由前端 pywebview 完成） */
export interface ProductRiskCandidateVo {
- id: number
- shop_name: string
- created_at?: string
+ id: number;
+ shop_name: string;
+ created_at?: string;
}
export interface ProductRiskShopQueueItem {
- shopName: string
- matched: boolean
- shopId?: string
- platform?: string
- companyName?: string
- openStoreUrl?: string
- matchedUserId?: number
- matchStatus?: string
- matchMessage?: string
+ shopName: string;
+ matched: boolean;
+ shopId?: string;
+ platform?: string;
+ companyName?: string;
+ openStoreUrl?: string;
+ matchedUserId?: number;
+ matchStatus?: string;
+ matchMessage?: string;
}
export interface ProductRiskMatchShopsVo {
- items: ProductRiskShopQueueItem[]
+ items: ProductRiskShopQueueItem[];
}
export function listProductRiskCandidates() {
return unwrapJavaResponse(
- get>(`${JAVA_API_PREFIX}/product-risk-resolve/candidates`, {
- params: { user_id: getCurrentUserId() },
- }),
- )
+ get>(
+ `${JAVA_API_PREFIX}/product-risk-resolve/candidates`,
+ {
+ params: { user_id: getCurrentUserId() },
+ },
+ ),
+ );
}
export function addProductRiskCandidate(shopName: string) {
return unwrapJavaResponse(
- post, { user_id: number; shop_name: string }>(
- `${JAVA_API_PREFIX}/product-risk-resolve/candidates`,
- { user_id: getCurrentUserId(), shop_name: shopName },
- ),
- )
+ post<
+ JavaApiResponse,
+ { user_id: number; shop_name: string }
+ >(`${JAVA_API_PREFIX}/product-risk-resolve/candidates`, {
+ user_id: getCurrentUserId(),
+ shop_name: shopName,
+ }),
+ );
}
export function deleteProductRiskCandidate(id: number) {
return unwrapJavaResponse(
- del>(`${JAVA_API_PREFIX}/product-risk-resolve/candidates/${id}`, {
- params: { user_id: getCurrentUserId() },
- }),
- )
+ del>(
+ `${JAVA_API_PREFIX}/product-risk-resolve/candidates/${id}`,
+ {
+ params: { user_id: getCurrentUserId() },
+ },
+ ),
+ );
}
export interface ProductRiskCountryPreferenceVo {
- country_codes: string[]
+ country_codes: string[];
}
export function getProductRiskCountryPreference() {
return unwrapJavaResponse(
- get>(`${JAVA_API_PREFIX}/product-risk-resolve/country-preference`, {
- params: { user_id: getCurrentUserId() },
- }),
- )
+ get>(
+ `${JAVA_API_PREFIX}/product-risk-resolve/country-preference`,
+ {
+ params: { user_id: getCurrentUserId() },
+ },
+ ),
+ );
}
export function putProductRiskCountryPreference(countryCodes: string[]) {
@@ -467,122 +587,143 @@ export function putProductRiskCountryPreference(countryCodes: string[]) {
user_id: getCurrentUserId(),
country_codes: countryCodes,
}),
- )
+ );
}
export function matchProductRiskShops(shopNames: string[]) {
return unwrapJavaResponse(
- post, { user_id: number; shop_names: string[] }>(
- `${JAVA_API_PREFIX}/product-risk-resolve/match-shops`,
- { user_id: getCurrentUserId(), shop_names: shopNames },
- ),
- )
+ post<
+ JavaApiResponse,
+ { user_id: number; shop_names: string[] }
+ >(`${JAVA_API_PREFIX}/product-risk-resolve/match-shops`, {
+ user_id: getCurrentUserId(),
+ shop_names: shopNames,
+ }),
+ );
}
export interface ProductRiskDashboardVo {
- candidateCount: number
- processedTaskCount: number
- successTaskCount: number
- failedTaskCount: number
+ candidateCount: number;
+ processedTaskCount: number;
+ successTaskCount: number;
+ failedTaskCount: number;
}
export interface ProductRiskHistoryItem {
- resultId?: number
- taskId?: number
- shopName?: string
- shopId?: string
- platform?: string
- companyName?: string
- matched?: boolean
- matchStatus?: string
- matchMessage?: string
- taskStatus?: string
- success?: boolean
- error?: string
- outputFilename?: string
- downloadUrl?: string
+ resultId?: number;
+ taskId?: number;
+ shopName?: string;
+ shopId?: string;
+ platform?: string;
+ companyName?: string;
+ matched?: boolean;
+ matchStatus?: string;
+ matchMessage?: string;
+ taskStatus?: string;
+ success?: boolean;
+ error?: string;
+ outputFilename?: string;
+ downloadUrl?: string;
}
export interface ProductRiskHistoryVo {
- items: ProductRiskHistoryItem[]
+ items: ProductRiskHistoryItem[];
}
export interface ProductRiskTaskSummary {
- id?: number
- taskNo?: string
- status?: string
- errorMessage?: string
- createdAt?: string
- updatedAt?: string
- finishedAt?: string
+ id?: number;
+ taskNo?: string;
+ status?: string;
+ errorMessage?: string;
+ createdAt?: string;
+ updatedAt?: string;
+ finishedAt?: string;
}
export interface ProductRiskTaskDetailVo {
- task?: ProductRiskTaskSummary
- items?: ProductRiskHistoryItem[]
+ task?: ProductRiskTaskSummary;
+ items?: ProductRiskHistoryItem[];
}
export interface ProductRiskTaskBatchVo {
- items: ProductRiskTaskDetailVo[]
- missingTaskIds?: number[]
+ items: ProductRiskTaskDetailVo[];
+ missingTaskIds?: number[];
}
export interface ProductRiskPendingDeleteVo {
- removed: boolean
+ removed: boolean;
}
export interface ProductRiskCreateTaskVo {
- taskId: number
- items: ProductRiskHistoryItem[]
+ taskId: number;
+ items: ProductRiskHistoryItem[];
}
export function getProductRiskDashboard() {
return unwrapJavaResponse(
- get>(`${JAVA_API_PREFIX}/product-risk-resolve/dashboard`, {
- params: { user_id: getCurrentUserId() },
- }),
- )
+ get>(
+ `${JAVA_API_PREFIX}/product-risk-resolve/dashboard`,
+ {
+ params: { user_id: getCurrentUserId() },
+ },
+ ),
+ );
}
export function getProductRiskHistory() {
return unwrapJavaResponse(
- get>(`${JAVA_API_PREFIX}/product-risk-resolve/history`, {
- params: { user_id: getCurrentUserId() },
- }),
- )
+ get>(
+ `${JAVA_API_PREFIX}/product-risk-resolve/history`,
+ {
+ params: { user_id: getCurrentUserId() },
+ },
+ ),
+ );
}
export function deleteProductRiskHistory(resultId: number) {
return unwrapJavaResponse(
- del>(`${JAVA_API_PREFIX}/product-risk-resolve/history/${resultId}`, {
- params: { user_id: getCurrentUserId() },
- }),
- )
+ del>(
+ `${JAVA_API_PREFIX}/product-risk-resolve/history/${resultId}`,
+ {
+ params: { user_id: getCurrentUserId() },
+ },
+ ),
+ );
}
export function createProductRiskTask(items: ProductRiskShopQueueItem[]) {
return unwrapJavaResponse(
- post, { user_id: number; items: ProductRiskShopQueueItem[] }>(
- `${JAVA_API_PREFIX}/product-risk-resolve/tasks`,
- { user_id: getCurrentUserId(), items },
- ),
- )
+ post<
+ JavaApiResponse,
+ { user_id: number; items: ProductRiskShopQueueItem[] }
+ >(`${JAVA_API_PREFIX}/product-risk-resolve/tasks`, {
+ user_id: getCurrentUserId(),
+ items,
+ }),
+ );
}
export function deleteProductRiskTask(taskId: number) {
return unwrapJavaResponse(
- del>(`${JAVA_API_PREFIX}/product-risk-resolve/tasks/${taskId}`, {
- params: { user_id: getCurrentUserId() },
- }),
- )
+ del>(
+ `${JAVA_API_PREFIX}/product-risk-resolve/tasks/${taskId}`,
+ {
+ params: { user_id: getCurrentUserId() },
+ },
+ ),
+ );
}
export function deletePendingProductRiskShopResult(shopName: string) {
return unwrapJavaResponse(
- del>(`${JAVA_API_PREFIX}/product-risk-resolve/pending-shop-result`, {
- params: { user_id: getCurrentUserId(), shop_name: shopName },
- }),
- )
+ del>(
+ `${JAVA_API_PREFIX}/product-risk-resolve/pending-shop-result`,
+ {
+ params: { user_id: getCurrentUserId(), shop_name: shopName },
+ },
+ ),
+ );
}
export function getProductRiskTasksBatch(taskIds: number[]) {
@@ -591,21 +732,30 @@ export function getProductRiskTasksBatch(taskIds: number[]) {
`${JAVA_API_PREFIX}/product-risk-resolve/tasks/batch`,
{ taskIds },
),
- )
+ );
}
export function getProductRiskResultDownloadUrl(resultId: number) {
- return getJavaDownloadUrl(`/product-risk-resolve/results/${resultId}/download`)
+ return getJavaDownloadUrl(
+ `/product-risk-resolve/results/${resultId}/download`,
+ );
}
export function getJavaDownloadUrl(path: string) {
- let raw = path.startsWith('http://') || path.startsWith('https://') ? path : `${JAVA_API_PREFIX}${path}`
- // 核心修复：pywebview 的 save_file_from_url 需要完整带 schema 的 URL
- if (!raw.startsWith('http://') && !raw.startsWith('https://') && typeof window !== 'undefined') {
- raw = `${window.location.origin}${raw}`
+ let raw =
+ path.startsWith("http://") || path.startsWith("https://")
+ ? path
+ : `${JAVA_API_PREFIX}${path}`;
+ // 核心修复：pywebview 的 save_file_from_url_new 需要完整带 schema 的 URL
+ if (
+ !raw.startsWith("http://") &&
+ !raw.startsWith("https://") &&
+ typeof window !== "undefined"
+ ) {
+ raw = `${window.location.origin}${raw}`;
}
- const separator = raw.includes('?') ? '&' : '?'
- return `${raw}${separator}user_id=${encodeURIComponent(String(getCurrentUserId()))}`
+ const separator = raw.includes("?") ? "&" : "?";
+ return `${raw}${separator}user_id=${encodeURIComponent(String(getCurrentUserId()))}`;
}
-export { JAVA_API_PREFIX, http }
+export { JAVA_API_PREFIX, http };
diff --git a/frontend-vue/src/shared/bridges/pywebview.ts b/frontend-vue/src/shared/bridges/pywebview.ts
index 2a08292..4bc2ffe 100644
--- a/frontend-vue/src/shared/bridges/pywebview.ts
+++ b/frontend-vue/src/shared/bridges/pywebview.ts
@@ -1,58 +1,91 @@
export interface UploadedJavaFile {
- fileKey: string
- originalFilename: string
- localPath: string
- size: number
- relativePath?: string
+ fileKey: string;
+ originalFilename: string;
+ localPath: string;
+ size: number;
+ relativePath?: string;
}
export interface PywebviewApi {
- close?: () => Promise
- minimize?: () => Promise
- maximize?: () => Promise
- toggle_maximize?: () => Promise
- save_image?: (urlOrData: string, filename?: string) => Promise<{ success: boolean; path?: string; error?: string }>
- save_image_to_folder?: (urlOrData: string, dirPath: string, filename?: string) => Promise<{ success: boolean; path?: string; error?: string }>
- select_folder?: () => Promise
- select_brand_xlsx_files?: () => Promise
- select_brand_folder?: () => Promise
- upload_file_to_java?: (filePath: string, relativePath?: string) => Promise<{ success: boolean; message?: string; data?: UploadedJavaFile; error?: string }>
- save_file_from_url?: (url: string, filename: string) => Promise<{ success: boolean; path?: string; error?: string }>
- save_template_xlsx?: () => Promise<{ success: boolean; path?: string; error?: string }>
- save_template_zip?: () => Promise<{ success: boolean; path?: string; error?: string }>
- enqueue_json?: (data: unknown) => Promise<{ success: boolean; queue_size?: number; error?: string }>
+ close?: () => Promise;
+ minimize?: () => Promise;
+ maximize?: () => Promise;
+ toggle_maximize?: () => Promise;
+ save_image?: (
+ urlOrData: string,
+ filename?: string,
+ ) => Promise<{ success: boolean; path?: string; error?: string }>;
+ save_image_to_folder?: (
+ urlOrData: string,
+ dirPath: string,
+ filename?: string,
+ ) => Promise<{ success: boolean; path?: string; error?: string }>;
+ select_folder?: () => Promise;
+ select_brand_xlsx_files?: () => Promise;
+ select_brand_folder?: () => Promise;
+ upload_file_to_java?: (
+ filePath: string,
+ relativePath?: string,
+ ) => Promise<{
+ success: boolean;
+ message?: string;
+ data?: UploadedJavaFile;
+ error?: string;
+ }>;
+ save_file_from_url_new?: (
+ url: string,
+ filename: string,
+ ) => Promise<{ success: boolean; path?: string; error?: string }>;
+ save_template_xlsx?: () => Promise<{
+ success: boolean;
+ path?: string;
+ error?: string;
+ }>;
+ save_template_zip?: () => Promise<{
+ success: boolean;
+ path?: string;
+ error?: string;
+ }>;
+ enqueue_json?: (
+ data: unknown,
+ ) => Promise<{ success: boolean; queue_size?: number; error?: string }>;
}
declare global {
interface Window {
pywebview?: {
- api?: PywebviewApi
- }
+ api?: PywebviewApi;
+ };
}
}
-let cachedPywebviewApi: PywebviewApi | undefined
-let pywebviewReadyBound = false
+let cachedPywebviewApi: PywebviewApi | undefined;
+let pywebviewReadyBound = false;
function syncPywebviewApi() {
- cachedPywebviewApi = window.pywebview?.api
- return cachedPywebviewApi
+ cachedPywebviewApi = window.pywebview?.api;
+ return cachedPywebviewApi;
}
function bindPywebviewReady() {
- if (pywebviewReadyBound || typeof window === 'undefined' || !window.addEventListener) return
- pywebviewReadyBound = true
- window.addEventListener('pywebviewready', () => {
- syncPywebviewApi()
- })
+ if (
+ pywebviewReadyBound ||
+ typeof window === "undefined" ||
+ !window.addEventListener
+ )
+ return;
+ pywebviewReadyBound = true;
+ window.addEventListener("pywebviewready", () => {
+ syncPywebviewApi();
+ });
}
-bindPywebviewReady()
+bindPywebviewReady();
export function getPywebviewApi() {
- return syncPywebviewApi() || cachedPywebviewApi
+ return syncPywebviewApi() || cachedPywebviewApi;
}
export function hasPywebview() {
- return Boolean(getPywebviewApi())
+ return Boolean(getPywebviewApi());
}
diff --git a/source_code/main.py b/source_code/main.py
index eb64fdf..634a142 100644
--- a/source_code/main.py
+++ b/source_code/main.py
@@ -143,7 +143,7 @@ class WindowAPI:
)
return result[0] if result else ''
- def save_file_from_url(self, url, default_filename='download.zip'):
+ def save_file_from_url_new(self, url, default_filename='download.zip'):
"""弹窗选择保存位置，从 url 下载文件并保存。用于品牌任务结果 zip 等。"""
if not url or not url.strip():
return {'success': False, 'error': '下载地址为空'}
@@ -332,7 +332,7 @@ def main():
easy_drag=True
)
api = WindowAPI(window)
- window.expose(api.close, api.minimize, api.maximize, api.toggle_maximize, generate_images, api.save_image, api.save_image_to_folder, api.select_folder, api.select_brand_xlsx_files, api.select_brand_folder, api.save_file_from_url, api.save_template_xlsx,api.save_template_zip)
+ window.expose(api.close, api.minimize, api.maximize, api.toggle_maximize, generate_images, api.save_image, api.save_image_to_folder, api.select_folder, api.select_brand_xlsx_files, api.select_brand_folder, api.save_file_from_url_new, api.save_template_xlsx,api.save_template_zip)
webview.start(
debug=True,
storage_path=cache_path,
diff --git a/web_source/templates_backup/brand.html b/web_source/templates_backup/brand.html
index 81aa193..842827a 100644
--- a/web_source/templates_backup/brand.html
+++ b/web_source/templates_backup/brand.html
@@ -806,7 +806,7 @@
}
var zipUrl = task.result_paths.zip_url;
var filename = 'brand_task_' + taskId + '.zip';
- if (api && api.save_file_from_url) {
+ if (api && api.save_file_from_url_new) {
a.style.pointerEvents = 'none';
var done = function(ret) {
if (ret && ret.success) {
@@ -817,7 +817,7 @@
a.style.pointerEvents = '';
};
try {
- var ret = api.save_file_from_url(zipUrl, filename);
+ var ret = api.save_file_from_url_new(zipUrl, filename);
if (ret && typeof ret.then === 'function') {
ret.then(done).catch(function(err) { showToast('保存失败：' + (err && err.message || err)); a.style.pointerEvents = ''; });
} else {