From 7a12a5020f9a2bcddc41954884f4ef99957bea4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E8=BE=89?= Date: Thu, 25 Jun 2026 14:54:55 +0800 Subject: [PATCH 1/7] 11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 361bde0..e7dff0b 100644 --- a/pom.xml +++ b/pom.xml @@ -236,7 +236,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.13.0 + 3.8.1 ${java.version} ${java.version} From eda6a8fc298f779a73d64d699de03d8a51071737 Mon Sep 17 00:00:00 2001 From: chenyanchang <30190327@qq.com> Date: Thu, 25 Jun 2026 15:09:17 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9A1.=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=B2=97=E4=BD=8D=E7=9B=B4=E6=8E=A5=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=97=B6=E6=B7=BB=E5=8A=A0=E5=88=B0es;2.=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=8A=95=E9=80=92=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/service/impl/JobApplyServiceImpl.java | 4 ++-- .../ruoyi/cms/service/impl/JobServiceImpl.java | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java index 0c44db6..317f88f 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java @@ -145,10 +145,10 @@ public class JobApplyServiceImpl extends ServiceImpl im List ids = jobApplies.stream().map(JobApply::getId).collect(Collectors.toList()); jobApplyMapper.deleteBatchIds(ids); } - jobApplyMapper.insert(jobApply); + int num = jobApplyMapper.insert(jobApply); //添加消息说明 - return 0; + return num; } @Override diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java index 7399e2e..2553412 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java @@ -382,6 +382,10 @@ public class JobServiceImpl extends ServiceImpl implements IJobSe if(!longs.isEmpty()){ fileMapper.updateBussinessids(longs,job.getJobId()); } + if (job.getIsPublish() == 1) { + //同步到es + iesJobSearchService.updateJob(job.getJobId()); + } } return insert; } @@ -1093,16 +1097,23 @@ public class JobServiceImpl extends ServiceImpl implements IJobSe private List sysUserCollection(List jobs){ if(jobs.isEmpty()){return new ArrayList<>();} - if(SecurityUtils.isLogin()){ + // 优先使用 App 端用户，兜底使用 PC 端用户 + Long userId = null; + if(SiteSecurityUtils.isLogin()){ + userId = SiteSecurityUtils.getUserId(); + } else if(SecurityUtils.isLogin()){ + userId = SecurityUtils.getUserId(); + } + if(userId != null){ //收藏 Set collectionIds = jobCollectionMapper.selectList(Wrappers.lambdaQuery() .eq(JobCollection::getUserId, SecurityUtils.getUserId()) .in(JobCollection::getJobId, jobs.stream().map(ESJobDocument::getJobId).collect(Collectors.toList()))) .stream().map(JobCollection::getJobId).collect(Collectors.toSet()); Set applyJobIds = new HashSet<>(); - List jobList = jobApplyMapper.applyJob(SecurityUtils.getUserId()); + List jobList = jobApplyMapper.applyJob(userId); if (CollectionUtils.isNotEmpty(jobList)) { - applyJobIds = jobApplyMapper.applyJob(SecurityUtils.getUserId()).stream().map(Job::getJobId).collect(Collectors.toSet()); + applyJobIds = jobList.stream().map(Job::getJobId).collect(Collectors.toSet()); } for (ESJobDocument j : jobs) { if (collectionIds.contains(j.getJobId())) { From e0cb1f48a2a0f8c806ff4d84c7b7701a792fa9d8 Mon Sep 17 00:00:00 2001 From: chenyanchang <30190327@qq.com> Date: Thu, 25 Jun 2026 15:12:47 +0800 Subject: [PATCH 3/7] update --- .../main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java index 2553412..2d3be86 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java @@ -1107,7 +1107,7 @@ public class JobServiceImpl extends ServiceImpl implements IJobSe if(userId != null){ //收藏 Set collectionIds = jobCollectionMapper.selectList(Wrappers.lambdaQuery() - .eq(JobCollection::getUserId, SecurityUtils.getUserId()) + .eq(JobCollection::getUserId, userId) .in(JobCollection::getJobId, jobs.stream().map(ESJobDocument::getJobId).collect(Collectors.toList()))) .stream().map(JobCollection::getJobId).collect(Collectors.toSet()); Set applyJobIds = new HashSet<>(); From 51461eb4cad3b932714474e00cccafcf9af93dc6 Mon Sep 17 00:00:00 2001 From: chenyanchang <30190327@qq.com> Date: Thu, 25 Jun 2026 15:20:28 +0800 Subject: [PATCH 4/7] update --- .../java/com/ruoyi/cms/service/impl/JobServiceImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java index 2d3be86..cb54fa3 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java @@ -1097,14 +1097,13 @@ public class JobServiceImpl extends ServiceImpl implements IJobSe private List sysUserCollection(List jobs){ if(jobs.isEmpty()){return new ArrayList<>();} - // 优先使用 App 端用户，兜底使用 PC 端用户 + //PC 端用户 Long userId = null; - if(SiteSecurityUtils.isLogin()){ - userId = SiteSecurityUtils.getUserId(); - } else if(SecurityUtils.isLogin()){ + if(SecurityUtils.isLogin()){ userId = SecurityUtils.getUserId(); } if(userId != null){ + log.error("--------userId:" + userId); //收藏 Set collectionIds = jobCollectionMapper.selectList(Wrappers.lambdaQuery() .eq(JobCollection::getUserId, userId) From a33b3988a54341ba40a4f43ccb9d2b4e39a386ba Mon Sep 17 00:00:00 2001 From: chenyanchang <30190327@qq.com> Date: Thu, 25 Jun 2026 15:27:24 +0800 Subject: [PATCH 5/7] update --- .../com/ruoyi/cms/service/impl/JobServiceImpl.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java index cb54fa3..017aa95 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java @@ -1097,20 +1097,15 @@ public class JobServiceImpl extends ServiceImpl implements IJobSe private List sysUserCollection(List jobs){ if(jobs.isEmpty()){return new ArrayList<>();} - //PC 端用户 - Long userId = null; if(SecurityUtils.isLogin()){ - userId = SecurityUtils.getUserId(); - } - if(userId != null){ - log.error("--------userId:" + userId); + log.error("--------SecurityUtils.getUserId():" + SecurityUtils.getUserId()); //收藏 Set collectionIds = jobCollectionMapper.selectList(Wrappers.lambdaQuery() - .eq(JobCollection::getUserId, userId) + .eq(JobCollection::getUserId, SecurityUtils.getUserId()) .in(JobCollection::getJobId, jobs.stream().map(ESJobDocument::getJobId).collect(Collectors.toList()))) .stream().map(JobCollection::getJobId).collect(Collectors.toSet()); Set applyJobIds = new HashSet<>(); - List jobList = jobApplyMapper.applyJob(userId); + List jobList = jobApplyMapper.applyJob(SecurityUtils.getUserId()); if (CollectionUtils.isNotEmpty(jobList)) { applyJobIds = jobList.stream().map(Job::getJobId).collect(Collectors.toSet()); } From 6a20fa016807a952bf83bebfd8e0963946b2ff36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E8=BE=89?= Date: Thu, 25 Jun 2026 15:39:56 +0800 Subject: [PATCH 6/7] =?UTF-8?q?sql=E8=AF=AD=E6=B3=95=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/service/impl/InterviewInvitationServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/InterviewInvitationServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/InterviewInvitationServiceImpl.java index d4f955e..4606e79 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/InterviewInvitationServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/InterviewInvitationServiceImpl.java @@ -100,15 +100,15 @@ public class InterviewInvitationServiceImpl implements InterviewInvitationServic log.info("interview_invitation 表创建成功（序列自增）！"); } else { log.info("interview_invitation 表结构正常，检查新增列..."); - // 为已有数据库添加新列（幂等操作，使用 DO 块兼容不支持 IF NOT EXISTS 的数据库版本） + // 为已有数据库添加新列（使用 IF NOT EXISTS，兼容 PostgreSQL / HighGo） try { - stmt.execute("DO $$ BEGIN ALTER TABLE interview_invitation ADD COLUMN company_name varchar(200) NULL; EXCEPTION WHEN duplicate_column THEN END; $$;"); + stmt.execute("ALTER TABLE interview_invitation ADD COLUMN IF NOT EXISTS company_name varchar(200) NULL"); } catch (Exception e) { log.warn("添加 company_name 列失败: {}", e.getMessage()); } try { - stmt.execute("DO $$ BEGIN ALTER TABLE interview_invitation ADD COLUMN job_name varchar(200) NULL; EXCEPTION WHEN duplicate_column THEN END; $$;"); + stmt.execute("ALTER TABLE interview_invitation ADD COLUMN IF NOT EXISTS job_name varchar(200) NULL"); } catch (Exception e) { log.warn("添加 job_name 列失败: {}", e.getMessage()); } try { - stmt.execute("DO $$ BEGIN ALTER TABLE interview_invitation ADD COLUMN interviewer_name varchar(100) NULL; EXCEPTION WHEN duplicate_column THEN END; $$;"); + stmt.execute("ALTER TABLE interview_invitation ADD COLUMN IF NOT EXISTS interviewer_name varchar(100) NULL"); } catch (Exception e) { log.warn("添加 interviewer_name 列失败: {}", e.getMessage()); } } } catch (Exception e) { From 3e91d53f89c98c4b650103c52c0a4dad2e106dc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E8=BE=89?= Date: Thu, 25 Jun 2026 15:43:36 +0800 Subject: [PATCH 7/7] =?UTF-8?q?sql=E8=AF=AD=E6=B3=95=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/InterviewInvitationServiceImpl.java | 40 ++++++++++++++----- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/InterviewInvitationServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/InterviewInvitationServiceImpl.java index 4606e79..51be6ea 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/InterviewInvitationServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/InterviewInvitationServiceImpl.java @@ -100,22 +100,42 @@ public class InterviewInvitationServiceImpl implements InterviewInvitationServic log.info("interview_invitation 表创建成功（序列自增）！"); } else { log.info("interview_invitation 表结构正常，检查新增列..."); - // 为已有数据库添加新列（使用 IF NOT EXISTS，兼容 PostgreSQL / HighGo） - try { - stmt.execute("ALTER TABLE interview_invitation ADD COLUMN IF NOT EXISTS company_name varchar(200) NULL"); - } catch (Exception e) { log.warn("添加 company_name 列失败: {}", e.getMessage()); } - try { - stmt.execute("ALTER TABLE interview_invitation ADD COLUMN IF NOT EXISTS job_name varchar(200) NULL"); - } catch (Exception e) { log.warn("添加 job_name 列失败: {}", e.getMessage()); } - try { - stmt.execute("ALTER TABLE interview_invitation ADD COLUMN IF NOT EXISTS interviewer_name varchar(100) NULL"); - } catch (Exception e) { log.warn("添加 interviewer_name 列失败: {}", e.getMessage()); } + // 为已有数据库添加新列：先查 information_schema 判断列是否存在，存在则跳过 + // 不使用 IF NOT EXISTS / DO $$ 语法，因为 Druid 1.2.23 StatFilter 无法解析这些 PG 扩展语法 + addColumnIfNotExists(stmt, "interview_invitation", "company_name", "varchar(200) NULL"); + addColumnIfNotExists(stmt, "interview_invitation", "job_name", "varchar(200) NULL"); + addColumnIfNotExists(stmt, "interview_invitation", "interviewer_name", "varchar(100) NULL"); } } catch (Exception e) { log.error("初始化表失败: {}", e.getMessage()); } } + /** + * 幂等添加列：先查 information_schema 判断列是否存在，不存在才执行 ALTER TABLE ADD COLUMN + * 不使用 IF NOT EXISTS / DO $$ 语法，避免 Druid StatFilter mergeSql 报错 + */ + private void addColumnIfNotExists(Statement stmt, String tableName, String columnName, String columnDef) { + try { + String checkSql = "SELECT COUNT(*) FROM information_schema.columns WHERE table_name='" + tableName + "' AND column_name='" + columnName + "'"; + java.sql.ResultSet rs = stmt.executeQuery(checkSql); + boolean exists = false; + if (rs.next()) { + exists = rs.getInt(1) > 0; + } + rs.close(); + if (!exists) { + String alterSql = "ALTER TABLE " + tableName + " ADD COLUMN " + columnName + " " + columnDef; + stmt.execute(alterSql); + log.info("成功添加列: {}.{}", tableName, columnName); + } else { + log.info("列已存在，跳过: {}.{}", tableName, columnName); + } + } catch (Exception e) { + log.warn("添加列 {}.{} 失败: {}", tableName, columnName, e.getMessage()); + } + } + @Override public List getInterviewInvitationList(InterviewInvitation interviewInvitation) { return interviewInvitationMapper.getInterviewInvitationList(interviewInvitation);