1、增加优化火苗儿相关接口

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

@@ -2,7 +2,6 @@ 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.framework.security.core.annotations.PreAuthenticated;
 import com.citu.module.menduner.system.controller.base.job.fair.JobFairRespVO;
 import com.citu.module.menduner.system.service.job.fair.JobFairService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -26,7 +25,6 @@ public class AppJobFairController {
     @Resource
     private JobFairService jobFairService;
 
-    @PreAuthenticated
     @GetMapping("/list")
     @Operation(summary = "获得招聘会列表")
     public CommonResult<List<JobFairRespVO>> list() {

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

@@ -4,18 +4,28 @@ import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.module.menduner.system.controller.app.jobhunt.industry.vo.AppIndustryListReqVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.industry.vo.AppIndustrySimpleRespVO;
+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.job.JobIntegrationService;
+import com.citu.module.system.api.dict.DictDataApi;
+import com.citu.module.system.api.dict.dto.DictDataRespDTO;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static com.citu.framework.common.pojo.CommonResult.success;
 
@@ -29,9 +39,38 @@ public class AppFlameJobController {
     @Resource
     private JobIntegrationService jobIntegrationService;
 
+    @Resource
+    private EnterpriseService enterpriseService;
+
+    @Resource
+    private DictDataApi dictDataApi;
+
     @GetMapping("/page")
     @Operation(summary = "分页搜索职位")
     public CommonResult<PageResult<AppFlameJobRespVO>> getFlameJobPage(@Valid AppFlameJobPageReqVO reqVO) {
         return success(jobIntegrationService.getFlameJobPage(reqVO));
     }
+
+    @GetMapping("/get/enterprise")
+    @Operation(summary = "获得企业信息")
+    public CommonResult<EnterpriseDetailRespVO> getEnterprise(@RequestParam("id") Long id) {
+        EnterpriseDetailRespVO enterprise = enterpriseService.get(id);
+        return success(enterprise);
+    }
+
+    @GetMapping("/dict")
+    @Operation(summary = "获取需要的字典")
+    public CommonResult<Map<String,List<DictDataRespDTO>>> getDict() {
+        Map<String,List<DictDataRespDTO>> map=new HashMap<>();
+        map.put(DictTypeConstants.MENDUNER_JOB_TYPE,dictDataApi.getDictDataList(DictTypeConstants.MENDUNER_JOB_TYPE).getCheckedData());
+        map.put(DictTypeConstants.MENDUNER_PAY_TYPE,dictDataApi.getDictDataList(DictTypeConstants.MENDUNER_PAY_TYPE).getCheckedData());
+        map.put(DictTypeConstants.MENDUNER_PAY_UNIT,dictDataApi.getDictDataList(DictTypeConstants.MENDUNER_PAY_UNIT).getCheckedData());
+        map.put(DictTypeConstants.MENDUNER_SCALE,dictDataApi.getDictDataList(DictTypeConstants.MENDUNER_SCALE).getCheckedData());
+        map.put(DictTypeConstants.MENDUNER_FINANCING_STATUS,dictDataApi.getDictDataList(DictTypeConstants.MENDUNER_FINANCING_STATUS).getCheckedData());
+        map.put(DictTypeConstants.MENDUNER_BUSINESS_STATUS,dictDataApi.getDictDataList(DictTypeConstants.MENDUNER_BUSINESS_STATUS).getCheckedData());
+        map.put(DictTypeConstants.MENDUNER_EDUCATION_TYPE,dictDataApi.getDictDataList(DictTypeConstants.MENDUNER_EDUCATION_TYPE).getCheckedData());
+        map.put(DictTypeConstants.MENDUNER_EDUCATION_SYSTEM_TYPE,dictDataApi.getDictDataList(DictTypeConstants.MENDUNER_EDUCATION_SYSTEM_TYPE).getCheckedData());
+        map.put(DictTypeConstants.MENDUNER_EXP_TYPE,dictDataApi.getDictDataList(DictTypeConstants.MENDUNER_EXP_TYPE).getCheckedData());
+        return success(map);
+    }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/major/AppMajorController.java

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 import static com.citu.framework.common.pojo.CommonResult.success;
 
@@ -31,4 +32,15 @@ public class AppMajorController {
     public CommonResult<List<AppMajorRespVO>> search(@RequestParam("name") String name) {
         return success(majorService.searchByName(name));
     }
+    @GetMapping("/get")
+    @Operation(summary = "根据id查询专业")
+    public CommonResult<AppMajorRespVO> get(@RequestParam("id") Long id) {
+        return success(majorService.get(id));
+    }
+
+    @GetMapping("/get/all")
+    @Operation(summary = "查询所有专业")
+    public CommonResult<Map<String, List<AppMajorRespVO>>> getAll() {
+        return success(majorService.getAll());
+    }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/major/vo/AppMajorRespVO.java

@@ -10,6 +10,12 @@ public class AppMajorRespVO {
     @Schema(description = "id", example = "30317")
     private Long id;
 
+    @Schema(description = "编码", example = "30317")
+    private String code;
+
+    @Schema(description = "类别", example = "30317")
+    private String categorize;
+
     @Schema(description = "专业名称")
     private String nameCn;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/convert/MajorConvert.java

@@ -12,6 +12,8 @@ public interface MajorConvert {
 
     MajorConvert INSTANCE = Mappers.getMapper(MajorConvert.class);
 
+    AppMajorRespVO convert(MajorDO bean);
+
     List<AppMajorRespVO> convertList(List<MajorDO> list);
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/major/MajorDO.java

@@ -29,6 +29,14 @@ public class MajorDO extends TenantBaseDO {
      */
     @TableId
     private Long id;
+    /**
+     * 编码
+     */
+    private String code;
+    /**
+     * 类别
+     */
+    private String categorize;
     /**
      * 专业名称
      */

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/major/MajorMapper.java

@@ -43,7 +43,7 @@ public interface MajorMapper extends BaseMapperX<MajorDO> {
         );
     }
    default MajorDO selectById(Long id) {
-        return selectOne(MajorDO::getId, id);
+        return selectOne(MajorDO::getId, id,MajorDO::getStatus,MendunerStatusEnum.ENABLE.getStatus());
     }
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/major/MajorService.java

@@ -9,6 +9,7 @@ import com.citu.module.menduner.system.dal.dataobject.major.MajorDO;
 import com.citu.framework.common.pojo.PageResult;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 专业 Service 接口
@@ -61,4 +62,9 @@ public interface MajorService {
      * @return List<AppMajorRespVO>
      **/
     List<AppMajorRespVO> searchByName(String name);
+
+
+    AppMajorRespVO get(Long id);
+
+    Map<String, List<AppMajorRespVO>> getAll();
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/major/MajorServiceImpl.java

@@ -2,17 +2,21 @@ package com.citu.module.menduner.system.service.major;
 
 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.app.jobhunt.major.vo.AppMajorRespVO;
 import com.citu.module.menduner.system.controller.base.major.MajorPageReqVO;
 import com.citu.module.menduner.system.controller.base.major.MajorSaveReqVO;
-import com.citu.module.menduner.system.controller.app.jobhunt.major.vo.AppMajorRespVO;
 import com.citu.module.menduner.system.convert.MajorConvert;
 import com.citu.module.menduner.system.dal.dataobject.major.MajorDO;
 import com.citu.module.menduner.system.dal.mysql.major.MajorMapper;
+import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
+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_MAJOR_NOT_EXISTS;
@@ -75,4 +79,20 @@ public class MajorServiceImpl implements MajorService {
     public List<AppMajorRespVO> searchByName(String name) {
         return MajorConvert.INSTANCE.convertList(majorMapper.searchByName(name));
     }
+
+    @Override
+    public AppMajorRespVO get(Long id) {
+        return MajorConvert.INSTANCE.convert(majorMapper.selectById(id));
+    }
+
+    @Override
+    public Map<String, List<AppMajorRespVO>> getAll() {
+        List<MajorDO> list = majorMapper.selectList(new LambdaQueryWrapperX<MajorDO>()
+                .eq(MajorDO::getStatus, MendunerStatusEnum.ENABLE.getStatus())
+        );
+        List<AppMajorRespVO> respVOList = MajorConvert.INSTANCE.convertList(list);
+        // 分组
+        return respVOList.stream()
+                .collect(Collectors.groupingBy(AppMajorRespVO::getCategorize));
+    }
 }

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

@@ -59,7 +59,7 @@
                and f.id = #{jobFairId}
            </if>
            <if test="reqVO.content != null and reqVO.content != ''">
-               and (a.name like concat('%',#{content},'%') or e.name like concat('%',#{content},'%'))
+               and (a.name like concat('%',#{content},'%') or e.name like concat('%',#{content},'%')) or e.another_name like concat('%',#{content},'%'))
            </if>
            <if test="reqVO.areaId != null">
                and a.area_id = #{areaId}