tools_batch_files 1.0.18 → 1.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tools_batch_files",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "description": "批处理视频工具",
   "keywords": [
     "utils",

package/src/photoBatch.js

@@ -35,10 +35,10 @@ const ZIP_FILES_DIR = "zip";
 const expandedName = ".jpg";
 
 //并发数量
-const queueCount = 30;
+const queueCount = 20;
 
 //起始任务下标
-let taskIndex = 16492;
+let taskIndex = 16941;
 
 const readExcel = (path) => {
   const workbook = XLSX.readFile(path);
@@ -327,10 +327,12 @@ const postData = (dataParams, indexFilePath) => {
 
   logger("等待接口返回结果……");
 
-  return axios.post("http://192.168.102.61:9999/upload/photo", formData, {
+  // return axios.post("http://192.168.102.61:9999/upload/photo", formData, {
+  return axios.post("http://127.0.0.1:9999/upload/photo", formData, {
     headers: {
       "Content-Type": "multipart/form-data",
     },
+    timeout: 60000, // 设置超时时间为 60 秒
   });
 };
 
@@ -354,11 +356,18 @@ const task = async (row, index) => {
     fileName = row.fileName + expandedName;
   }
 
+  const getPathStartTime = new Date();
   // 源图片文件夹路径
   const originFilePath = findFileInDir(
     path.join(workDir, ORIGIN_FILE_DIR),
     fileName
   );
+  const getPathEndTime = new Date();
+  const timeInSeconds = ((getPathEndTime - getPathStartTime) / 1000).toFixed(2);
+
+  logger(`第${index}条Path路径搜索时间：${timeInSeconds}秒`);
+  logger(`-------------------${new Date()}------------------`);
+
   console.log("originFilePath：" + originFilePath);
   console.log("fileName：" + fileName);
 
@@ -371,6 +380,7 @@ const task = async (row, index) => {
   const indexFilePath = path.join(workDir, "output", index + "");
 
   try {
+    const workStartTime = new Date();
     await fs_asnyc.access(originFilePath, fs_asnyc.constants.F_OK);
     logFileSize(originFilePath);
     await PriviewPhoto(indexFilePath, originFilePath, fileName);
@@ -386,10 +396,21 @@ const task = async (row, index) => {
         keyword,
       }
     );
-    console.log("dataParams参数");
-    console.log(dataParams);
+    const workEndTime = new Date();
+    const timeInSeconds = ((workEndTime - workStartTime) / 1000).toFixed(2);
+
+    logger(`第${index}条4090处理总时间：${timeInSeconds}秒`);
+    logger(`-------------------${new Date()}------------------`);
 
+    
+    const postStartTime = new Date();
     const resData = await postData(dataParams, indexFilePath);
+    const postEndTime = new Date();
+    const timeInSeconds1 = ((postEndTime - postStartTime) / 1000).toFixed(2);
+
+    logger(`第${index}条接口处理总时间：${timeInSeconds1}秒`);
+    logger(`-------------------${new Date()}------------------`);
+
     if (resData.data.code === 200) {
       logger("请求成功！");
       logger(resData.data.code);
@@ -430,12 +451,25 @@ const transitionExcelToJSON = () => {
   const jsonData = readExcel(excelDir);
 
   const run = (index) => {
+    logger(
+      `run-------------------------------------第${index}条开始------------------------------------`
+    );
+    const readExcelStartTime = new Date();
     const row = jsonData[index];
+
+    const readExcelEndTime = new Date();
+    const timeInSeconds = (
+      (readExcelEndTime - readExcelStartTime) /
+      1000
+    ).toFixed(2);
+
+    logger(`第${index}条Excel搜索时间：${timeInSeconds}秒`);
+    logger(`-------------------${new Date()}------------------`);
     if (!row) {
       return;
     }
     logger(
-      `----------------------------------------第${index}条开始------------------------------------`
+      `----------------------------------------第${index}条task开始--------------------------------`
     );
     logger(`-------------------${new Date()}------------------`);
     task(row, index)