fix:添加自动排版本地下载标记

0508c0d0 · linjinhong · 530e2bc6 · 0508c0d0 · 0508c0d0 · 0508c0d0
Commit 0508c0d0 authored Jul 15, 2026 by linjinhong
9 changed files
--- a/src/background.js
+++ b/src/background.js
@@ -193,15 +193,29 @@ async function createWindow() {
                    }
                    try {
                      let configObj = JSON.parse(data);
-                      configObj.apiApiHost = `https://${newDomain}/api`;
+                      const isTest = process.env.VUE_APP_ENV === "test";
-                      configObj.fileApiUrl = `https://${newDomain}/upload/factory`;
+                      console.log("isTest", isTest);
-                      configObj.configPath = configPath;
+                      console.log("configObj", configObj);
-                      const newData = JSON.stringify(configObj); // 使用2个空格缩进
+                      const config = isTest ? configObj.test : configObj.prod;
+                      config.apiApiHost = isTest
+                        ? `http://${newDomain}/api`
+                        : `https://${newDomain}/api`;
+                      config.fileApiUrl = isTest
+                        ? `http://${newDomain}/upload/factory`
+                        : `https://${newDomain}/upload/factory`;
+                      config.configPath = configPath;
+                      // const newData = JSON.stringify(config); // 使用2个空格缩进
                      // console.log("修改后的数据:", newData);
+                      configObj[isTest ? "test" : "prod"] = config;
+                      const newConfigObj = JSON.stringify(configObj);
                      // 4. 写回文件
-                      fs.writeFile(configPath, newData, "utf-8", writeErr => {
+                      fs.writeFile(
+                        configPath,
+                        newConfigObj,
+                        "utf-8",
+                        writeErr => {
                          if (writeErr) {
                            console.error("写入配置文件失败:", writeErr);
                            this.$message.error(
@@ -210,10 +224,11 @@ async function createWindow() {
                            return;
                          }
-                        console.log("配置文件更新成功", configObj);
+                          console.log("配置文件更新成功", config);
-                        setApi(configObj);
+                          setApi(config);
-                      });
+                        }
+                      );
                    } catch (parseError) {
                      console.error("解析 JSON 失败:", parseError);
                      this.$message.error(
@@ -494,19 +509,17 @@ async function createWindow() {
  });
  ipcMain.on("get-install-path", event => {
-    // 固定桌面路径，不再区分开发环境
    const desktopPath = app.getPath("desktop");
    const dtfDir = path.join(desktopPath, "JomallProductionAssistant-DTF");
+    let resPath = desktopPath;
    try {
-      // 递归创建文件夹，不存在自动生成，存在不报错
      fs.mkdirSync(dtfDir, { recursive: true });
-      event.returnValue = dtfDir;
+      resPath = dtfDir;
    } catch (err) {
-      console.error("创建 DTF 桌面文件夹失败:", err);
+      console.error("创建文件夹失败", err);
-      // 兜底返回桌面，防止空值
-      event.returnValue = desktopPath;
    }
+    event.reply("get-install-path-res", resPath);
  });
  // ========== 新增3：窗口关闭时停止定时任务 ==========
@@ -515,6 +528,22 @@ async function createWindow() {
  });
 }
+const gotTheLock = app.requestSingleInstanceLock();
+if (!gotTheLock) {
+  app.quit();
+} else {
+  app.on("second-instance", () => {
+    // 第二次双击时，唤起已有的窗口
+    const allWindows = BrowserWindow.getAllWindows();
+    const mainWin = allWindows[0];
+    if (mainWin) {
+      if (mainWin.isMinimized()) mainWin.restore();
+      mainWin.show();
+      mainWin.focus();
+    }
+  });
+}
 app.on("activate", async () => {
  if (win === null) {
    await createWindow();

--- a/src/config/index.js
+++ b/src/config/index.js
@@ -52,7 +52,7 @@ export const pathMap = {
  listOperationByBatch: "factory/podOrderBatchDownload/listOperationByBatch",
  //排版
  replenishmentComposingDesignImages:
-    "factory/podOrderOperation/replenishmentComposingDesignImages",
+    "factory/podOrderOperation/softwareProduction-replenishmentComposingDesignImages",
  //获取单个批次号信息
  podOrderBatchDownload: "factory/podOrderBatchDownload/get",
  //操作日志

--- a/src/server/index.js
+++ b/src/server/index.js
@@ -29,7 +29,7 @@ export const createServer = () => {
    res.status(err.status || 500);
    res.json({
      message: err.message,
-      error: err,
+      error: err
    });
  });

--- a/src/server/utils/store.js
+++ b/src/server/utils/store.js
@@ -7,7 +7,6 @@ const MAX_LIMIT_RECORD_KEY = "originalIdMaxLimitRecord"; // 永久上限标记
 // ===== 2. 核心内存缓存 =====
 let orderCacheMap = new Map(); // key格式：前缀-数字（如AAAF...-1），value：原始订单对象
 // ===== 3. 永久上限标记方法（保留你的原有核心逻辑，无改动） =====
 /**
 * 获取已达永久上限的原始newId Map
@@ -197,6 +196,7 @@ module.exports = {
    store.set("desktoBoard", version);
  },
  getBoard: () => store.get("desktoBoard") || 3,
  setIsOver: value => {
    store.set("isOver", value);
  },
@@ -213,10 +213,9 @@ module.exports = {
    store.set("productType", value);
  },
  getProductType: () => store.get("productType") || "DTG",
  //DTF生产设置
  setDTFSetting: value => {
-    console.log("DTFSetting", value);
    store.set("DTFSetting", value);
  },
  getDTFSetting: () =>
@@ -232,6 +231,12 @@ module.exports = {
      downloadDir: ""
    },
+  //本地储存 文件批次号
+  setBatchNumbers: value => {
+    store.set("batchNumbers", value);
+  },
+  getBatchNumbers: () => store.get("batchNumbers") || [],
  setLocation: (version, locationKey) => {
    if (!locationKey) return;
    store.set(locationKey, version);

--- a/src/utils/download-core.js
+++ b/src/utils/download-core.js
@@ -3,7 +3,7 @@ const fs = require("fs");
 const http = require("http");
 const https = require("https");
 const url = require("url");
+const { setBatchNumbers, getBatchNumbers } = require("@/server/utils/store");
 /* ===================== 基础工具函数 ===================== */
 /**
@@ -206,12 +206,28 @@ async function batchDownloadByList(urlList, targetDir, options = {}) {
    retryTimes = 0,
    baseUrl = "",
    skipExists = true,
-    fileNameFormatter = null // 新增：自定义文件名回调,
+    fileNameFormatter = null, // 新增：自定义文件名回调,
+    isCheck = false,
+    batchId = "" // 新增：批次唯一标识，isCheck 模式下使用
  } = options;
  const success = [];
  const failed = [];
+  if (isCheck) {
+    // 批次已处理过则直接跳过整个批次，不执行后续任何下载逻辑
+    const batchNumbers = getBatchNumbers() || [];
+    if (batchNumbers.includes(batchId)) {
+      console.log(`该批次已执行过，直接跳过 | 批次号: ${batchId}`);
+      return {
+        success: [],
+        failed: [],
+        skipped: true,
+        batchId
+      };
+    }
+  }
  // 1. 创建目标目录
  try {
    await ensureDir(targetDir);
@@ -260,6 +276,11 @@ async function batchDownloadByList(urlList, targetDir, options = {}) {
    })
  );
+  if (isCheck && batchId) {
+    setBatchNumbers([...getBatchNumbers(), batchId]);
+    console.log(`批量下载 批次标记已标记批次为已处理 | 批次号: ${batchId}`);
+  }
  await Promise.all(tasks);
  console.log(`批量下载完成，成功: ${success.length}，失败: ${failed.length}`);
  return { success, failed };

--- a/src/utils/download-queue.js
+++ b/src/utils/download-queue.js
@@ -30,7 +30,7 @@ const { pLimit } = require("./download-core");
 /* ========== 业务逻辑 ========== */
 async function processBatchItem(item) {
-  const { batchArrangeNum, url: urlStr } = item;
+  const { batchArrangeNum, spUrl: urlStr } = item;
  if (!batchArrangeNum) {
    logDownloadError(
@@ -70,7 +70,9 @@ async function processBatchItem(item) {
  await batchDownloadByStr(urlStr, saveDir, {
    concurrency: taskState.maxImageConcurrency,
    timeout: 30000,
-    baseUrl: getHostApi().fileApiUrl
+    baseUrl: getHostApi().fileApiUrl,
+    isCheck: true,
+    batchId: batchArrangeNum
  });
 }
@@ -105,7 +107,7 @@ async function runTask() {
      console.log("当前页无数据，本轮任务结束");
      return;
    }
+    console.log(layoutRes);
    // 多批次并行下载
    const batchLimit = pLimit(taskState.maxBatchConcurrency);
    const batchPromises = list.map(item =>

--- a/src/views/dtf-list/components/head.vue
+++ b/src/views/dtf-list/components/head.vue
@@ -90,12 +90,13 @@ export default {
            <el-option label="部分成功" :value="5"> </el-option>
          </el-select>
        </el-form-item>
-        <el-form-item label="创建时间">
+        <el-form-item label="时间范围">
          <el-date-picker
+            style="width: 380px;"
            clearable
-            v-model="searchForm.startTime"
+            v-model="searchForm.timeRange"
-            type="datetime"
+            type="datetimerange"
-            placeholder="选择创建时间"
+            placeholder="选择时间"
            format="yyyy-MM-dd HH:mm:ss"
            value-format="yyyy-MM-dd HH:mm:ss"
          >

--- a/src/views/dtf-list/index.vue
+++ b/src/views/dtf-list/index.vue
@@ -140,12 +140,12 @@ export default {
  },
  methods: {
    async loadLocalConfig() {
-      console.log(getDTFSetting());
-      setDTFSetting({ downloadDir: "" });
      try {
        if (!getDTFSetting().downloadDir) {
-          const path = ipcRenderer.sendSync("get-install-path");
+          ipcRenderer.send("get-install-path");
-          setDTFSetting({ downloadDir: path });
+          ipcRenderer.once("get-install-path-res", (_, defaultPath) => {
+            setDTFSetting({ downloadDir: defaultPath });
+          });
        }
      } catch (error) {
        console.log(error);
@@ -274,7 +274,7 @@ export default {
        );
        const res = await submitTypesettingDownload({
-          urlStr: data.data.url,
+          urlStr: data.data.spUrl,
          targetPath: path.join(
            getDTFSetting().downloadDir,
            `批次号：${this.templateBatchArrangeNum}`,
@@ -394,6 +394,17 @@ export default {
      } catch (err) {
        console.error("同步下载状态失败", err);
      }
+    },
+    searchFn(value) {
+      this.searchForm = value;
+      if (value.timeRange?.length) {
+        this.searchForm.startTime = value.timeRange[0];
+        this.searchForm.endTime = value.timeRange[1];
+      } else {
+        this.searchForm.startTime = "";
+        this.searchForm.endTime = "";
+      }
+      this.fetchBatchList(this.searchForm);
    }
  }
 };
@@ -404,12 +415,7 @@ export default {
    <DTFhead
      :user="user"
      :factoryType="factoryType"
-      @search="
+      @search="searchFn"
-        value => {
-          searchForm = value;
-          this.fetchBatchList(searchForm);
-        }
-      "
    ></DTFhead>
    <BaseTable
      v-if="tableList.length"

--- a/src/views/dtf-setting/index.vue
+++ b/src/views/dtf-setting/index.vue
@@ -120,11 +120,7 @@ export default {
      try {
        const { data } = await this.$api.post(pathMap["productionConfig"]);
        this.form = { ...getDTFSetting(), ...data };
-        console.log(94, this.form);
-        // if (!this.form.downloadDir) {
-        //   const path = ipcRenderer.sendSync("get-install-path");
-        //   this.form.downloadDir = path;
-        // }
        setDTFSetting({ ...this.form });
        this.$nextTick(() => (this.isInitLoad = false));