修改求职者首页相关检索，去除招聘会职位新增招聘会支持批量导入职位 优化全量同步招聘数据接口

menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/job/JobJoinFairStatus.java

@@ -0,0 +1,28 @@
+package com.citu.module.menduner.system.enums.job;
+
+public enum JobJoinFairStatus {
+    NORMAL_JOB("0","普通职位"),
+    JOIN_FAIR_JOB("1","招聘会职位");
+
+    /**
+     * 状态值
+     */
+    private final String status;
+    /**
+     * 状态名
+     */
+    private final String name;
+
+    JobJoinFairStatus(String status, String name) {
+        this.status = status;
+        this.name = name;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/recruit/fair/AppRecruitFairController.java

@@ -135,8 +135,8 @@ public class AppRecruitFairController {
     public CommonResult<Boolean> checkPermission(@RequestParam("jobFairId") Long jobFairId) {
         fairWhiteService.checkFairWhite(LoginUserContext.getEnterpriseId(), jobFairId);
         if (!fairWhiteService.checkFirstEnterFair(LoginUserContext.getEnterpriseId(), jobFairId)) {
-            // 首次进入才同步数据
-            fairService.syncJob(LoginUserContext.getEnterpriseId(), jobFairId);
+            // 首次进入才同步数据 TODO 25_06_26 关闭同步逻辑
+//            fairService.syncJob(LoginUserContext.getEnterpriseId(), jobFairId);
         }
         return success(true);
     }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/recruit/job/AppRecruitJobAdvertisedController.java

@@ -106,16 +106,15 @@ public class AppRecruitJobAdvertisedController {
     @PreAuthenticated
     @PostMapping("/import")
     @Operation(summary = "导入招聘职位")
-    public CommonResult<Boolean> importExcel(@RequestPart @RequestParam MultipartFile multipartFile)
+    public CommonResult<Boolean> importExcel(@RequestPart @RequestParam MultipartFile multipartFile,@RequestParam(value = "fairId",defaultValue = "0")Long fairId)
             throws Exception {
         try {
             List<JobAdvertisedImportExcelVO> list = ExcelUtils.read(multipartFile, JobAdvertisedImportExcelVO.class);
-            jobIntegrationService.importData(list);
+            jobIntegrationService.importData(list,fairId);
             return success(true);
         }catch (Exception e){
             throw new ServiceException(MDE_JOB_ADVERTISED_EXCEL_ERROR);
         }
-
     }
 
     @PreAuthenticated

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/job/JobAdvertisedDO.java

@@ -146,4 +146,9 @@ public class JobAdvertisedDO extends TenantBaseDO {
      */
     private String status;
 
+    private String joinFairStatus;
+
+    private Long fairId;
+
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/es/job/ESJobAdvertisedMergeDO.java

@@ -243,4 +243,8 @@ public class ESJobAdvertisedMergeDO extends ESBaseDO {
      */
     private Boolean prepare;
 
+    @Field(type = FieldType.Auto)
+    private String joinFairStatus;
+
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/fair/FairDetailMapper.java

@@ -19,6 +19,7 @@ import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedDO;
 import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 import org.springframework.util.StringUtils;
 
 import java.time.LocalDateTime;
@@ -173,4 +174,7 @@ public interface FairDetailMapper extends BaseMapperX<FairDetailDO> {
         return selectJoinList(Long.class,query);
 
     }
+
+    @Update(" update  mde_job_advertised  set expire_time  =now() where  id in(  select  job_id  from mde_fair_detail where  job_fair_id =#{fairId}) ")
+    void closeFairJobClose(@Param("fairId") Long fairId);
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/fair/FairMapper.java

@@ -38,8 +38,9 @@ public interface FairMapper extends BaseMapperX<FairDO> {
     default PageResult<FairDO> selectAppPage(AppJobFairPageReqVO reqVO,LocalDate date) {
         return selectPage(reqVO, new LambdaQueryWrapperX<FairDO>()
                 .eq(null!=reqVO.getStatus(),FairDO::getStatus,reqVO.getStatus())
-                .ge(MendunerStatusEnum.ENABLE.getStatus().equals(reqVO.getStatus()), FairDO::getEndTime, date.atStartOfDay())
-                .le(MendunerStatusEnum.DISABLE.getStatus().equals(reqVO.getStatus()), FairDO::getEndTime, date.atStartOfDay())
+                // TODO  250626 修改 按马总要求 这个地方 以状态为准
+//                .ge(MendunerStatusEnum.ENABLE.getStatus().equals(reqVO.getStatus()), FairDO::getEndTime, date.atStartOfDay())
+//                .le(MendunerStatusEnum.DISABLE.getStatus().equals(reqVO.getStatus()), FairDO::getEndTime, date.atStartOfDay())
                 .orderByDesc(FairDO::getEndTime)
         );
     }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/job/JobAdvertisedMapper.java

@@ -2,7 +2,9 @@ package com.citu.module.menduner.system.dal.mysql.job;
 
 
 import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.collection.CollectionUtils;
@@ -15,11 +17,9 @@ import com.citu.module.menduner.system.controller.app.jobhunt.job.vo.AppJobAdver
 import com.citu.module.menduner.system.controller.app.recruit.job.vo.AppRecruitJobExportRespVO;
 import com.citu.module.menduner.system.controller.app.recruit.job.vo.AppRecruitJobPageReqVO;
 import com.citu.module.menduner.system.controller.app.recruit.job.vo.AppRecruitJobRespVO;
-import com.citu.module.menduner.system.controller.app.recruit.job.vo.AppRecruitJobSimpleRespVO;
 import com.citu.module.menduner.system.controller.base.CommonRespVO;
 import com.citu.module.menduner.system.controller.base.analysis.RecruitAnalysisPageReqVO;
 import com.citu.module.menduner.system.controller.base.analysis.RecruitJobAnalysisRespVO;
-import com.citu.module.menduner.system.controller.base.fair.JobFairDetailPageReqVO;
 import com.citu.module.menduner.system.controller.base.job.JobAdvertisedDetailRespVO;
 import com.citu.module.menduner.system.controller.base.job.JobAdvertisedPageReqVO;
 import com.citu.module.menduner.system.controller.base.job.JobAdvertisedReqVO;
@@ -36,6 +36,7 @@ import com.citu.module.menduner.system.dal.dataobject.person.PersonJobFavoriteDO
 import com.citu.module.menduner.system.dal.dataobject.position.PositionDO;
 import com.citu.module.menduner.system.dal.dataobject.visits.MdeVisitsDO;
 import com.citu.module.menduner.system.enums.MendunerStatusEnum;
+import com.citu.module.menduner.system.enums.job.JobJoinFairStatus;
 import com.citu.module.menduner.system.enums.job.JobStatusEnum;
 import com.citu.module.menduner.system.enums.visits.MdeVisitsEnum;
 import com.citu.module.menduner.system.util.RecruitAnalysisUtils;
@@ -150,6 +151,9 @@ public interface JobAdvertisedMapper extends BaseMapperX<JobAdvertisedDO> {
         return selectList(query);
     }
 
+    default void notFairJob(MPJLambdaWrapperX<JobAdvertisedDO> query){
+       query.eq(JobAdvertisedDO::getJoinFairStatus, JobJoinFairStatus.NORMAL_JOB.getStatus());
+    }
     /**
      * 求职端 - 根据查询条件分页查询正常状态和没有过期的职位信息
      **/
@@ -170,7 +174,7 @@ public interface JobAdvertisedMapper extends BaseMapperX<JobAdvertisedDO> {
         query.eqIfPresent(JobAdvertisedDO::getHire, reqVO.getHire());
         query.eqIfPresent(JobAdvertisedDO::getTop, reqVO.getTop());
         notExpireTime(query);
-
+        notFairJob(query);
         // 相识参数
         if (reqVO.getAcquainted()) {
             query.and(wrapper -> wrapper
@@ -217,7 +221,7 @@ public interface JobAdvertisedMapper extends BaseMapperX<JobAdvertisedDO> {
         query.eq(EnterpriseDO::getStatus, MendunerStatusEnum.ENABLE.getStatus());
 
         notExpireTime(query);
-
+        notFairJob(query);
         query.inIfPresent(JobAdvertisedDO::getId, CollectionUtils.ofDefaultIfNull(reqVO.getIds()));
         query.inIfPresent(JobAdvertisedDO::getPositionId, reqVO.getPositionIds());
         query.eqIfPresent(JobAdvertisedDO::getHire, reqVO.getHire());
@@ -248,6 +252,7 @@ public interface JobAdvertisedMapper extends BaseMapperX<JobAdvertisedDO> {
         query.eq(EnterpriseDO::getStatus, MendunerStatusEnum.ENABLE.getStatus());
         query.eq(JobAdvertisedDO::getStatus, MendunerStatusEnum.ENABLE.getStatus());
         notExpireTime(query);
+        notFairJob(query);
         // 是vip 并且过期时间没到
         query.gt(EnterpriseDO::getVipFlag, 0);
         query.gt(EnterpriseDO::getVipExpireDate, LocalDateTime.now());
@@ -295,10 +300,11 @@ public interface JobAdvertisedMapper extends BaseMapperX<JobAdvertisedDO> {
      * 根据企业id集合查询企业数据
      **/
     default List<JobAdvertisedDO> selectByEnterpriseId(Long id, Integer num) {
-        LambdaQueryWrapper<JobAdvertisedDO> query = new LambdaQueryWrapperX<JobAdvertisedDO>();
+        MPJLambdaWrapperX<JobAdvertisedDO> query = new MPJLambdaWrapperX<JobAdvertisedDO>();
         query.in(JobAdvertisedDO::getEnterpriseId, id);
         query.eq(JobAdvertisedDO::getStatus, MendunerStatusEnum.ENABLE.getStatus());
         notExpireTime(query);
+        notFairJob(query);
         query.orderByDesc(JobAdvertisedDO::getUpdateTime);
         if (null != num) {
             query.last("limit " + num);

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/mq/consumer/ESConsumer.java

@@ -234,8 +234,8 @@ public class ESConsumer implements RocketMQListener<ESJobAdvertisedMergeSendMess
         deleteAllIndexes(documentClasses);
         // 新增索引
         recreateIndexes(documentClasses);
-
-        List<Long> idList = jobAdvertisedMapper.selectIdList();
+        List<ESJobAdvertisedMergeDO> saveAll = new ArrayList<>(11);
+        List<Long> idList = jobAdvertisedMapper.selectIdList(); 
         for (Long id : idList) {
             JobAdvertisedDO job = jobAdvertisedMapper.selectById(id);
             // 判断职位是否过期
@@ -248,9 +248,19 @@ public class ESConsumer implements RocketMQListener<ESJobAdvertisedMergeSendMess
                 continue;
             }
             ESJobAdvertisedMergeDO merge = build(job, enterpriseDO);
-            repository.save(merge);
+            saveAll.add(merge);
+            if(saveAll.size()==10) {
+                repository.saveAll(saveAll);
+                saveAll.clear();
+            }
+
             log.info("ES 保存数据成功 {}",merge);
         }
+
+        if(!saveAll.isEmpty()){
+            repository.saveAll(saveAll);
+        }
+
         stopWatch.stop();
         stopWatch.prettyPrint();
     }
@@ -325,6 +335,8 @@ public class ESConsumer implements RocketMQListener<ESJobAdvertisedMergeSendMess
 
     public ESJobAdvertisedMergeDO build(JobAdvertisedDO job, EnterpriseDO enterpriseDO) {
         ESJobAdvertisedMergeDO mergeDO = JobAdvertisedConvert.INSTANCE.convert2(job);
+        mergeDO.setJoinFairStatus(job.getJoinFairStatus());
+
         return build(mergeDO, enterpriseDO);
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/fair/FairServiceImpl.java

@@ -35,6 +35,8 @@ import com.citu.module.menduner.system.enums.job.JobTypeEnum;
 import com.citu.module.menduner.system.service.area.AreaService;
 import com.citu.module.menduner.system.service.industry.IndustryService;
 import com.citu.module.menduner.system.service.job.JobAdvertisedService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
@@ -58,6 +60,7 @@ import static com.citu.module.menduner.system.enums.ErrorCodeConstants.*;
 @Validated
 public class FairServiceImpl implements FairService {
 
+    private static final Logger log = LoggerFactory.getLogger(FairServiceImpl.class);
     @Resource
     private FairMapper fairMapper;
 
@@ -196,7 +199,8 @@ public class FairServiceImpl implements FairService {
             throw exception(JOB_FAIR_NOT_START);
         }
         if (now.isAfter(fairDO.getEndTime())) {
-            throw exception(JOB_FAIR_TIME_OVER);
+            log.info("招聘会时间已过 TODO ");
+//            throw exception(JOB_FAIR_TIME_OVER);
         }
     }
 
@@ -443,4 +447,9 @@ public class FairServiceImpl implements FairService {
     public List<Long> getJobIdsByEnterpriseIdAndJobFairId(Long enterpriseId, Long jobFairId) {
         return fairDetailMapper.selectJobIdsByEnterpriseIdAndJobFairId(enterpriseId, jobFairId);
     }
+
+    public void closeFairJobClose(Long fairId){
+        fairDetailMapper.closeFairJobClose(fairId);
+    }
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobAdvertisedServiceImpl.java

@@ -350,6 +350,7 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
     @Override
     @DSTransactional
     public Long save(AppRecruitJobSaveReqVO reqVO) {
+//        reqVO.get
         JobAdvertisedDO job = JobAdvertisedConvert.INSTANCE.convert3(reqVO);
         return save(job);
     }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobCvRelServiceImpl.java

@@ -179,6 +179,21 @@ public class JobCvRelServiceImpl implements JobCvRelService {
                 job.getEnterpriseId(),
                 StrUtil.format(IM_SYS_JOB_CV_REL_TEMPLATE, MessageUtils.replace(job.getName()))
         );
+        //TODO  加一个通知
+
+        /**
+
+         // 发送短信
+         SmsSendSingleToUserReqDTO smsReqDTO = new SmsSendSingleToUserReqDTO();
+         smsReqDTO.setUserId(data.getId());
+         smsReqDTO.setMobile(data.getMobile());
+         smsReqDTO.setTemplateCode(CommonConstants.SMS_SYS_NOTIFY_TEMPLATE);
+         smsReqDTO.setTemplateParams(MapUtil.<String, Object>builder()
+         .put("1", getPlatformSystemMessageContent(reqDTO.getTemplateCode(), reqDTO.getTemplateParams()))
+         .build());
+         smsSendApi.sendSingleSmsToAdmin(smsReqDTO);
+
+         */
         return jobCvRel.getId();
     }
 
@@ -218,6 +233,7 @@ public class JobCvRelServiceImpl implements JobCvRelService {
                 job.getEnterpriseId(),
                 StrUtil.format(IM_SYS_JOB_CV_REL_TEMPLATE, MessageUtils.replace(job.getName()))
         );
+        //TODO  加一个通知
         return cvRelDO.getId();
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobIntegrationService.java

@@ -102,6 +102,6 @@ public interface JobIntegrationService {
     /**
      * 导入招聘职位数据
      **/
-    void importData(List<JobAdvertisedImportExcelVO> list);
+    void importData(List<JobAdvertisedImportExcelVO> list, Long fairId);
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobIntegrationServiceImpl.java

@@ -42,6 +42,7 @@ import com.citu.module.menduner.system.dal.mysql.job.JobCvRelMapper;
 import com.citu.module.menduner.system.dal.mysql.major.MajorMapper;
 import com.citu.module.menduner.system.dal.mysql.position.PositionMapper;
 import com.citu.module.menduner.system.dal.mysql.unfit.UnfitCandidateMapper;
+import com.citu.module.menduner.system.enums.job.JobJoinFairStatus;
 import com.citu.module.menduner.system.enums.job.JobStatusEnum;
 import com.citu.module.menduner.system.service.area.AreaService;
 import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
@@ -52,6 +53,8 @@ import com.citu.module.menduner.system.util.ESQueryBuildUtils;
 import com.citu.module.menduner.system.util.RedisUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
 import org.elasticsearch.search.sort.SortBuilders;
 import org.elasticsearch.search.sort.SortOrder;
@@ -256,6 +259,8 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
             }
         }
         BoolQueryBuilder queryBuilder = ESQueryBuildUtils.jobSearch(reqVO);
+        queryBuilder.must(QueryBuilders.matchQuery("joinFairStatus", JobJoinFairStatus.NORMAL_JOB.getStatus()));
+//        queryBuilder.filter(new TermQueryBuilder("enterpriseId", LoginUserContext.getEnterpriseId()));
         NativeSearchQuery searchQuery = new NativeSearchQueryBuilder()
                 .withQuery(queryBuilder)
                 // 高亮
@@ -451,9 +456,14 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
 
     @Override
     @DSTransactional
-    public void importData(List<JobAdvertisedImportExcelVO> list) {
+    public void importData(List<JobAdvertisedImportExcelVO> list, Long  fairId ) {
         list.forEach(item -> {
             AppRecruitJobSaveReqVO job = JobAdvertisedConvert.INSTANCE.convert8(item);
+            
+            if(fairId > 0 ){
+                job.setSource("2");
+                job.setBizId(fairId);
+            }
             List<PositionDO> positionList = positionMapper.selectListByNameList(item.getPosition());
             if (CollUtil.isNotEmpty(positionList)) {
                 // 重复名字就取第一条

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/handler/JobFairOperateHandler.java

@@ -3,6 +3,7 @@ package com.citu.module.menduner.system.service.job.handler;
 import com.citu.module.menduner.system.controller.app.recruit.job.vo.joinJobFairReqVO;
 import com.citu.module.menduner.system.dal.dataobject.fair.FairWhiteDO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedDO;
+import com.citu.module.menduner.system.enums.job.JobJoinFairStatus;
 import com.citu.module.menduner.system.enums.job.JobSourceEnum;
 import com.citu.module.menduner.system.enums.job.JobStatusEnum;
 import com.citu.module.menduner.system.service.enterprise.EnterpriseService;
@@ -50,6 +51,8 @@ public class JobFairOperateHandler implements JobOperateHandler {
             if(null == fairWhite) {
                 throw exception(JOB_FAIR_NO_PERMISSION);
             }
+            job.setJoinFairStatus(JobJoinFairStatus.JOIN_FAIR_JOB.getStatus());
+            job.setFairId(fairWhite.getJobFairId());
         }
     }
 
@@ -78,6 +81,10 @@ public class JobFairOperateHandler implements JobOperateHandler {
                     && ChronoUnit.HOURS.between(oldJob.getCreateTime(), LocalDateTime.now()) > 24) {
                 throw exception(MDE_JOB_ADVERTISED_TIME_ERROR_24);
             }
+            // TODO 招聘会职位无法编辑出招聘会
+//            job.setJoinFairStatus(JobJoinFairStatus.JOIN_FAIR_JOB.getStatus());
+//            job.setFairId(fairWhite.getJobFairId());
+
         }
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/util/ESQueryBuildUtils.java

@@ -85,7 +85,7 @@ public class ESQueryBuildUtils {
             if (null != payScope.getEnd()) {
                 // 小于等于
                 payScopeQuery.must(QueryBuilders.rangeQuery("payTo").lte(payScope.getEnd()));
-
+//                payScopeQuery.filter(QueryBuilders.eq)
             }
             boolQuery.filter(payScopeQuery);
         }