1

api/middleware/schedule/handlers/deliverHandler.js

@@ -4,7 +4,6 @@ const jobFilterEngine = require('../services/jobFilterEngine');
 const command = require('../core/command');
 const config = require('../infrastructure/config');
 const db = require('../../dbProxy');
-const { jobFilterService } = require('../../job/services');
 
 /**
  * 自动投递处理器
@@ -105,13 +104,13 @@ class DeliverHandler extends BaseHandler {
         // 9. 过滤已投递的公司
         const recentCompanies = await this.getRecentDeliveredCompanies(sn_code, 30);
 
-        // 10. 过滤、评分、排序职位
-        const filteredJobs = await this.filterAndScoreJobs(
+        // 10. 过滤 + 评分 + 按 60 分阈值筛（入口在 jobFilterEngine，便于阅读）
+        const filteredJobs = await jobFilterEngine.filterAndScoreJobsForDeliver(
             pendingJobs,
+            filterConfig,
             resume,
             accountConfig,
             jobTypeConfig,
-            filterConfig,
             recentCompanies
         );
 
@@ -338,72 +337,6 @@ class DeliverHandler extends BaseHandler {
         return new Set(recentApplies.map(apply => apply.companyName).filter(Boolean));
     }
 
-    /**
-     * 过滤和评分职位
-     */
-    async filterAndScoreJobs(jobs, resume, accountConfig, jobTypeConfig, filterConfig, recentCompanies) {
-        const scored = [];
-        const jobDesc = (j) => `${j.companyName || '?'} / ${j.jobTitle || '?'}`;
-
-        console.log(`[自动投递-过滤] 开始过滤与评分，待处理职位数: ${jobs.length}`);
-
-        for (const job of jobs) {
-            // 1. 过滤近期已投递的公司
-            if (job.companyName && recentCompanies.has(job.companyName)) {
-                console.log(`[自动投递-过滤] 步骤1-已投递公司 剔除: ${jobDesc(job)}`);
-                continue;
-            }
-
-            // 2. 使用 jobFilterEngine 过滤和评分
-            const filtered = await jobFilterEngine.filterJobs([job], filterConfig, resume);
-            if (filtered.length === 0) {
-                console.log(`[自动投递-过滤] 步骤2-jobFilterEngine 剔除: ${jobDesc(job)} (不满足过滤条件)`);
-                continue;
-            }
-
-            // 3. 使用原有的评分系统（job_filter_service）计算详细分数
-            const scoreResult = jobFilterService.calculateJobScoreWithWeights(
-                job,
-                resume,
-                accountConfig,
-                jobTypeConfig,
-                accountConfig.is_salary_priority || []
-            );
-
-            // 4. 计算关键词奖励
-            const KeywordMatcher = require('../utils/keywordMatcher');
-            const keywordBonus = KeywordMatcher.calculateBonus(
-                `${job.jobTitle} ${job.companyName} ${job.jobDescription || ''}`,
-                filterConfig.filter_keywords,
-                { baseScore: 5, maxBonus: 20 }
-            );
-
-            const finalScore = scoreResult.totalScore + keywordBonus.score;
-
-            // 5. 只保留评分 >= 60 的职位
-            if (finalScore < 60) {
-                console.log(`[自动投递-过滤] 步骤5-评分不足(>=60) 剔除: ${jobDesc(job)} | 总分=${finalScore.toFixed(1)} (基础=${scoreResult.totalScore?.toFixed(1)}, 关键词奖励=${keywordBonus.score})`);
-                continue;
-            }
-
-            scored.push({
-                ...job,
-                matchScore: finalScore,
-                scoreDetails: {
-                    ...scoreResult.scores,
-                    keywordBonus: keywordBonus.score
-                }
-            });
-            console.log(`[自动投递-过滤] 通过: ${jobDesc(job)} | 总分=${finalScore.toFixed(1)}`);
-        }
-
-        // 按评分降序排序
-        scored.sort((a, b) => b.matchScore - a.matchScore);
-
-        console.log(`[自动投递-过滤] 结束: 原始=${jobs.length}, 通过=${scored.length}, 剔除=${jobs.length - scored.length}`);
-        return scored;
-    }
-
     /**
      * 创建投递指令
      */