1.pc端添加足迹接口

2.修改移动端文件上传
3.es推荐岗位和岗位列表添加type

ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppFileController.java

@@ -2,10 +2,10 @@ package com.ruoyi.cms.controller.app;
 
 import com.ruoyi.common.core.domain.entity.File;
 import com.ruoyi.cms.service.IFileService;
-import com.ruoyi.common.annotation.BussinessLog;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -17,13 +17,13 @@ import java.util.List;
 public class AppFileController extends BaseController {
     @Autowired
     private IFileService fileService;
-    @BussinessLog(title = "上传文件")
+    @ApiOperation("上传文件")
     @PostMapping("/upload")
-    public AjaxResult uploadFile(@RequestParam("file") MultipartFile file, @RequestParam(value = "bussinessId",required = false) Long bussinessId) {
+    public AjaxResult uploadFile(@RequestParam("file") MultipartFile file, @RequestParam(value = "bussinessid",required = false) Long bussinessId) {
        return fileService.uploadFile(file,bussinessId);
     }
 
-    @BussinessLog(title = "获取附件列表")
+    @ApiOperation("获取附件列表")
     @GetMapping("/list")
     public TableDataInfo list(File file)
     {

ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.cms.controller.app;
 
+import com.ruoyi.cms.domain.AppReviewJob;
 import com.ruoyi.common.core.domain.entity.AppUser;
 import com.ruoyi.common.core.domain.entity.Company;
 import com.ruoyi.cms.domain.Job;
@@ -12,12 +13,15 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.cms.domain.vo.AppUserLky;
 import com.ruoyi.common.core.domain.model.RegisterBody;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SiteSecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -148,4 +152,21 @@ public class AppUserController extends BaseController
         AppUserLky appUserLky = appUserService.selectAppUserInfo(appUser);
         return AjaxResult.success(appUserLky);
     }
+
+    @PostMapping("/browse")
+    @ApiOperation("用户浏览")
+    public AjaxResult browse(@RequestBody AppReviewJob appReviewJob)
+    {
+        if(appReviewJob.getJobId()==null){
+            return AjaxResult.error("岗位id为空");
+        }
+        if(!SiteSecurityUtils.isLogin()){
+            return AjaxResult.error("用户未登录!");
+        }
+        if(StringUtils.isEmpty(appReviewJob.getReviewDate())){
+            appReviewJob.setReviewDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,new Date()));
+        }
+        appReviewJob.setUserId(SiteSecurityUtils.getUserId());
+        return toAjax(appReviewJobService.insertAppReviewJob(appReviewJob));
+    }
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java

@@ -17,7 +17,9 @@ import com.ruoyi.common.core.domain.entity.AppUser;
 import com.ruoyi.common.core.domain.entity.Company;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
@@ -28,6 +30,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -286,4 +289,29 @@ public class CmsJobController extends BaseController
         }
         return toAjax(jobCollectionService.pcCancel(jobCollection));
     }
+
+    @PostMapping("/browse")
+    @ApiOperation("岗位浏览")
+    public AjaxResult browse(@RequestBody AppReviewJob appReviewJob)
+    {
+        if(appReviewJob.getJobId()==null){
+            return AjaxResult.error("岗位id为空");
+        }
+        if(!SecurityUtils.isLogin()){
+            return AjaxResult.error("用户未登录!");
+        }
+        if(StringUtils.isEmpty(appReviewJob.getReviewDate())){
+            appReviewJob.setReviewDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,new Date()));
+        }
+        if(appReviewJob.getUserId()==null){
+            String idCard=RoleUtils.getCurrentUseridCard();
+            AppUser appUser=appUserService.selectAppuserByIdcard(idCard);
+            if(appUser==null){
+                return AjaxResult.error("用户信息未完善,请完善身份证信息!");
+            }else{
+                appReviewJob.setUserId(appUser.getUserId());
+            }
+        }
+        return toAjax(iAppReviewJobService.insertAppReviewJob(appReviewJob));
+    }
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IFileService.java

@@ -54,5 +54,5 @@ public interface IFileService
      */
     public int deleteFileByIds(Long[] ids);
 
-    AjaxResult uploadFile(MultipartFile file, Long bussinessId);
+    AjaxResult uploadFile(MultipartFile file, Long bussinessid);
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java

@@ -267,7 +267,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper,AppUser> imple
 
             //查询附件
             File fileParm=new File();
-            fileParm.setBussinessId(appUser.getUserId());
+            fileParm.setBussinessid(appUser.getUserId());
             List<File> files=fileMapper.selectFileList(fileParm);
             appUser.setFileList(files);
 

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java

@@ -431,6 +431,9 @@ public class ESJobSearchImpl implements IESJobSearchService
         if(!StringUtil.isEmptyOrNull(esJobSearch.getCode())){
             wrapper.and(x->x.eq(ESJobDocument::getCode,esJobSearch.getCode()));
         }
+        if(!StringUtil.isEmptyOrNull(esJobSearch.getType())){
+            wrapper.and(x->x.eq(ESJobDocument::getType,esJobSearch.getType()));
+        }
         if(esJobSearch.getJobId()!=null){
             wrapper.and(x->x.eq(ESJobDocument::getJobId,esJobSearch.getJobId()));
         }
@@ -509,6 +512,9 @@ public class ESJobSearchImpl implements IESJobSearchService
         if(!StringUtil.isEmptyOrNull(jobQuery.getCompanyNature())){
             wrapper.and(a->a.eq(ESJobDocument::getCompanyNature,jobQuery.getCompanyNature()));
         }
+        if(!StringUtil.isEmptyOrNull(jobQuery.getType())){
+            wrapper.and(a->a.eq(ESJobDocument::getType,jobQuery.getType()));
+        }
         if(Objects.nonNull(jobQuery.getOrder())){
             if (jobQuery.getOrder()==2){
                 wrapper.orderByDesc(ESJobDocument::getPostingDate);

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/FileServiceImpl.java

@@ -91,7 +91,7 @@ public class FileServiceImpl extends ServiceImpl<FileMapper, File> implements IF
     }
 
     @Override
-    public AjaxResult uploadFile(MultipartFile file, Long bussinessId) {
+    public AjaxResult uploadFile(MultipartFile file, Long bussinessid) {
         if (file.isEmpty()) {
             return AjaxResult.error("文件为空，请选择文件上传");
         }
@@ -111,7 +111,7 @@ public class FileServiceImpl extends ServiceImpl<FileMapper, File> implements IF
             Files.copy(file.getInputStream(), filePath);
 
             // 保存文件信息到数据库
-            saveFileInfo(fileName, bussinessId);
+            saveFileInfo(fileName, bussinessid);
 
             return AjaxResult.success("http://39.98.44.136/file/"+fileName);
         } catch (IOException e) {
@@ -119,10 +119,10 @@ public class FileServiceImpl extends ServiceImpl<FileMapper, File> implements IF
             return AjaxResult.error("文件上传失败");
         }
     }
-    private void saveFileInfo(String fileName, Long bussinessId) {
+    private void saveFileInfo(String fileName, Long bussinessid) {
         // 这里假设你已经有了一个FileService来处理数据库操作
         File file = new File();
-        file.setBussinessId(bussinessId);
+        file.setBussinessid(bussinessid);
         file.setFileUrl(fileName);
         this.save(file);
     }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java

@@ -217,7 +217,7 @@ public class JobServiceImpl extends ServiceImpl<JobMapper,Job> implements IJobSe
         }
         //查询附件
         File file=new File();
-        file.setBussinessId(jobId);
+        file.setBussinessid(jobId);
         List<File> filesList=fileMapper.selectFileList(file);
         if(filesList!=null){
             job.setFilesList(filesList);

ruoyi-bussiness/src/main/resources/mapper/app/FileMapper.xml

@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="File" id="FileResult">
         <result property="id"    column="id"    />
         <result property="fileUrl"    column="file_url"    />
-        <result property="bussinessId"    column="bussinessId"    />
+        <result property="bussinessid"    column="bussinessid"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -16,14 +16,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFileVo">
-        select id, file_url, bussinessId, del_flag, create_by, create_time, update_by, update_time from file
+        select id, file_url, bussinessid, del_flag, create_by, create_time, update_by, update_time from file
     </sql>
 
     <select id="selectFileList" parameterType="File" resultMap="FileResult">
         <include refid="selectFileVo"/>
         <where>  del_flag = '0'
             <if test="fileUrl != null  and fileUrl != ''"> and file_url = #{fileUrl}</if>
-            <if test="bussinessId != null "> and bussinessId = #{bussinessId}</if>
+            <if test="bussinessid != null "> and bussinessid = #{bussinessid}</if>
         </where>
     </select>
 </mapper>

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/File.java

@@ -32,6 +32,6 @@ public class File extends BaseEntity
 
     @Excel(name = "业务id")
     @ApiModelProperty("业务id")
-    private Long bussinessId;
+    private Long bussinessid;
 
 }