From 7ce8ea524decfb8f1c93492b41177d9e0c8e4898 Mon Sep 17 00:00:00 2001 From: chenshaohua <635616957@qq.com> Date: Fri, 24 Jul 2026 16:29:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E8=81=94=E7=B3=BB=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/service/impl/CompanyServiceImpl.java | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyServiceImpl.java index 9e0393a..2aef2e6 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyServiceImpl.java @@ -166,20 +166,17 @@ public class CompanyServiceImpl extends ServiceImpl impl } int i=companyMapper.updateById(company); if(i>0){ - companyContactMapper.update(null,Wrappers.lambdaUpdate() - .eq(CompanyContact::getCompanyId, company.getCompanyId()) - .set(CompanyContact::getDelFlag, Constants.Del_FLAG_DELETE)); - List contactList = company.getCompanyContactList(); - if (!Objects.isNull(contactList)) { - for (CompanyContact x : contactList) { - if (x.getId() != null) { - companyContactMapper.updateById(x); - } else { - x.setCompanyId(company.getCompanyId()); - companyContactMapper.insert(x); + List contactList = company.getCompanyContactList(); + if (!Objects.isNull(contactList)) { + for (CompanyContact x : contactList) { + if (x.getId() != null) { + companyContactMapper.updateById(x); + } else { + x.setCompanyId(company.getCompanyId()); + companyContactMapper.insert(x); + } } } - } if (companyNatureChanged) { List jobIds = jobMapper.selectList(Wrappers.lambdaQuery() .eq(Job::getCompanyId, company.getCompanyId())) From d65f8d0d5c74e61af8f890a9e1870df71c47fd1d Mon Sep 17 00:00:00 2001 From: chenshaohua <635616957@qq.com> Date: Fri, 24 Jul 2026 17:28:06 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=B2=97=E4=BD=8D=E7=89=B9=E5=BE=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/cms/domain/ESJobDocument.java | 3 +++ .../src/main/java/com/ruoyi/cms/domain/Job.java | 3 +++ .../src/main/resources/mapper/app/JobMapper.xml | 7 +++++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java index 62003a9..6e1c0bc 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java @@ -173,4 +173,7 @@ public class ESJobDocument @ApiModelProperty("重点人群-1农民工、2团场职工、3失业人员、4零就业家庭、5零工人员、6退役军人") private String keyPopulations; + + @ApiModelProperty("岗位特征：（行政、后勤、管理、技术、销售等字典job_feature添加）") + private String jobFeature; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java index 61aa3ab..a8b2fd3 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java @@ -254,6 +254,9 @@ public class Job extends BaseEntity @ApiModelProperty("状态 0上架，1下架") private String jobStatus; + @ApiModelProperty("岗位特征：（行政、后勤、管理、技术、销售等字典job_feature添加）") + private String jobFeature; + @TableField(exist = false) @ApiModelProperty("户外招聘会岗位审核状态") private String fairReviewStatus; diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml index a396ce3..f793cd7 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobMapper.xml @@ -45,6 +45,7 @@ + @@ -94,6 +95,7 @@ + @@ -155,7 +157,7 @@ job_location_area_code, posting_date, vacancies, latitude, longitude, "view", company_id, is_hot, is_urgent, apply_num, description, is_publish, data_source, job_url, remark, del_flag, create_by, create_time, row_id, job_category,job_type,job_address,job_status,is_key_populations, - key_populations + key_populations,job_feature ) VALUES ( @@ -164,7 +166,8 @@ #{job.vacancies}, #{job.latitude}, #{job.longitude}, #{job.view}, #{job.companyId}, #{job.isHot}, #{job.isUrgent}, #{job.applyNum}, #{job.description}, #{job.isPublish}, #{job.dataSource}, #{job.jobUrl}, #{job.remark}, #{job.delFlag}, #{job.createBy}, #{job.createTime}, - #{job.rowId}, #{job.jobCategory},#{job.jobType},#{job.jobAddress},#{job.jobStatus},#{job.isKeyPopulations},#{job.keyPopulations} + #{job.rowId}, #{job.jobCategory},#{job.jobType},#{job.jobAddress},#{job.jobStatus},#{job.isKeyPopulations}, + #{job.keyPopulations},#{job.jobFeature} ) From 49d138b6c44b3228356f5670205b507bc62fc4b7 Mon Sep 17 00:00:00 2001 From: chenshaohua <635616957@qq.com> Date: Fri, 24 Jul 2026 18:03:39 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=9A=84=E8=AE=B0=E5=BD=95=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=92=8C=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/HrUserBehaviorRecordController.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/HrUserBehaviorRecordController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/HrUserBehaviorRecordController.java index 1b6fd42..daefd3f 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/HrUserBehaviorRecordController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/HrUserBehaviorRecordController.java @@ -59,13 +59,8 @@ public class HrUserBehaviorRecordController extends BaseController { record.setViewNum(1); hrUserBehaviorRecordService.save(record); } else { - if (record.getViewDuration() > 0) { - // 页面离开上报：累加时长 - exist.setViewDuration(exist.getViewDuration() + record.getViewDuration()); - } else { - // 页面进入上报：次数+1 - exist.setViewNum(exist.getViewNum() + 1); - } + exist.setViewNum(exist.getViewNum() + 1); + exist.setViewDuration(exist.getViewDuration() + record.getViewDuration()); hrUserBehaviorRecordService.updateById(exist); } return success(); From ee04c6d8e2fe059962c13d8971050f1c9c559377 Mon Sep 17 00:00:00 2001 From: chenshaohua <635616957@qq.com> Date: Fri, 24 Jul 2026 18:46:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=B5=8F=E8=A7=88=E6=B1=82=E8=81=8C=E8=80=85?= =?UTF-8?q?=E7=AE=80=E5=8E=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CmsHrUserBehaviorRecordController.java | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsHrUserBehaviorRecordController.java diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsHrUserBehaviorRecordController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsHrUserBehaviorRecordController.java new file mode 100644 index 0000000..097ce26 --- /dev/null +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsHrUserBehaviorRecordController.java @@ -0,0 +1,74 @@ +package com.ruoyi.cms.controller.cms; + +import com.ruoyi.cms.domain.msg.HrUserBehaviorRecord; +import com.ruoyi.cms.service.msg.HrUserBehaviorRecordService; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.SiteSecurityUtils; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/cms/behavior") +@Api(tags = "后台:行为记录") +public class CmsHrUserBehaviorRecordController extends BaseController { + + @Autowired + private HrUserBehaviorRecordService hrUserBehaviorRecordService; + + /** + * 查询行为记录列表 + */ + @GetMapping("/list") + @PreAuthorize("@ss.hasPermi('cms:behavior:list')") + @ApiOperation("查询行为记录列表") + public TableDataInfo list(HrUserBehaviorRecord hrUserBehaviorRecord) { + if (!SiteSecurityUtils.isLogin()) { + throw new ServiceException("用户未登录"); + } + Long userId = SiteSecurityUtils.getUserId(); + boolean admin = SiteSecurityUtils.isAdmin(userId); + if (!admin) { + hrUserBehaviorRecord.setActorId(userId); + } else { + hrUserBehaviorRecord.setActorId(null); + } + startPage(); + List list = hrUserBehaviorRecordService.selectBehaviorRecordList(hrUserBehaviorRecord); + return getDataTable(list); + } + + /** + * 上报浏览行为/投递行为 + */ + @ApiOperation("上报浏览行为/投递行为") + @PreAuthorize("@ss.hasPermi('cms:behavior:report')") + @Log(title = "用户培训经历", businessType = BusinessType.INSERT) + @PostMapping("/report") + public AjaxResult reportBehavior(@RequestBody HrUserBehaviorRecord record) { + HrUserBehaviorRecord exist = hrUserBehaviorRecordService.getExistViewRecord( + record.getActorType(), + record.getActorId(), + record.getTargetType(), + record.getTargetId() + ); + if (exist == null) { + record.setViewNum(1); + hrUserBehaviorRecordService.save(record); + } else { + exist.setViewNum(exist.getViewNum() + 1); + exist.setViewDuration(exist.getViewDuration() + record.getViewDuration()); + hrUserBehaviorRecordService.updateById(exist); + } + return success(); + } +} \ No newline at end of file