1、优化招聘会模块

2、修改招聘会相关表名

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/job/JobFairController.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/fair/FairController.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.admin.job;
+package com.citu.module.menduner.system.controller.admin.fair;
 
 
 import com.citu.framework.apilog.core.annotation.ApiAccessLog;
@@ -6,12 +6,16 @@ import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
+import com.citu.framework.common.util.string.StrUtils;
 import com.citu.framework.excel.core.util.ExcelUtils;
+import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseRespVO;
 import com.citu.module.menduner.system.controller.base.job.fair.JobFairPageReqVO;
 import com.citu.module.menduner.system.controller.base.job.fair.JobFairRespVO;
 import com.citu.module.menduner.system.controller.base.job.fair.JobFairSaveReqVO;
-import com.citu.module.menduner.system.dal.dataobject.job.JobFairDO;
-import com.citu.module.menduner.system.service.job.fair.JobFairService;
+import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
+import com.citu.module.menduner.system.dal.dataobject.fair.FairDO;
+import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
+import com.citu.module.menduner.system.service.fair.FairService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -23,7 +27,9 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static com.citu.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static com.citu.framework.common.pojo.CommonResult.success;
@@ -33,23 +39,26 @@ import static com.citu.framework.common.pojo.CommonResult.success;
 @RestController
 @RequestMapping("/menduner/system/job-fair")
 @Validated
-public class JobFairController {
+public class FairController {
 
     @Resource
-    private JobFairService jobFairService;
+    private FairService fairService;
+
+    @Resource
+    private EnterpriseMapper enterpriseMapper;
 
     @PostMapping("/create")
     @Operation(summary = "创建招聘会")
     @PreAuthorize("@ss.hasPermission('menduner:system:job-fair:create')")
     public CommonResult<Long> createJobFair(@Valid @RequestBody JobFairSaveReqVO createReqVO) {
-        return success(jobFairService.createJobFair(createReqVO));
+        return success(fairService.createJobFair(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新招聘会")
     @PreAuthorize("@ss.hasPermission('menduner:system:job-fair:update')")
     public CommonResult<Boolean> updateJobFair(@Valid @RequestBody JobFairSaveReqVO updateReqVO) {
-        jobFairService.updateJobFair(updateReqVO);
+        fairService.updateJobFair(updateReqVO);
         return success(true);
     }
 
@@ -58,7 +67,7 @@ public class JobFairController {
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('menduner:system:job-fair:delete')")
     public CommonResult<Boolean> deleteJobFair(@RequestParam("id") Long id) {
-        jobFairService.deleteJobFair(id);
+        fairService.deleteJobFair(id);
         return success(true);
     }
 
@@ -67,7 +76,7 @@ public class JobFairController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('menduner:system:job-fair:query')")
     public CommonResult<JobFairRespVO> getJobFair(@RequestParam("id") Long id) {
-        JobFairDO jobFair = jobFairService.getJobFair(id);
+        FairDO jobFair = fairService.getJobFair(id);
         return success(BeanUtils.toBean(jobFair, JobFairRespVO.class));
     }
 
@@ -75,7 +84,7 @@ public class JobFairController {
     @Operation(summary = "获得招聘会分页")
     @PreAuthorize("@ss.hasPermission('menduner:system:job-fair:query')")
     public CommonResult<PageResult<JobFairRespVO>> getJobFairPage(@Valid JobFairPageReqVO pageReqVO) {
-        PageResult<JobFairDO> pageResult = jobFairService.getJobFairPage(pageReqVO);
+        PageResult<FairDO> pageResult = fairService.getJobFairPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, JobFairRespVO.class));
     }
 
@@ -86,10 +95,37 @@ public class JobFairController {
     public void exportJobFairExcel(@Valid JobFairPageReqVO pageReqVO,
                                    HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<JobFairDO> list = jobFairService.getJobFairPage(pageReqVO).getList();
+        List<FairDO> list = fairService.getJobFairPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "招聘会.xls", "数据", JobFairRespVO.class,
                 BeanUtils.toBean(list, JobFairRespVO.class));
     }
 
+
+    @GetMapping("/get-white-enterprise")
+    @Operation(summary = "获得招聘会白名单企业")
+    public CommonResult<Map<String,Object>> getWhiteListByFairId() {
+        List<Long> enterpriseIds = fairService.getWhiteListByFairId(1L);
+        List<EnterpriseDO> enterpriseList = enterpriseMapper.selectBatchIds(enterpriseIds);
+        List<EnterpriseRespVO> respList = BeanUtils.toBean(enterpriseList, EnterpriseRespVO.class);
+        Map<String,Object> map=new HashMap<>();
+        map.put("fair", fairService.getJobFair(1L));
+        map.put("enterpriseList", respList);
+        return success(map);
+    }
+
+    @PutMapping("/add-white-list")
+    @Operation(summary = "添加企业白名单")
+    public CommonResult<Boolean> addWhiteList(@RequestParam("enterpriseIds") String enterpriseIds) {
+        fairService.addWhiteList(1L, StrUtils.splitToLong(enterpriseIds));
+        return success(true);
+    }
+
+    @PutMapping("/remove-white-list")
+    @Operation(summary = "移除企业白名单")
+    public CommonResult<Boolean> removeWhiteList(@RequestParam("enterpriseIds") String enterpriseIds) {
+        fairService.removeWhiteList(1L, StrUtils.splitToLong(enterpriseIds));
+        return success(true);
+    }
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/fair/AppJobFairController.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/fair/AppFairController.java

@@ -3,7 +3,7 @@ package com.citu.module.menduner.system.controller.app.jobhunt.fair;
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.module.menduner.system.controller.base.job.fair.JobFairRespVO;
-import com.citu.module.menduner.system.service.job.fair.JobFairService;
+import com.citu.module.menduner.system.service.fair.FairService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.validation.annotation.Validated;
@@ -20,15 +20,15 @@ import static com.citu.framework.common.pojo.CommonResult.success;
 @RestController
 @RequestMapping("/menduner/system/job-fair")
 @Validated
-public class AppJobFairController {
+public class AppFairController {
 
     @Resource
-    private JobFairService jobFairService;
+    private FairService fairService;
 
     @GetMapping("/list")
     @Operation(summary = "获得招聘会列表")
     public CommonResult<List<JobFairRespVO>> list() {
-        return success(BeanUtils.toBean(jobFairService.list(), JobFairRespVO.class));
+        return success(BeanUtils.toBean(fairService.list(), JobFairRespVO.class));
     }
 
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/flame/AppFlameJobController.java

@@ -8,6 +8,7 @@ import com.citu.module.menduner.system.controller.app.jobhunt.industry.vo.AppInd
 import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseDetailRespVO;
 import com.citu.module.menduner.system.enums.DictTypeConstants;
 import com.citu.module.menduner.system.service.enterprise.EnterpriseService;
+import com.citu.module.menduner.system.service.fair.FairService;
 import com.citu.module.menduner.system.service.job.JobIntegrationService;
 import com.citu.module.system.api.dict.DictDataApi;
 import com.citu.module.system.api.dict.dto.DictDataRespDTO;
@@ -35,7 +36,7 @@ import static com.citu.framework.common.pojo.CommonResult.success;
 public class AppFlameJobController {
 
     @Resource
-    private JobIntegrationService jobIntegrationService;
+    private FairService fairService;
 
     @Resource
     private EnterpriseService enterpriseService;
@@ -47,14 +48,14 @@ public class AppFlameJobController {
     @GetMapping("/page")
     @Operation(summary = "分页搜索职位")
     public CommonResult<PageResult<AppFlameJobRespVO>> getFlameJobPage(@Valid AppFlameJobPageReqVO reqVO) {
-        return success(jobIntegrationService.getFlameJobPage(reqVO));
+        return success(fairService.getFlameJobPage(reqVO));
     }
 
     @TenantIgnore
     @PostMapping("/page")
     @Operation(summary = "分页搜索职位")
     public CommonResult<PageResult<AppFlameJobRespVO>> getFlameJobPage2(@RequestBody @Valid AppFlameJobPageReqVO reqVO) {
-        return success(jobIntegrationService.getFlameJobPage(reqVO));
+        return success(fairService.getFlameJobPage(reqVO));
     }
 
     @GetMapping("/get/enterprise")

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

@@ -5,14 +5,11 @@ import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
 import com.citu.module.menduner.common.util.LoginUserContext;
-import com.citu.module.menduner.system.controller.app.recruit.job.vo.AppRecruitJobDetailRespVO;
 import com.citu.module.menduner.system.controller.app.recruit.job.vo.AppRecruitJobSimpleRespVO;
 import com.citu.module.menduner.system.controller.app.recruit.job.vo.joinJobFairReqVO;
 import com.citu.module.menduner.system.controller.base.job.fair.JobFairRespVO;
-import com.citu.module.menduner.system.convert.JobAdvertisedConvert;
+import com.citu.module.menduner.system.service.fair.FairService;
 import com.citu.module.menduner.system.service.job.JobAdvertisedService;
-import com.citu.module.menduner.system.service.job.JobIntegrationService;
-import com.citu.module.menduner.system.service.job.fair.JobFairService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.validation.annotation.Validated;
@@ -28,13 +25,10 @@ import static com.citu.framework.common.pojo.CommonResult.success;
 @RestController
 @RequestMapping("/menduner/system/recruit/job-fair")
 @Validated
-public class AppRecruitJobFairController {
+public class AppRecruitFairController {
 
     @Resource
-    private JobFairService jobFairService;
-
-    @Resource
-    private JobIntegrationService jobIntegrationService;
+    private FairService fairService;
 
     @Resource
     private JobAdvertisedService jobAdvertisedService;
@@ -43,14 +37,14 @@ public class AppRecruitJobFairController {
     @GetMapping("/list")
     @Operation(summary = "获得招聘会列表")
     public CommonResult<List<JobFairRespVO>> list() {
-        return success(BeanUtils.toBean(jobFairService.list(), JobFairRespVO.class));
+        return success(BeanUtils.toBean(fairService.list(), JobFairRespVO.class));
     }
 
     @PreAuthenticated
     @GetMapping("/get")
     @Operation(summary = "根据id查询招聘会")
     public CommonResult<JobFairRespVO> get(@RequestParam("id") Long id) {
-        return success(BeanUtils.toBean(jobFairService.getJobFair(id), JobFairRespVO.class));
+        return success(BeanUtils.toBean(fairService.getJobFair(id), JobFairRespVO.class));
     }
 
 
@@ -58,7 +52,7 @@ public class AppRecruitJobFairController {
     @PostMapping("/join")
     @Operation(summary = "企业将职位加入招聘会")
     public CommonResult<Boolean> joinJobFair(@RequestBody @Valid joinJobFairReqVO reqVO) {
-        jobIntegrationService.joinJobFair(reqVO);
+        fairService.joinJobFair(reqVO);
         return success(true);
     }
 
@@ -66,7 +60,7 @@ public class AppRecruitJobFairController {
     @PostMapping("/quit")
     @Operation(summary = "企业将职位移除招聘会")
     public CommonResult<Boolean> quitJobFair(@RequestBody @Valid joinJobFairReqVO reqVO) {
-        jobIntegrationService.quitJobFair(reqVO);
+        fairService.quitJobFair(reqVO);
         return success(true);
     }
 
@@ -74,7 +68,7 @@ public class AppRecruitJobFairController {
     @GetMapping("/get/by/job-fair")
     @Operation(summary = "根据招聘会id获取加入的职位信息")
     public CommonResult<List<AppRecruitJobSimpleRespVO>> getByJobFairId(@RequestParam("id") Long id) {
-        List<Long> jobIdList = jobIntegrationService
+        List<Long> jobIdList = fairService
                 .getJobIdListByJobFairIdAndEnterpriseId(id, LoginUserContext.getEnterpriseId());
         if (ObjectUtil.isEmpty(jobIdList)) {
             return success(null);

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/job/JobFairDO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/fair/FairDO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.dal.dataobject.job;
+package com.citu.module.menduner.system.dal.dataobject.fair;
 
 
 import com.baomidou.mybatisplus.annotation.KeySequence;
@@ -17,15 +17,15 @@ import java.util.List;
  *
  * @author Rayson
  */
-@TableName(value = "mde_job_fair",autoResultMap = true)
-@KeySequence("mde_job_fair_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@TableName(value = "mde_fair",autoResultMap = true)
+@KeySequence("mde_fair_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class JobFairDO extends TenantBaseDO {
+public class FairDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/job/JobFairDetailDO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/fair/FairDetailDO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.dal.dataobject.job;
+package com.citu.module.menduner.system.dal.dataobject.fair;
 
 
 import com.baomidou.mybatisplus.annotation.KeySequence;
@@ -12,15 +12,15 @@ import lombok.*;
  *
  * @author Rayson
  */
-@TableName("mde_job_fair_detail")
-@KeySequence("mde_job_fair_detail_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@TableName("mde_fair_detail")
+@KeySequence("mde_fair_detail_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class JobFairDetailDO extends TenantBaseDO {
+public class FairDetailDO extends TenantBaseDO {
 
     /**
      * id

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/fair/FairWhiteDO.java

@@ -0,0 +1,39 @@
+package com.citu.module.menduner.system.dal.dataobject.fair;
+
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
+import lombok.*;
+
+/**
+ * 招聘会企业白名单 DO
+ *
+ * @author Rayson
+ */
+@TableName("mde_fair_white")
+@KeySequence("mde_fair_white_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class FairWhiteDO extends TenantBaseDO {
+
+    /**
+     * id
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 招聘会id
+     */
+    private Long jobFairId;
+
+    /**
+     * 企业id
+     */
+    private Long enterpriseId;
+}

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

@@ -1,14 +1,13 @@
-package com.citu.module.menduner.system.dal.mysql.job;
+package com.citu.module.menduner.system.dal.mysql.fair;
 
 
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.citu.framework.mybatis.core.mapper.BaseMapperX;
-import com.citu.framework.tenant.core.aop.TenantIgnore;
 import com.citu.module.menduner.system.controller.app.jobhunt.flame.AppFlameJobPageReqVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.flame.AppFlameJobRespVO;
-import com.citu.module.menduner.system.dal.dataobject.job.JobFairDetailDO;
+import com.citu.module.menduner.system.dal.dataobject.fair.FairDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -20,7 +19,7 @@ import java.util.List;
  * @author Rayson
  */
 @Mapper
-public interface JobFairDetailMapper extends BaseMapperX<JobFairDetailDO> {
+public interface FairDetailMapper extends BaseMapperX<FairDetailDO> {
 
 
 
@@ -28,8 +27,8 @@ public interface JobFairDetailMapper extends BaseMapperX<JobFairDetailDO> {
     IPage<AppFlameJobRespVO> search(Page<?> page, @Param("reqVO") AppFlameJobPageReqVO reqVO);
 
 
-    default List<JobFairDetailDO> selectByJobFairIdAndEnterpriseIdList(Long jobFairId, Long enterpriseId) {
-        return selectList(JobFairDetailDO::getJobFairId, jobFairId, JobFairDetailDO::getEnterpriseId, enterpriseId);
+    default List<FairDetailDO> selectByJobFairIdAndEnterpriseIdList(Long jobFairId, Long enterpriseId) {
+        return selectList(FairDetailDO::getJobFairId, jobFairId, FairDetailDO::getEnterpriseId, enterpriseId);
     }
 
 }

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

@@ -0,0 +1,31 @@
+package com.citu.module.menduner.system.dal.mysql.fair;
+
+
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.mybatis.core.mapper.BaseMapperX;
+import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.citu.module.menduner.system.controller.base.job.fair.JobFairPageReqVO;
+import com.citu.module.menduner.system.dal.dataobject.fair.FairDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 招聘会 Mapper
+ *
+ * @author Rayson
+ */
+@Mapper
+public interface FairMapper extends BaseMapperX<FairDO> {
+
+    default PageResult<FairDO> selectPage(JobFairPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<FairDO>()
+                .eqIfPresent(FairDO::getType, reqVO.getType())
+                .likeIfPresent(FairDO::getTitle, reqVO.getTitle())
+                .likeIfPresent(FairDO::getSlogan, reqVO.getSlogan())
+                .betweenIfPresent(FairDO::getStartTime, reqVO.getStartTime())
+                .betweenIfPresent(FairDO::getEndTime, reqVO.getEndTime())
+                .eqIfPresent(FairDO::getVipRequire, reqVO.getVipRequire())
+                .betweenIfPresent(FairDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(FairDO::getId));
+    }
+
+}

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

@@ -0,0 +1,24 @@
+package com.citu.module.menduner.system.dal.mysql.fair;
+
+import com.citu.framework.mybatis.core.mapper.BaseMapperX;
+import com.citu.module.menduner.system.dal.dataobject.fair.FairWhiteDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 招聘会企业白名单 Mapper
+ *
+ * @author Rayson
+ */
+@Mapper
+public interface FairWhiteMapper extends BaseMapperX<FairWhiteDO> {
+
+    default FairWhiteDO selectByJobFairIdAndEnterpriseId(Long fairId, Long enterpriseId) {
+        return selectOne(FairWhiteDO::getJobFairId, fairId, FairWhiteDO::getEnterpriseId, enterpriseId);
+    }
+
+    default List<FairWhiteDO> selectByJobFairIdList(Long fairId) {
+        return selectList(FairWhiteDO::getJobFairId, fairId);
+    }
+}

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

@@ -1,31 +0,0 @@
-package com.citu.module.menduner.system.dal.mysql.job;
-
-
-import com.citu.framework.common.pojo.PageResult;
-import com.citu.framework.mybatis.core.mapper.BaseMapperX;
-import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.citu.module.menduner.system.controller.base.job.fair.JobFairPageReqVO;
-import com.citu.module.menduner.system.dal.dataobject.job.JobFairDO;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 招聘会 Mapper
- *
- * @author Rayson
- */
-@Mapper
-public interface JobFairMapper extends BaseMapperX<JobFairDO> {
-
-    default PageResult<JobFairDO> selectPage(JobFairPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<JobFairDO>()
-                .eqIfPresent(JobFairDO::getType, reqVO.getType())
-                .likeIfPresent(JobFairDO::getTitle, reqVO.getTitle())
-                .likeIfPresent(JobFairDO::getSlogan, reqVO.getSlogan())
-                .betweenIfPresent(JobFairDO::getStartTime, reqVO.getStartTime())
-                .betweenIfPresent(JobFairDO::getEndTime, reqVO.getEndTime())
-                .eqIfPresent(JobFairDO::getVipRequire, reqVO.getVipRequire())
-                .betweenIfPresent(JobFairDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(JobFairDO::getId));
-    }
-
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/register/EnterpriseRegisterServiceImpl.java

@@ -264,7 +264,7 @@ public class EnterpriseRegisterServiceImpl implements EnterpriseRegisterService
             MdeUserDO userDO = mdeUserService.getUserByPhone(contact.getPhone());
             if (null == userDO) {
                 // 没有就创建
-                mdeUserService.createUserIfAbsent(contact.getPhone(), getClientIP(), getTerminal().toString());
+                userDO =  mdeUserService.createUserIfAbsent(contact.getPhone(), getClientIP(), getTerminal().toString());
                 // 表示  userDO.getId() 因为企业用户注册, 所以加积分
                 pointOperateProducer.send(EventAsyncConfirmMessage.builder()
                         // 给谁加,谁申请给谁加

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/vip/EnterpriseEntitlementServiceImpl.java

@@ -6,16 +6,20 @@ import com.citu.module.menduner.system.controller.base.enterprise.vip.Enterprise
 import com.citu.module.menduner.system.controller.base.enterprise.vip.EnterpriseEntitlementRespVO;
 import com.citu.module.menduner.system.controller.base.enterprise.vip.EnterpriseEntitlementSaveReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.vip.EnterprisePackageRespVO;
+import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseEntitlementDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterprisePackageDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseEntitlementMapper;
+import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
 import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 
+import java.time.LocalDateTime;
+
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.ENTERPRISE_ENTITLEMENT_NOT_EXISTS;
 
@@ -37,6 +41,9 @@ public class EnterpriseEntitlementServiceImpl implements EnterpriseEntitlementSe
     @Resource
     private EnterpriseUserBindService enterpriseBindService;
 
+    @Resource
+    private EnterpriseMapper enterpriseMapper;
+
     @Override
     public Long createEnterpriseEntitlement(EnterpriseEntitlementSaveReqVO createReqVO) {
         // 插入
@@ -98,6 +105,9 @@ public class EnterpriseEntitlementServiceImpl implements EnterpriseEntitlementSe
         EnterpriseUserBindDO userBind = enterpriseBindService.selectByEnterpriseIdAndUserId(enterpriseId, userId);
         if (enterpriseBindService.checkIsAdmin(userBind)) {
             // 管理员
+
+            EnterpriseDO enterprise = enterpriseMapper.selectById(enterpriseId);
+
             // 创建权益
             EnterpriseEntitlementDO insert = EnterpriseEntitlementDO.builder()
                     .enterpriseId(enterpriseId)
@@ -108,6 +118,14 @@ public class EnterpriseEntitlementServiceImpl implements EnterpriseEntitlementSe
                     .personMap(packageDO.getPersonMap())
                     .hireJob(packageDO.getHireJob())
                     .build();
+            // 如果vip标识大于0 并且vip时间没有过期,并且创建时间是在2024-1月1号之前的
+            if(Integer.valueOf(enterprise.getVipFlag()) > 0
+                    && enterprise.getVipExpireDate().isAfter(LocalDateTime.now())
+                    && enterprise.getCreateTime().isBefore(LocalDateTime.of(2024, 11, 1, 0, 0, 0))) {
+                // 旧系统会员
+                insert.setPublishJobCount(9999);
+                insert.setLookCvCount(9999);
+            }
             mapper.insert(insert);
             EnterpriseEntitlementRespVO respVO =
                     BeanUtils.toBean(insert, EnterpriseEntitlementRespVO.class);

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprisejob/EnterpriseJobServiceImpl.java

@@ -1,7 +1,6 @@
 package com.citu.module.menduner.system.service.enterprisejob;
 
 import cn.hutool.core.collection.CollUtil;
-import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.dict.core.DictFrameworkUtils;
@@ -12,25 +11,19 @@ import com.citu.module.menduner.system.controller.base.contact.EnterpriseUserCon
 import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseBaseSimpleRespVO;
 import com.citu.module.menduner.system.convert.EnterpriseConvert;
 import com.citu.module.menduner.system.convert.JobAdvertisedConvert;
-import com.citu.module.menduner.system.dal.dataobject.industry.IndustryDO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
-import com.citu.module.menduner.system.dal.mysql.job.JobAdvertisedExtendMapper;
 import com.citu.module.menduner.system.dal.mysql.job.JobAdvertisedMapper;
-import com.citu.module.menduner.system.dal.mysql.job.JobFairDetailMapper;
-import com.citu.module.menduner.system.dal.mysql.job.JobFairMapper;
 import com.citu.module.menduner.system.enums.DictTypeConstants;
 import com.citu.module.menduner.system.service.area.AreaService;
 import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
 import com.citu.module.menduner.system.service.industry.IndustryService;
-import com.citu.module.menduner.system.service.job.fair.JobFairService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.util.*;
-import java.util.stream.Collectors;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_JOB_ADVERTISED_NOT_EXISTS;
@@ -129,13 +122,13 @@ public class EnterpriseJobServiceImpl implements EnterpriseJobService {
             }
         });
         List<AppEnterpriseJobRespVO> list = result.getList();
-        Set<Long>  industrysIds =new HashSet<>();
+        Set<Long> industrysIds = new HashSet<>();
         for (AppEnterpriseJobRespVO appEnterpriseJobRespVO : list) {
-            appEnterpriseJobRespVO.getEnterprise().setScaleName(DictFrameworkUtils.getDictDataLabel(DictTypeConstants.MENDUNER_SCALE,appEnterpriseJobRespVO.getEnterprise().getScale()));
+            appEnterpriseJobRespVO.getEnterprise().setScaleName(DictFrameworkUtils.getDictDataLabel(DictTypeConstants.MENDUNER_SCALE, appEnterpriseJobRespVO.getEnterprise().getScale()));
             industrysIds.add(appEnterpriseJobRespVO.getEnterprise().getIndustryId());
         }
-        Map<Long,String> map =   industryService.getIndustryTitleByIds(industrysIds);
-        list.forEach(item->item.getEnterprise().setIndustryName(map.get(item.getEnterprise().getIndustryId())));
+        Map<Long, String> map = industryService.getIndustryTitleByIds(industrysIds);
+        list.forEach(item -> item.getEnterprise().setIndustryName(map.get(item.getEnterprise().getIndustryId())));
 
 
         return result;

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

@@ -0,0 +1,96 @@
+package com.citu.module.menduner.system.service.fair;
+
+
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.module.menduner.system.controller.app.jobhunt.flame.AppFlameJobPageReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.flame.AppFlameJobRespVO;
+import com.citu.module.menduner.system.controller.app.recruit.job.vo.joinJobFairReqVO;
+import com.citu.module.menduner.system.controller.base.job.fair.JobFairPageReqVO;
+import com.citu.module.menduner.system.controller.base.job.fair.JobFairSaveReqVO;
+import com.citu.module.menduner.system.dal.dataobject.fair.FairDO;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 招聘会 Service 接口
+ *
+ * @author Rayson
+ */
+public interface FairService {
+
+    /**
+     * 创建招聘会
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createJobFair(@Valid JobFairSaveReqVO createReqVO);
+
+    /**
+     * 更新招聘会
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateJobFair(@Valid JobFairSaveReqVO updateReqVO);
+
+    /**
+     * 删除招聘会
+     *
+     * @param id 编号
+     */
+    void deleteJobFair(Long id);
+
+    /**
+     * 获得招聘会
+     *
+     * @param id 编号
+     * @return 招聘会
+     */
+    FairDO getJobFair(Long id);
+
+    /**
+     * 获得招聘会分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 招聘会分页
+     */
+    PageResult<FairDO> getJobFairPage(JobFairPageReqVO pageReqVO);
+
+    /** 效验招聘会是否过期 **/
+    void checkJobFairExpired(FairDO fairDO);
+
+    /** 获取在时间段内的招聘会列表 **/
+    List<FairDO> list();
+
+    /**
+     * 企业将职位加入招聘会
+     *
+     **/
+    void joinJobFair(joinJobFairReqVO reqVO);
+
+    /**
+     * 企业将职位退出招聘会
+     **/
+    void quitJobFair(joinJobFairReqVO reqVO);
+
+
+    /**
+     * 火苗儿职位分页查询
+     **/
+    PageResult<AppFlameJobRespVO> getFlameJobPage(AppFlameJobPageReqVO reqVO);
+
+    /** 根据招聘会id和企业id获取参加招聘会的职位，返回id集合 **/
+    List<Long> getJobIdListByJobFairIdAndEnterpriseId(Long jobFairId, Long enterpriseId);
+
+
+
+    /** 添加白名单 **/
+    void addWhiteList(Long fairId,List<Long> enterpriseIds);
+
+    /** 移除白名单 **/
+    void removeWhiteList(Long fairId,List<Long> enterpriseIds);
+
+    /** 获取白名单企业，返回企业id **/
+    List<Long> getWhiteListByFairId(Long fairId);
+}

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

@@ -0,0 +1,249 @@
+package com.citu.module.menduner.system.service.fair;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.common.util.object.BeanUtils;
+import com.citu.framework.dict.core.DictFrameworkUtils;
+import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.citu.framework.mybatis.core.util.MyBatisUtils;
+import com.citu.module.menduner.common.util.LoginUserContext;
+import com.citu.module.menduner.system.controller.app.jobhunt.flame.AppFlameJobPageReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.flame.AppFlameJobRespVO;
+import com.citu.module.menduner.system.controller.app.recruit.job.vo.joinJobFairReqVO;
+import com.citu.module.menduner.system.controller.base.job.fair.JobFairPageReqVO;
+import com.citu.module.menduner.system.controller.base.job.fair.JobFairSaveReqVO;
+import com.citu.module.menduner.system.dal.dataobject.area.AreaDO;
+import com.citu.module.menduner.system.dal.dataobject.fair.FairWhiteDO;
+import com.citu.module.menduner.system.dal.dataobject.fair.FairDO;
+import com.citu.module.menduner.system.dal.dataobject.fair.FairDetailDO;
+import com.citu.module.menduner.system.dal.dataobject.major.MajorDO;
+import com.citu.module.menduner.system.dal.dataobject.position.PositionDO;
+import com.citu.module.menduner.system.dal.mysql.fair.FairDetailMapper;
+import com.citu.module.menduner.system.dal.mysql.fair.FairMapper;
+import com.citu.module.menduner.system.dal.mysql.fair.FairWhiteMapper;
+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.service.area.AreaService;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.citu.module.menduner.system.enums.DictTypeConstants.*;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.JOB_FAIR_NOT_EXISTS;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.JOB_FAIR_TIME_OVER;
+
+/**
+ * 招聘会 Service 实现类
+ *
+ * @author Rayson
+ */
+@Service
+@Validated
+public class FairServiceImpl implements FairService {
+
+    @Resource
+    private FairMapper fairMapper;
+
+    @Resource
+    private FairDetailMapper fairDetailMapper;
+
+    @Resource
+    private FairWhiteMapper fairWhiteMapper;
+
+    @Resource
+    private AreaService areaService;
+
+    @Resource
+    private PositionMapper positionMapper;
+
+    @Resource
+    private MajorMapper majorMapper;
+
+
+    @Override
+    public Long createJobFair(JobFairSaveReqVO createReqVO) {
+        // 插入
+        FairDO jobFair = BeanUtils.toBean(createReqVO, FairDO.class);
+        fairMapper.insert(jobFair);
+        // 返回
+        return jobFair.getId();
+    }
+
+    @Override
+    public void updateJobFair(JobFairSaveReqVO updateReqVO) {
+        // 校验存在
+        validateJobFairExists(updateReqVO.getId());
+        // 更新
+        FairDO updateObj = BeanUtils.toBean(updateReqVO, FairDO.class);
+        fairMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteJobFair(Long id) {
+        // 校验存在
+        validateJobFairExists(id);
+        // 删除
+        fairMapper.deleteById(id);
+    }
+
+    private FairDO validateJobFairExists(Long id) {
+        FairDO jobFair = fairMapper.selectById(id);
+        if (null == jobFair) {
+            throw exception(JOB_FAIR_NOT_EXISTS);
+        }
+        return jobFair;
+    }
+
+    @Override
+    public FairDO getJobFair(Long id) {
+        return validateJobFairExists(id);
+    }
+
+    @Override
+    public PageResult<FairDO> getJobFairPage(JobFairPageReqVO pageReqVO) {
+        return fairMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public void checkJobFairExpired(FairDO fairDO) {
+        LocalDateTime now = LocalDateTime.now();
+        // 检查是否在时间范围内
+        if (now.isBefore(fairDO.getStartTime()) || now.isAfter(fairDO.getEndTime())) {
+            throw exception(JOB_FAIR_TIME_OVER);
+        }
+    }
+
+    @Override
+    public List<FairDO> list() {
+        LocalDate date = LocalDate.now();
+        return fairMapper.selectList(new LambdaQueryWrapperX<FairDO>()
+                .ge(FairDO::getEndTime, date.atStartOfDay())
+        );
+    }
+
+    @Override
+    public void joinJobFair(joinJobFairReqVO reqVO) {
+        FairDetailDO detailDO = fairDetailMapper
+                .selectOne(FairDetailDO::getEnterpriseId, LoginUserContext.getEnterpriseId(),
+                        FairDetailDO::getJobId, reqVO.getJobId());
+        if (null != detailDO) {
+            // 已经加入
+            return;
+        }
+        FairDO fairDO = getJobFair(reqVO.getJobFairId());
+        checkJobFairExpired(fairDO);
+
+        if (ObjectUtil.isNotEmpty(fairDO.getVipRequire())) {
+            // 效验是否符合会员要求
+            // 不符合抛出异常提示
+        }
+        FairDetailDO detail = FairDetailDO.builder()
+                .jobFairId(fairDO.getId())
+                .enterpriseId(LoginUserContext.getEnterpriseId())
+                .jobId(reqVO.getJobId())
+                .build();
+        fairDetailMapper.insert(detail);
+    }
+
+    @Override
+    public void quitJobFair(joinJobFairReqVO reqVO) {
+        FairDetailDO detailDO = fairDetailMapper
+                .selectOne(FairDetailDO::getEnterpriseId, LoginUserContext.getEnterpriseId(),
+                        FairDetailDO::getJobId, reqVO.getJobId());
+        if (null == detailDO) {
+            // 不在招聘会里面
+            return;
+        }
+        fairDetailMapper.deleteById(detailDO.getId());
+    }
+
+    @Override
+    public PageResult<AppFlameJobRespVO> getFlameJobPage(AppFlameJobPageReqVO reqVO) {
+        IPage<AppFlameJobRespVO> pageResult = fairDetailMapper.search(MyBatisUtils.buildPage(reqVO), reqVO);
+        PageResult<AppFlameJobRespVO> result = new PageResult<>(pageResult.getRecords(), pageResult.getTotal());
+        for (AppFlameJobRespVO record : result.getList()) {
+            if (StringUtils.hasText(record.getJob().getPayUnit())) {
+                record.getJob().setPayUnit(DictFrameworkUtils.getDictDataLabel(MENDUNER_PAY_UNIT, record.getJob().getPayUnit()));
+            }
+            if (StringUtils.hasText(record.getJob().getExpType())) {
+                record.getJob().setExpType(DictFrameworkUtils.getDictDataLabel(MENDUNER_EXP_TYPE, record.getJob().getExpType()));
+            }
+            if (StringUtils.hasText(record.getJob().getEduType())) {
+                record.getJob().setEduType(DictFrameworkUtils.getDictDataLabel(MENDUNER_EDUCATION_TYPE, record.getJob().getEduType()));
+            }
+            if (null != record.getJob().getAreaId()) {
+                AreaDO area = areaService.getArea(record.getJob().getAreaId());
+                record.getJob().setAreaName(null != area ? area.getName() : null);
+            }
+            if (null != record.getJob().getPositionId()) {
+                PositionDO position = positionMapper.selectById(record.getJob().getPositionId());
+                record.getJob().setPositionName(null != position ? position.getNameCn() : null);
+            }
+            if (null != record.getJobExtend().getMajorId()) {
+                MajorDO major = majorMapper.selectById(record.getJobExtend().getMajorId());
+                record.getJobExtend().setMajorName(null != major ? major.getNameCn() : null);
+            }
+            if (StringUtils.hasText(record.getEnterprise().getFinancingStatus())) {
+                record.getEnterprise().setFinancingStatus(DictFrameworkUtils.getDictDataLabel(MENDUNER_FINANCING_STATUS, record.getEnterprise().getFinancingStatus()));
+            }
+            if (StringUtils.hasText(record.getEnterprise().getScale())) {
+                record.getEnterprise().setScale(DictFrameworkUtils.getDictDataLabel(MENDUNER_SCALE, record.getEnterprise().getScale()));
+            }
+            record.getJob().setStatus(DictFrameworkUtils.getDictDataLabel(MENDUNER_JOB_STATUS, record.getJob().getStatus()));
+        }
+        return result;
+    }
+
+    @Override
+    public List<Long> getJobIdListByJobFairIdAndEnterpriseId(Long jobFairId, Long enterpriseId) {
+        return fairDetailMapper.selectByJobFairIdAndEnterpriseIdList(jobFairId, enterpriseId)
+                .stream()
+                .map(FairDetailDO::getJobId)
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    @DSTransactional
+    public void addWhiteList(Long fairId,List<Long> enterpriseIds) {
+        for (Long enterpriseId : enterpriseIds) {
+            FairWhiteDO fairWhiteDO = fairWhiteMapper.selectByJobFairIdAndEnterpriseId(fairId, enterpriseId);
+            if(null != fairWhiteDO) {
+                return;
+            }
+            fairWhiteMapper.insert(FairWhiteDO.builder()
+                    .jobFairId(fairId)
+                    .enterpriseId(enterpriseId)
+                    .build());
+        }
+    }
+
+    @Override
+    @DSTransactional
+    public void removeWhiteList(Long fairId,List<Long> enterpriseIds) {
+        for (Long enterpriseId : enterpriseIds) {
+            FairWhiteDO fairWhiteDO = fairWhiteMapper.selectByJobFairIdAndEnterpriseId(fairId, enterpriseId);
+            if (null == fairWhiteDO) {
+                return;
+            }
+            fairWhiteMapper.deleteById(fairWhiteDO.getId());
+        }
+    }
+
+    @Override
+    public List<Long> getWhiteListByFairId(Long fairId) {
+        return fairWhiteMapper.selectByJobFairIdList(fairId)
+                .stream()
+                .map(FairWhiteDO::getEnterpriseId)
+                .collect(Collectors.toList());
+    }
+}

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

@@ -102,23 +102,4 @@ public interface JobIntegrationService {
      **/
     void importData(List<JobAdvertisedImportExcelVO> list);
 
-    /**
-     * 企业将职位加入招聘会
-     *
-     **/
-    void joinJobFair(joinJobFairReqVO reqVO);
-
-    /**
-     * 企业将职位退出招聘会
-     **/
-    void quitJobFair(joinJobFairReqVO reqVO);
-
-    /**
-     * 火苗儿职位分页查询
-     **/
-    PageResult<AppFlameJobRespVO> getFlameJobPage(AppFlameJobPageReqVO reqVO);
-
-    /** 根据招聘会id和企业id获取参加招聘会的职位，返回id集合 **/
-    List<Long> getJobIdListByJobFairIdAndEnterpriseId(Long jobFairId, Long enterpriseId);
-
 }

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

@@ -1,17 +1,10 @@
 package com.citu.module.menduner.system.service.job;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
-import com.citu.framework.dict.core.DictFrameworkUtils;
-import com.citu.framework.mybatis.core.util.MyBatisUtils;
-import com.citu.framework.tenant.core.aop.TenantIgnore;
 import com.citu.module.menduner.common.util.LoginUserContext;
-import com.citu.module.menduner.system.controller.app.jobhunt.flame.AppFlameJobPageReqVO;
-import com.citu.module.menduner.system.controller.app.jobhunt.flame.AppFlameJobRespVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.job.vo.AppJobAdvertisedRespVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.job.vo.AppJobAdvertisedSearchPageReqVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.job.vo.AppJobCvLookRespVO;
@@ -30,23 +23,19 @@ import com.citu.module.menduner.system.convert.JobAdvertisedConvert;
 import com.citu.module.menduner.system.dal.dataobject.area.AreaDO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedDO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobCvRelDO;
-import com.citu.module.menduner.system.dal.dataobject.job.JobFairDO;
-import com.citu.module.menduner.system.dal.dataobject.job.JobFairDetailDO;
-import com.citu.module.menduner.system.dal.dataobject.major.MajorDO;
 import com.citu.module.menduner.system.dal.dataobject.position.PositionDO;
 import com.citu.module.menduner.system.dal.es.job.ESJobAdvertisedMergeDO;
 import com.citu.module.menduner.system.dal.mysql.area.AreaMapper;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
 import com.citu.module.menduner.system.dal.mysql.job.JobAdvertisedMapper;
 import com.citu.module.menduner.system.dal.mysql.job.JobCvRelMapper;
-import com.citu.module.menduner.system.dal.mysql.job.JobFairDetailMapper;
 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.service.area.AreaService;
 import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
 import com.citu.module.menduner.system.service.interview.InterviewInviteService;
-import com.citu.module.menduner.system.service.job.fair.JobFairService;
+import com.citu.module.menduner.system.service.fair.FairService;
 import com.citu.module.menduner.system.util.ESQueryBuildUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.elasticsearch.index.query.BoolQueryBuilder;
@@ -60,7 +49,6 @@ import org.springframework.data.elasticsearch.core.SearchHits;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
@@ -69,8 +57,6 @@ import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.citu.module.menduner.system.enums.DictTypeConstants.*;
-
 @Slf4j
 @Service
 @Validated
@@ -113,10 +99,7 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
     private ElasticsearchRestTemplate elasticsearchTemplate;
 
     @Resource
-    private JobFairService jobFairService;
-
-    @Resource
-    private JobFairDetailMapper jobFairDetailMapper;
+    private FairService fairService;
 
 
     /**
@@ -383,84 +366,4 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
         });
     }
 
-    @Override
-    public void joinJobFair(joinJobFairReqVO reqVO) {
-        JobFairDetailDO detailDO = jobFairDetailMapper
-                .selectOne(JobFairDetailDO::getEnterpriseId, LoginUserContext.getEnterpriseId(),
-                        JobFairDetailDO::getJobId, reqVO.getJobId());
-        if (null != detailDO) {
-            // 已经加入
-            return;
-        }
-        JobFairDO jobFairDO = jobFairService.getJobFair(reqVO.getJobFairId());
-        jobFairService.checkJobFairExpired(jobFairDO);
-
-        if (ObjectUtil.isNotEmpty(jobFairDO.getVipRequire())) {
-            // 效验是否符合会员要求
-            // 不符合抛出异常提示
-        }
-        JobFairDetailDO detail = JobFairDetailDO.builder()
-                .jobFairId(jobFairDO.getId())
-                .enterpriseId(LoginUserContext.getEnterpriseId())
-                .jobId(reqVO.getJobId())
-                .build();
-        jobFairDetailMapper.insert(detail);
-    }
-
-    @Override
-    public void quitJobFair(joinJobFairReqVO reqVO) {
-        JobFairDetailDO detailDO = jobFairDetailMapper
-                .selectOne(JobFairDetailDO::getEnterpriseId, LoginUserContext.getEnterpriseId(),
-                        JobFairDetailDO::getJobId, reqVO.getJobId());
-        if (null == detailDO) {
-            // 不在招聘会里面
-            return;
-        }
-        jobFairDetailMapper.deleteById(detailDO.getId());
-    }
-
-    @Override
-    public PageResult<AppFlameJobRespVO> getFlameJobPage(AppFlameJobPageReqVO reqVO) {
-        IPage<AppFlameJobRespVO> pageResult = jobFairDetailMapper.search(MyBatisUtils.buildPage(reqVO), reqVO);
-        PageResult<AppFlameJobRespVO> result = new PageResult<>(pageResult.getRecords(), pageResult.getTotal());
-        for (AppFlameJobRespVO record : result.getList()) {
-            if (StringUtils.hasText(record.getJob().getPayUnit())) {
-                record.getJob().setPayUnit(DictFrameworkUtils.getDictDataLabel(MENDUNER_PAY_UNIT, record.getJob().getPayUnit()));
-            }
-            if (StringUtils.hasText(record.getJob().getExpType())) {
-                record.getJob().setExpType(DictFrameworkUtils.getDictDataLabel(MENDUNER_EXP_TYPE, record.getJob().getExpType()));
-            }
-            if (StringUtils.hasText(record.getJob().getEduType())) {
-                record.getJob().setEduType(DictFrameworkUtils.getDictDataLabel(MENDUNER_EDUCATION_TYPE, record.getJob().getEduType()));
-            }
-            if (null != record.getJob().getAreaId()) {
-                AreaDO area = areaService.getArea(record.getJob().getAreaId());
-                record.getJob().setAreaName(null != area ? area.getName() : null);
-            }
-            if (null != record.getJob().getPositionId()) {
-                PositionDO position = positionMapper.selectById(record.getJob().getPositionId());
-                record.getJob().setPositionName(null != position ? position.getNameCn() : null);
-            }
-            if (null != record.getJobExtend().getMajorId()) {
-                MajorDO major = majorMapper.selectById(record.getJobExtend().getMajorId());
-                record.getJobExtend().setMajorName(null != major ? major.getNameCn() : null);
-            }
-            if (StringUtils.hasText(record.getEnterprise().getFinancingStatus())) {
-                record.getEnterprise().setFinancingStatus(DictFrameworkUtils.getDictDataLabel(MENDUNER_FINANCING_STATUS, record.getEnterprise().getFinancingStatus()));
-            }
-            if (StringUtils.hasText(record.getEnterprise().getScale())) {
-                record.getEnterprise().setScale(DictFrameworkUtils.getDictDataLabel(MENDUNER_SCALE, record.getEnterprise().getScale()));
-            }
-            record.getJob().setStatus(DictFrameworkUtils.getDictDataLabel(MENDUNER_JOB_STATUS, record.getJob().getStatus()));
-        }
-        return result;
-    }
-
-    @Override
-    public List<Long> getJobIdListByJobFairIdAndEnterpriseId(Long jobFairId, Long enterpriseId) {
-        return jobFairDetailMapper.selectByJobFairIdAndEnterpriseIdList(jobFairId,  enterpriseId)
-                .stream()
-                .map(JobFairDetailDO::getJobId)
-                .collect(Collectors.toList());
-    }
 }

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

@@ -1,62 +0,0 @@
-package com.citu.module.menduner.system.service.job.fair;
-
-
-import com.citu.framework.common.pojo.PageResult;
-import com.citu.module.menduner.system.controller.base.job.fair.JobFairPageReqVO;
-import com.citu.module.menduner.system.controller.base.job.fair.JobFairSaveReqVO;
-import com.citu.module.menduner.system.dal.dataobject.job.JobFairDO;
-
-import javax.validation.Valid;
-import java.util.List;
-
-/**
- * 招聘会 Service 接口
- *
- * @author Rayson
- */
-public interface JobFairService {
-
-    /**
-     * 创建招聘会
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createJobFair(@Valid JobFairSaveReqVO createReqVO);
-
-    /**
-     * 更新招聘会
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateJobFair(@Valid JobFairSaveReqVO updateReqVO);
-
-    /**
-     * 删除招聘会
-     *
-     * @param id 编号
-     */
-    void deleteJobFair(Long id);
-
-    /**
-     * 获得招聘会
-     *
-     * @param id 编号
-     * @return 招聘会
-     */
-    JobFairDO getJobFair(Long id);
-
-    /**
-     * 获得招聘会分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 招聘会分页
-     */
-    PageResult<JobFairDO> getJobFairPage(JobFairPageReqVO pageReqVO);
-
-    /** 效验招聘会是否过期 **/
-    void checkJobFairExpired(JobFairDO jobFairDO);
-
-    /** 获取在时间段内的招聘会列表 **/
-    List<JobFairDO> list();
-}

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

@@ -1,96 +0,0 @@
-package com.citu.module.menduner.system.service.job.fair;
-
-
-import com.citu.framework.common.pojo.PageResult;
-import com.citu.framework.common.util.object.BeanUtils;
-import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.citu.module.menduner.system.controller.base.job.fair.JobFairPageReqVO;
-import com.citu.module.menduner.system.controller.base.job.fair.JobFairSaveReqVO;
-import com.citu.module.menduner.system.dal.dataobject.job.JobFairDO;
-import com.citu.module.menduner.system.dal.mysql.job.JobFairMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
-import javax.annotation.Resource;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.List;
-
-import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.JOB_FAIR_NOT_EXISTS;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.JOB_FAIR_TIME_OVER;
-
-/**
- * 招聘会 Service 实现类
- *
- * @author Rayson
- */
-@Service
-@Validated
-public class JobFairServiceImpl implements JobFairService {
-
-    @Resource
-    private JobFairMapper jobFairMapper;
-
-    @Override
-    public Long createJobFair(JobFairSaveReqVO createReqVO) {
-        // 插入
-        JobFairDO jobFair = BeanUtils.toBean(createReqVO, JobFairDO.class);
-        jobFairMapper.insert(jobFair);
-        // 返回
-        return jobFair.getId();
-    }
-
-    @Override
-    public void updateJobFair(JobFairSaveReqVO updateReqVO) {
-        // 校验存在
-        validateJobFairExists(updateReqVO.getId());
-        // 更新
-        JobFairDO updateObj = BeanUtils.toBean(updateReqVO, JobFairDO.class);
-        jobFairMapper.updateById(updateObj);
-    }
-
-    @Override
-    public void deleteJobFair(Long id) {
-        // 校验存在
-        validateJobFairExists(id);
-        // 删除
-        jobFairMapper.deleteById(id);
-    }
-
-    private JobFairDO validateJobFairExists(Long id) {
-        JobFairDO jobFair = jobFairMapper.selectById(id);
-        if (null == jobFair) {
-            throw exception(JOB_FAIR_NOT_EXISTS);
-        }
-        return jobFair;
-    }
-
-    @Override
-    public JobFairDO getJobFair(Long id) {
-        return validateJobFairExists(id);
-    }
-
-    @Override
-    public PageResult<JobFairDO> getJobFairPage(JobFairPageReqVO pageReqVO) {
-        return jobFairMapper.selectPage(pageReqVO);
-    }
-
-    @Override
-    public void checkJobFairExpired(JobFairDO jobFairDO) {
-        LocalDateTime now = LocalDateTime.now();
-        // 检查是否在时间范围内
-        if (now.isBefore(jobFairDO.getStartTime()) || now.isAfter(jobFairDO.getEndTime())) {
-            throw exception(JOB_FAIR_TIME_OVER);
-        }
-    }
-
-    @Override
-    public List<JobFairDO> list() {
-        LocalDate date = LocalDate.now();
-        return jobFairMapper.selectList(new LambdaQueryWrapperX<JobFairDO>()
-                .ge(JobFairDO::getEndTime, date.atStartOfDay())
-        );
-    }
-}

menduner/menduner-system-biz/src/main/resources/mapper/job/JobFairDetailMapper.xml → menduner/menduner-system-biz/src/main/resources/mapper/fair/FairDetailMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.citu.module.menduner.system.dal.mysql.job.JobFairDetailMapper">
+<mapper namespace="com.citu.module.menduner.system.dal.mysql.fair.FairDetailMapper">
 
 
     <resultMap id="AppFlameJobRespVOResultMap"
@@ -93,8 +93,8 @@
 <!--       b.business_url  -->
 
         from
-        mde_job_fair as f
-        inner join mde_job_fair_detail as d on f.id = d.job_fair_id
+        mde_fair as f
+        inner join mde_fair_detail as d on f.id = d.job_fair_id
         inner join mde_job_advertised as a on d.job_id = a.id
         inner join mde_job_advertised_extend as x on a.id = x.job_id
         inner join mde_enterprise as e on a.enterprise_id = e.id

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/job/JobFairServiceImplTest.java → menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/job/FairServiceImplTest.java

@@ -5,9 +5,9 @@ import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.test.core.ut.BaseDbUnitTest;
 import com.citu.module.menduner.system.controller.base.job.fair.JobFairPageReqVO;
 import com.citu.module.menduner.system.controller.base.job.fair.JobFairSaveReqVO;
-import com.citu.module.menduner.system.dal.dataobject.job.JobFairDO;
-import com.citu.module.menduner.system.dal.mysql.job.JobFairMapper;
-import com.citu.module.menduner.system.service.job.fair.JobFairServiceImpl;
+import com.citu.module.menduner.system.dal.dataobject.fair.FairDO;
+import com.citu.module.menduner.system.dal.mysql.fair.FairMapper;
+import com.citu.module.menduner.system.service.fair.FairServiceImpl;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.Import;
@@ -24,18 +24,18 @@ import static com.citu.module.menduner.system.enums.ErrorCodeConstants.JOB_FAIR_
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
- * {@link JobFairServiceImpl} 的单元测试类
+ * {@link FairServiceImpl} 的单元测试类
  *
  * @author Rayson
  */
-@Import(JobFairServiceImpl.class)
-public class JobFairServiceImplTest extends BaseDbUnitTest {
+@Import(FairServiceImpl.class)
+public class FairServiceImplTest extends BaseDbUnitTest {
 
     @Resource
-    private JobFairServiceImpl jobFairService;
+    private FairServiceImpl jobFairService;
 
     @Resource
-    private JobFairMapper jobFairMapper;
+    private FairMapper fairMapper;
 
     @Test
     public void testCreateJobFair_success() {
@@ -47,15 +47,15 @@ public class JobFairServiceImplTest extends BaseDbUnitTest {
         // 断言
         assertNotNull(jobFairId);
         // 校验记录的属性是否正确
-        JobFairDO jobFair = jobFairMapper.selectById(jobFairId);
+        FairDO jobFair = fairMapper.selectById(jobFairId);
         assertPojoEquals(createReqVO, jobFair, "id");
     }
 
     @Test
     public void testUpdateJobFair_success() {
         // mock 数据
-        JobFairDO dbJobFair = randomPojo(JobFairDO.class);
-        jobFairMapper.insert(dbJobFair);// @Sql: 先插入出一条存在的数据
+        FairDO dbJobFair = randomPojo(FairDO.class);
+        fairMapper.insert(dbJobFair);// @Sql: 先插入出一条存在的数据
         // 准备参数
         JobFairSaveReqVO updateReqVO = randomPojo(JobFairSaveReqVO.class, o -> {
             o.setId(dbJobFair.getId()); // 设置更新的 ID
@@ -64,7 +64,7 @@ public class JobFairServiceImplTest extends BaseDbUnitTest {
         // 调用
         jobFairService.updateJobFair(updateReqVO);
         // 校验是否更新正确
-        JobFairDO jobFair = jobFairMapper.selectById(updateReqVO.getId()); // 获取最新的
+        FairDO jobFair = fairMapper.selectById(updateReqVO.getId()); // 获取最新的
         assertPojoEquals(updateReqVO, jobFair);
     }
 
@@ -80,15 +80,15 @@ public class JobFairServiceImplTest extends BaseDbUnitTest {
     @Test
     public void testDeleteJobFair_success() {
         // mock 数据
-        JobFairDO dbJobFair = randomPojo(JobFairDO.class);
-        jobFairMapper.insert(dbJobFair);// @Sql: 先插入出一条存在的数据
+        FairDO dbJobFair = randomPojo(FairDO.class);
+        fairMapper.insert(dbJobFair);// @Sql: 先插入出一条存在的数据
         // 准备参数
         Long id = dbJobFair.getId();
 
         // 调用
         jobFairService.deleteJobFair(id);
         // 校验数据不存在了
-        assertNull(jobFairMapper.selectById(id));
+        assertNull(fairMapper.selectById(id));
     }
 
     @Test
@@ -104,7 +104,7 @@ public class JobFairServiceImplTest extends BaseDbUnitTest {
     @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
     public void testGetJobFairPage() {
         // mock 数据
-        JobFairDO dbJobFair = randomPojo(JobFairDO.class, o -> { // 等会查询到
+        FairDO dbJobFair = randomPojo(FairDO.class, o -> { // 等会查询到
             o.setType(null);
             o.setTitle(null);
             o.setSlogan(null);
@@ -113,21 +113,21 @@ public class JobFairServiceImplTest extends BaseDbUnitTest {
             o.setVipRequire(null);
             o.setCreateTime(null);
         });
-        jobFairMapper.insert(dbJobFair);
+        fairMapper.insert(dbJobFair);
         // 测试 type 不匹配
-        jobFairMapper.insert(cloneIgnoreId(dbJobFair, o -> o.setType(null)));
+        fairMapper.insert(cloneIgnoreId(dbJobFair, o -> o.setType(null)));
         // 测试 title 不匹配
-        jobFairMapper.insert(cloneIgnoreId(dbJobFair, o -> o.setTitle(null)));
+        fairMapper.insert(cloneIgnoreId(dbJobFair, o -> o.setTitle(null)));
         // 测试 slogan 不匹配
-        jobFairMapper.insert(cloneIgnoreId(dbJobFair, o -> o.setSlogan(null)));
+        fairMapper.insert(cloneIgnoreId(dbJobFair, o -> o.setSlogan(null)));
         // 测试 startTime 不匹配
-        jobFairMapper.insert(cloneIgnoreId(dbJobFair, o -> o.setStartTime(null)));
+        fairMapper.insert(cloneIgnoreId(dbJobFair, o -> o.setStartTime(null)));
         // 测试 endTime 不匹配
-        jobFairMapper.insert(cloneIgnoreId(dbJobFair, o -> o.setEndTime(null)));
+        fairMapper.insert(cloneIgnoreId(dbJobFair, o -> o.setEndTime(null)));
         // 测试 vipRequire 不匹配
-        jobFairMapper.insert(cloneIgnoreId(dbJobFair, o -> o.setVipRequire(null)));
+        fairMapper.insert(cloneIgnoreId(dbJobFair, o -> o.setVipRequire(null)));
         // 测试 createTime 不匹配
-        jobFairMapper.insert(cloneIgnoreId(dbJobFair, o -> o.setCreateTime(null)));
+        fairMapper.insert(cloneIgnoreId(dbJobFair, o -> o.setCreateTime(null)));
         // 准备参数
         JobFairPageReqVO reqVO = new JobFairPageReqVO();
         reqVO.setType(null);
@@ -139,7 +139,7 @@ public class JobFairServiceImplTest extends BaseDbUnitTest {
         reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
 
         // 调用
-        PageResult<JobFairDO> pageResult = jobFairService.getJobFairPage(reqVO);
+        PageResult<FairDO> pageResult = jobFairService.getJobFairPage(reqVO);
         // 断言
         assertEquals(1, pageResult.getTotal());
         assertEquals(1, pageResult.getList().size());