1、优化招聘会白名单，增加排序接口

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

@@ -1,6 +1,7 @@
 package com.citu.module.menduner.system.controller.admin.fair;
 
 
+import cn.hutool.core.collection.CollUtil;
 import com.citu.framework.apilog.core.annotation.ApiAccessLog;
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.PageParam;
@@ -8,12 +9,16 @@ 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.fair.*;
 import com.citu.module.menduner.system.controller.base.fair.white.FairWhiteDetailRespVO;
 import com.citu.module.menduner.system.controller.base.fair.white.FairWhitePageReqVO;
 import com.citu.module.menduner.system.controller.base.fair.white.FairWhiteReqVO;
+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.dataobject.fair.FairWhiteDO;
 import com.citu.module.menduner.system.enums.MendunerStatusEnum;
+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.fair.FairWhiteService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -27,7 +32,10 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 import static com.citu.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static com.citu.framework.common.pojo.CommonResult.success;
@@ -45,6 +53,9 @@ public class FairController {
     @Resource
     private FairWhiteService fairWhiteService;
 
+    @Resource
+    private EnterpriseService enterpriseService;
+
     @PostMapping("/create")
     @Operation(summary = "创建招聘会")
     @PreAuthorize("@ss.hasPermission('menduner:system:job-fair:create')")
@@ -75,15 +86,57 @@ public class FairController {
     @PreAuthorize("@ss.hasPermission('menduner:system:job-fair:query')")
     public CommonResult<JobFairRespVO> getJobFair(@RequestParam("id") Long id) {
         FairDO jobFair = fairService.getJobFair(id);
-        return success(BeanUtils.toBean(jobFair, JobFairRespVO.class));
+        JobFairRespVO resp =
+                BeanUtils.toBean(jobFair, JobFairRespVO.class);
+        setTagSort(resp);
+        return success(resp);
+    }
+
+    public void setTagSort(JobFairRespVO resp) {
+        if (resp == null || !JobFairCategoryUpdateReqVO.ENTERPRISE.equals(resp.getCategory())
+                || CollUtil.isEmpty(resp.getTag())) {
+            return; // 提前返回，减少嵌套
+        }
+
+        // 获取招聘会白名单企业
+        List<FairWhiteDO> fairWhiteList = fairWhiteService.getByJobFairId(resp.getId());
+
+        // 过滤出 enterpriseId 的标签，并处理每个标签
+        resp.getTag().stream()
+                .filter(tag -> "enterpriseId".equals(tag.getKey())) // 过滤出 enterpriseId 的标签
+                .flatMap(tag -> tag.getContent().stream()) // 将标签内容扁平化
+                .forEach(value -> {
+                    Long enterpriseId = Long.valueOf(value.getValue());
+
+                    // 查找白名单顺序信息
+                    fairWhiteList.stream()
+                            .filter(fairWhite -> fairWhite.getEnterpriseId().equals(enterpriseId))
+                            .findFirst()
+                            .ifPresent(fairWhite -> value.setSort(fairWhite.getSort())); // 设置顺序信息
+                });
+
+        // 获取企业信息并添加到响应中
+        List<Long> enterpriseIdList = resp.getTag().stream()
+                .filter(tag -> "enterpriseId".equals(tag.getKey()))
+                .flatMap(tag -> tag.getContent().stream())
+                .map(value -> Long.valueOf(value.getValue()))
+                .collect(Collectors.toList());
+
+        List<EnterpriseDO> enterpriseList = enterpriseService.getByIdList(enterpriseIdList);
+        List<EnterpriseRespVO> enterpriseRespList = BeanUtils.toBean(enterpriseList, EnterpriseRespVO.class);
+        // 假设 resp 中有方法可以设置企业列表
+        resp.setEnterprise(enterpriseRespList);
     }
 
+
     @GetMapping("/page")
     @Operation(summary = "获得招聘会分页")
     @PreAuthorize("@ss.hasPermission('menduner:system:job-fair:query')")
     public CommonResult<PageResult<JobFairRespVO>> getJobFairPage(@Valid JobFairPageReqVO pageReqVO) {
         PageResult<FairDO> pageResult = fairService.getJobFairPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, JobFairRespVO.class));
+        PageResult<JobFairRespVO> resp = BeanUtils.toBean(pageResult, JobFairRespVO.class);
+        resp.getList().forEach(this::setTagSort);
+        return success(resp);
     }
 
     @GetMapping("/export-excel")
@@ -124,7 +177,10 @@ public class FairController {
     @PutMapping("/add-white-list")
     @Operation(summary = "添加企业白名单")
     public CommonResult<Boolean> addWhiteList(@Valid @RequestBody FairWhiteReqVO reqVO) {
-        fairWhiteService.addWhiteList(reqVO.getJobFairId(), StrUtils.splitToLong(reqVO.getEnterpriseIds()));
+        fairWhiteService.addWhiteList(
+                reqVO.getJobFairId(),
+                StrUtils.splitToLong(reqVO.getEnterpriseIds()),
+                reqVO.getSort());
         return success(true);
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/vo/EnterpriseBaseSimpleRespVO.java

@@ -29,7 +29,6 @@ public class EnterpriseBaseSimpleRespVO {
 
     private String scaleName;
 
-
     @Schema(description = "融资阶段（未融资，天使轮，A轮，B轮，C轮，D轮以上，已上市，不需要融资）", example = "1")
     private String financingStatus;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/fair/JobFairCategoryUpdateReqVO.java

@@ -20,6 +20,6 @@ public class JobFairCategoryUpdateReqVO {
     @Schema(description = "类别（0企业|1职位|2企业-职位）", example = "0")
     private String category;
 
-    @Schema(description = "自定义标签", example = "0")
+    @Schema(description = "自定义标签")
     private List<FairTagContent> tag;
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/fair/JobFairEnterpriseRespVO.java

@@ -1,21 +1,21 @@
 package com.citu.module.menduner.system.controller.base.fair;
 
+import com.citu.module.menduner.system.controller.app.jobhunt.job.vo.AppJobAdvertisedSimpleRespVO;
 import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseRespVO;
-import com.citu.module.menduner.system.controller.base.job.JobAdvertisedSimpleRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;
 
-@Schema(description = " 招聘会企业 Response VO")
+@Schema(description = "招聘会企业 Response VO")
 @Data
-public class JobFairEnterpriseRespVO extends EnterpriseRespVO{
+public class JobFairEnterpriseRespVO extends EnterpriseRespVO {
 
     @Schema(description = "招聘会id")
     private Long jobFairId;
 
     @Schema(description = "最后5个职位")
-    private List<JobAdvertisedSimpleRespVO> lastJobTop5;
+    private List<AppJobAdvertisedSimpleRespVO> lastJobTop5;
 
     @Schema(description = "职位总数")
     private Long jobCount;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/fair/JobFairRespVO.java

@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseRespVO;
 import com.citu.module.menduner.system.dal.dataobject.fair.FairTagContent;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -124,4 +125,7 @@ public class JobFairRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "tag属性标签内的企业信息")
+    private List<EnterpriseRespVO> enterprise;
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/fair/white/FairWhiteReqVO.java

@@ -18,4 +18,7 @@ public class FairWhiteReqVO {
 
     @Schema(description = "加入来源(0后台添加|1购买门票)", example = "1")
     private String source;
+
+    @Schema(description = "排序", example = "1")
+    private Integer sort;
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/fair/white/FairWhiteRespVO.java

@@ -40,6 +40,9 @@ public class FairWhiteRespVO {
     @Schema(description = "门票状态(0启用|1禁用)")
     private String admissionStatus;
 
+    @Schema(description = "0")
+    private Integer sort;
+
     @Schema(description = "招聘会信息")
     private JobFairRespVO jobFair;
 

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

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 招聘会标签
@@ -22,8 +23,10 @@ public class FairTagContent {
     @Schema(description = "标签key(例如职位的某个属性，positionId)")
     private String key;
     /**
-     * 标签值(职位的某个属性的匹配值)
+     * 标签属性
      */
-    @Schema(description = "标签值(职位的某个属性的匹配值)")
-    private List<String> value;
+    @Schema(description = "标签属性")
+    private List<ValueContent> content;
+
 }
+

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

@@ -4,6 +4,7 @@ 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 io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
 /**
@@ -71,4 +72,9 @@ public class FairWhiteDO extends TenantBaseDO {
      * 门票状态(0启用|1禁用)
      */
     private String admissionStatus;
+    /**
+     * 顺序
+     */
+    private Integer sort;
+
 }

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

@@ -0,0 +1,23 @@
+package com.citu.module.menduner.system.dal.dataobject.fair;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 招聘会标签值属性
+ **/
+@Data
+public class ValueContent {
+
+    /**
+     * 标签值(职位的某个属性的匹配值)
+     */
+    @Schema(description = "标签值(职位的某个属性的匹配值)")
+    private String value;
+
+    /**
+     * 如果是企业的话，填顺序
+     */
+    @Schema(description = "顺序")
+    private Integer sort;
+}

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

@@ -14,6 +14,7 @@ import com.citu.module.menduner.system.controller.base.fair.*;
 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.dataobject.fair.FairDetailDO;
+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.MendunerStatusEnum;
 import org.apache.ibatis.annotations.Mapper;
@@ -43,14 +44,14 @@ public interface FairDetailMapper extends BaseMapperX<FairDetailDO> {
         );
     }
 
-    default long selectCountByJobFairIdAndEnterpriseIdList(Long jobFairId, Long enterpriseId) {
+    default List<FairDetailDO> selectByJobFairIdAndEnterpriseIdList(Long jobFairId, Long enterpriseId) {
         MPJLambdaWrapperX<FairDetailDO> query = new MPJLambdaWrapperX<>();
         query.innerJoin(FairDO.class, FairDO::getId, FairDetailDO::getJobFairId);
         query.innerJoin(JobAdvertisedDO.class, JobAdvertisedDO::getId, FairDetailDO::getJobId);
         query.innerJoin(EnterpriseDO.class, EnterpriseDO::getId, FairDetailDO::getEnterpriseId);
         query.eq(FairDetailDO::getJobFairId, jobFairId);
         query.eq(FairDetailDO::getEnterpriseId, enterpriseId);
-        return selectCount(query);
+        return selectJoinList(FairDetailDO.class,query);
     }
 
 
@@ -102,6 +103,7 @@ public interface FairDetailMapper extends BaseMapperX<FairDetailDO> {
         query.selectAll(EnterpriseDO.class);
         query.innerJoin(FairDO.class, FairDO::getId, FairDetailDO::getJobFairId);
         query.innerJoin(EnterpriseDO.class, EnterpriseDO::getId, FairDetailDO::getEnterpriseId);
+        query.innerJoin(FairWhiteDO.class, FairWhiteDO::getEnterpriseId, FairDetailDO::getEnterpriseId);
         query.eqIfPresent(FairDetailDO::getJobFairId, reqVO.getJobFairId());
         if (StringUtils.hasText(reqVO.getKeyword())) {
             query.and(q -> q.likeIfExists(EnterpriseDO::getName, reqVO.getKeyword())
@@ -115,6 +117,7 @@ public interface FairDetailMapper extends BaseMapperX<FairDetailDO> {
             query.in(EnterpriseDO::getId, reqVO.getEnterpriseId());
         }
         query.groupBy(FairDetailDO::getEnterpriseId);
+        query.orderByDesc(FairWhiteDO::getSort);
         query.orderByDesc(EnterpriseDO::getVipFlag);
         query.orderByDesc(FairDetailDO::getCreateTime);
         query.orderByDesc(EnterpriseDO::getUpdateTime);

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

@@ -11,6 +11,8 @@ import com.citu.module.menduner.system.dal.dataobject.fair.FairDO;
 import com.citu.module.menduner.system.dal.dataobject.fair.FairWhiteDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 招聘会企业白名单 Mapper
  *
@@ -36,6 +38,10 @@ public interface FairWhiteMapper extends BaseMapperX<FairWhiteDO> {
         return selectJoinPage(reqVO, FairWhiteDetailRespVO.class, wrapper);
     }
 
+    default List<FairWhiteDO> selectByJobFairId(Long jobFairId) {
+        return selectList(FairWhiteDO::getJobFairId, jobFairId);
+    }
+
     default int deduct(Long enterpriseId, Long jobFairId, Integer num) {
         LambdaUpdateWrapper<FairWhiteDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<FairWhiteDO>()
                 .setSql("num = num - " + num)
@@ -52,4 +58,5 @@ public interface FairWhiteMapper extends BaseMapperX<FairWhiteDO> {
                 .eq(FairWhiteDO::getJobFairId, jobFairId);
         return update(null, lambdaUpdateWrapper);
     }
+
 }

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

@@ -54,6 +54,14 @@ public interface EnterpriseService {
      */
     EnterpriseDO getEnterprise(Long id);
 
+    /**
+     * 获得企业信息列表
+     *
+     * @param idList 企业信息编号集合
+     * @return 企业信息列表
+     */
+    List<EnterpriseDO> getByIdList(List<Long> idList);
+
     /**
      * 获得企业信息分页
      *

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

@@ -146,6 +146,11 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         return enterpriseMapper.selectById(id);
     }
 
+    @Override
+    public List<EnterpriseDO> getByIdList(List<Long> idList) {
+        return enterpriseMapper.selectByIds(idList);
+    }
+
     @Override
     public PageResult<EnterpriseDO> getEnterprisePage(EnterprisePageReqVO pageReqVO) {
         return enterpriseMapper.selectPage(pageReqVO);

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

@@ -42,10 +42,7 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -101,7 +98,7 @@ public class FairServiceImpl implements FairService {
                 .map(EnterpriseEntitlementDO::getEnterpriseId).collect(Collectors.toList());
         if (CollUtil.isNotEmpty(enterpriseIdList)) {
             // 加入白名单
-            fairWhiteService.addWhiteList(jobFair.getId(), enterpriseIdList);
+            fairWhiteService.addWhiteList(jobFair.getId(), enterpriseIdList, null);
         }
 
         return jobFair.getId();
@@ -178,16 +175,16 @@ public class FairServiceImpl implements FairService {
         reqVO.getTag().stream()
                 .filter(tag -> "enterpriseId".equals(tag.getKey())) // 过滤出 enterpriseId 的标签
                 .forEach(tag -> {
-                    // 将 List<String> 转为 List<Long>
-                    List<Long> enterpriseIds = tag.getValue().stream()
-                            .map(Long::valueOf)
-                            .collect(Collectors.toList());
+                    tag.getContent().forEach(value -> {
+                        Long enterpriseId = Long.valueOf(value.getValue());
+                        List<Long> idList = Collections.singletonList(enterpriseId);
+                        // 加入白名单
+                        fairWhiteService.addWhiteList(fairDO.getId(), idList, value.getSort());
+                        // 同步职位
+                        syncJob(enterpriseId, fairDO.getId());
+                    });
 
-                    // 加入白名单
-                    fairWhiteService.addWhiteList(fairDO.getId(), enterpriseIds);
 
-                    // 同步职位
-                    enterpriseIds.forEach(enterpriseId -> syncJob(enterpriseId, fairDO.getId()));
                 });
     }
 
@@ -398,10 +395,21 @@ public class FairServiceImpl implements FairService {
         PageResult<JobFairEnterpriseRespVO> result = fairDetailMapper.selectJobFairEnterprisePage(reqVO);
         result.getList().forEach(item -> {
             // 查询招聘会职位
-            long count =
-                    fairDetailMapper.selectCountByJobFairIdAndEnterpriseIdList(item.getJobFairId(), item.getId());
-            // 赋值
-            item.setJobCount(count);
+            List<FairDetailDO> fairDetailList =
+                    fairDetailMapper.selectByJobFairIdAndEnterpriseIdList(item.getJobFairId(), item.getId());
+            // 取出最新的5个职位
+            List<Long> jobIdList = fairDetailList.stream()
+                    .sorted(Comparator.comparing(FairDetailDO::getUpdateTime).reversed())
+                    .limit(5)
+                    .map(FairDetailDO::getJobId).collect(Collectors.toList());
+            if (ObjectUtil.isNotEmpty(jobIdList)) {
+                // 赋值
+                item.setLastJobTop5(jobAdvertisedService.getListByIds(jobIdList));
+                item.setJobCount((long) fairDetailList.size());
+            } else {
+                item.setJobCount(0L);
+            }
+
         });
         return result;
     }

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

@@ -22,7 +22,7 @@ public interface FairWhiteService {
     /**
      * 添加白名单
      **/
-    void addWhiteList(Long jobFairId, List<Long> enterpriseIds);
+    void addWhiteList(Long jobFairId, List<Long> enterpriseIds,Integer sort);
 
     /**
      * 移除白名单
@@ -66,4 +66,7 @@ public interface FairWhiteService {
 
     /** 标记为不是首次进入 **/
     void markFirstEnterFair(Long enterpriseId, Long jobFairId);
+
+    /** 根据招聘会id查询白名单 **/
+    List<FairWhiteDO> getByJobFairId(Long jobFairId);
 }

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

@@ -45,7 +45,7 @@ public class FairWhiteServiceImpl implements FairWhiteService {
 
     @Override
     @DSTransactional
-    public void addWhiteList(Long jobFairId, List<Long> enterpriseIds) {
+    public void addWhiteList(Long jobFairId, List<Long> enterpriseIds,Integer sort) {
         for (Long enterpriseId : enterpriseIds) {
             FairWhiteDO fairWhiteDO = get(enterpriseId, jobFairId);
             if (null != fairWhiteDO) {
@@ -55,6 +55,7 @@ public class FairWhiteServiceImpl implements FairWhiteService {
                     .source(JobFairWhiteSourceEnum.ADMIN.getSource())
                     .jobFairId(jobFairId)
                     .enterpriseId(enterpriseId)
+                    .sort(sort)
                     .first(false)
                     .build());
         }
@@ -156,4 +157,9 @@ public class FairWhiteServiceImpl implements FairWhiteService {
                 .set(FairWhiteDO::getFirst, true)
         );
     }
+
+    @Override
+    public List<FairWhiteDO> getByJobFairId(Long jobFairId) {
+        return mapper.selectByJobFairId(jobFairId);
+    }
 }