1

api/middleware/schedule/scheduledJobs.js

@@ -1,4 +1,5 @@
 const node_schedule = require("node-schedule");
+const dayjs = require('dayjs');
 const config = require('./config.js');
 const deviceManager = require('./deviceManager.js');
 const command = require('./command.js');
@@ -331,6 +332,8 @@ class ScheduledJobs {
                 }
             });
 
+            
+
             if (!pla_users || pla_users.length === 0) {
                 console.log('[自动投递] 没有启用且开启自动投递的账号');
                 return;
@@ -338,11 +341,13 @@ class ScheduledJobs {
 
             console.log(`[自动投递] 找到 ${pla_users.length} 个可用账号`);
 
+            // 获取 task_status 模型用于查询上次投递时间
+            const { task_status } = models;
+
             // 为每个设备添加自动投递任务到队列
             for (const pl_user of pla_users) {
                 const userData = pl_user.toJSON();
 
-
                 // 检查设备调度策略
                 const canExecute = deviceManager.canExecuteOperation(userData.sn_code, 'deliver');
                 if (!canExecute.allowed) {
@@ -350,6 +355,44 @@ class ScheduledJobs {
                     continue;
                 }
 
+                // 获取投递配置，如果不存在则使用默认值
+                const deliver_config = userData.deliver_config || {
+                    deliver_interval: 30,
+                    min_salary: 0,
+                    max_salary: 0,
+                    page_count: 3,
+                    max_deliver: 10,
+                    filter_keywords: [],
+                    exclude_keywords: []
+                };
+
+                // 检查投递间隔时间
+                const deliver_interval = deliver_config.deliver_interval || 30; // 默认30分钟
+                const interval_ms = deliver_interval * 60 * 1000; // 转换为毫秒
+
+                // 查询该账号最近一次成功完成的自动投递任务
+                const lastDeliverTask = await task_status.findOne({
+                    where: {
+                        sn_code: userData.sn_code,
+                        taskType: 'auto_deliver',
+                        status: 'completed'
+                    },
+                    order: [['endTime', 'DESC']],
+                    attributes: ['endTime']
+                });
+
+                // 如果存在上次投递记录，检查是否已经过了间隔时间
+                if (lastDeliverTask && lastDeliverTask.endTime) {
+                    const lastDeliverTime = new Date(lastDeliverTask.endTime);
+                    const elapsedTime = now.getTime() - lastDeliverTime.getTime();
+                    
+                    if (elapsedTime < interval_ms) {
+                        const remainingMinutes = Math.ceil((interval_ms - elapsedTime) / (60 * 1000));
+                        console.log(`[自动投递] 设备 ${userData.sn_code} 距离上次投递仅 ${Math.round(elapsedTime / (60 * 1000))} 分钟，还需等待 ${remainingMinutes} 分钟（间隔: ${deliver_interval} 分钟）`);
+                        continue;
+                    }
+                }
+
                 // 添加自动投递任务到队列
                 await this.taskQueue.addTask(userData.sn_code, {
                     taskType: 'auto_deliver',
@@ -357,19 +400,19 @@ class ScheduledJobs {
                     taskParams: {
                         keyword: userData.keyword || '',
                         platform: userData.platform_type || 'boss',
-                        pageCount: 3,  // 默认值
-                        maxCount: 10,  // 默认值
+                        pageCount: deliver_config.page_count || 3,
+                        maxCount: deliver_config.max_deliver || 10,
                         filterRules: {
-                            minSalary: userData.min_salary || 0,
-                            maxSalary: userData.max_salary || 0,
-                            keywords: [],
-                            excludeKeywords: []
+                            minSalary: deliver_config.min_salary || 0,
+                            maxSalary: deliver_config.max_salary || 0,
+                            keywords: deliver_config.filter_keywords || [],
+                            excludeKeywords: deliver_config.exclude_keywords || []
                         }
                     },
                     priority: config.getTaskPriority('auto_deliver') || 6
                 });
 
-                console.log(`[自动投递] 已为设备 ${userData.sn_code} 添加自动投递任务，关键词: ${userData.keyword || '默认'}`);
+                console.log(`[自动投递] 已为设备 ${userData.sn_code} 添加自动投递任务，关键词: ${userData.keyword || '默认'}，投递间隔: ${deliver_interval} 分钟`);
             }
 
             console.log('[自动投递] 任务添加完成');