添加接口我的中-足迹、收藏、岗位申请

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

@@ -3,9 +3,11 @@ package com.ruoyi.cms.controller.cms;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.cms.util.RoleUtils;
 import com.ruoyi.common.annotation.BussinessLog;
 import com.ruoyi.common.core.domain.model.RegisterBody;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -148,7 +150,6 @@ public class CmsAppUserController extends BaseController
     }
 
     @ApiOperation("查询APP用户列表")
-//    @PreAuthorize("@ss.hasPermi('cms:appUser:list')")
     @GetMapping("/noTmlist")
     public TableDataInfo noTmlist(AppUser appUser)
     {
@@ -156,4 +157,18 @@ public class CmsAppUserController extends BaseController
         List<AppUser> list = appUserService.selectNoTmAppUserList(appUser);
         return getDataTable(list);
     }
+
+    @ApiOperation("查询我的中（已经投递的，收藏的，足迹，预约）")
+    @GetMapping("/getMyTj")
+    public AjaxResult getMyTj()
+    {
+        if(!SecurityUtils.isLogin()){
+            return AjaxResult.error("未登录!");
+        }
+        if(StringUtils.isEmpty(RoleUtils.getCurrentUseridCard())){
+            return AjaxResult.error("用户信息为空!");
+        }
+        AppUser appUser=appUserService.selectAppuserByIdcard(RoleUtils.getCurrentUseridCard());
+        return AjaxResult.success(appUserService.getMyTj(appUser.getUserId()));
+    }
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/vo/MyChart.java

@@ -0,0 +1,11 @@
+package com.ruoyi.cms.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class MyChart {
+    private String ytd;
+    private String ysc;
+    private String yzj;
+    private String yyy;
+}

ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/AppUserMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import java.util.List;
 import java.util.Map;
 
+import com.ruoyi.cms.domain.vo.MyChart;
 import com.ruoyi.common.core.domain.entity.AppUser;
 import com.ruoyi.common.core.domain.entity.SysUser;
 
@@ -29,4 +30,6 @@ public interface AppUserMapper extends BaseMapper<AppUser>
     int insertSysUserRole(Map<String,Object> map);
 
     int insertSysUser(SysUser sysUser);
+
+    MyChart getMyTj(Long userId);
 }

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

@@ -1,6 +1,8 @@
 package com.ruoyi.cms.service;
 
 import java.util.List;
+
+import com.ruoyi.cms.domain.vo.MyChart;
 import com.ruoyi.common.core.domain.entity.AppUser;
 import com.ruoyi.cms.domain.vo.AppUserLky;
 import com.ruoyi.common.core.domain.model.RegisterBody;
@@ -68,4 +70,6 @@ public interface IAppUserService
     public int editRegisterUser(RegisterBody registerBody);
 
     public List<AppUser> selectNoTmAppUserList(AppUser appUser);
+
+    public MyChart getMyTj(Long userId);
 }

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

@@ -5,6 +5,7 @@ import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.cms.domain.vo.MyChart;
 import com.ruoyi.common.core.domain.entity.File;
 import com.ruoyi.cms.domain.vo.AppSkillVo;
 import com.ruoyi.cms.mapper.*;
@@ -331,4 +332,9 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper,AppUser> imple
     {
         return appUserMapper.selectAppUserList(appUser);
     }
+
+    @Override
+    public MyChart getMyTj(Long userId) {
+        return appUserMapper.getMyTj(userId);
+    }
 }

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

@@ -605,56 +605,54 @@ public class ESJobSearchImpl implements IESJobSearchService
         ESJobSearch newSearch = new ESJobSearch();
         BeanUtils.copyProperties(esJobSearch,newSearch);
         //查询
-        if(SecurityUtils.isLogin()){
+        if(appUser!=null){
-           if(appUser!=null){
+            if(!ListUtil.isEmptyOrNull(appUser.getJobTitle())){
-               if(!ListUtil.isEmptyOrNull(appUser.getJobTitle())){
+                List<String> jobTitle = appUser.getJobTitle();
-                   List<String> jobTitle = appUser.getJobTitle();
+                newSearch.setJobTitle(String.join(",", jobTitle));
-                   newSearch.setJobTitle(String.join(",", jobTitle));
+            }
-               }
+            if(!StringUtil.isEmptyOrNull(appUser.getEducation())){
-               if(!StringUtil.isEmptyOrNull(appUser.getEducation())){
+                newSearch.setEducation(appUser.getEducation());
-                   newSearch.setEducation(appUser.getEducation());
+            }
-               }
+            if(!StringUtil.isEmptyOrNull(appUser.getArea())){
-               if(!StringUtil.isEmptyOrNull(appUser.getArea())){
+                newSearch.setArea(appUser.getArea());
-                   newSearch.setArea(appUser.getArea());
+            }
-               }
+            if(!StringUtil.isEmptyOrNull(appUser.getExperience())){
-               if(!StringUtil.isEmptyOrNull(appUser.getExperience())){
+                newSearch.setExperience(appUser.getExperience());
-                   newSearch.setExperience(appUser.getExperience());
+            }
-               }
+            if(!StringUtil.isEmptyOrNull(esJobSearch.getExperience())){
-               if(!StringUtil.isEmptyOrNull(esJobSearch.getExperience())){
+                newSearch.setExperience(esJobSearch.getExperience());
-                   newSearch.setExperience(esJobSearch.getExperience());
+            }
-               }
+            if(!StringUtil.isEmptyOrNull(appUser.getSalaryMax())){
-               if(!StringUtil.isEmptyOrNull(appUser.getSalaryMax())){
+                newSearch.setMaxSalary(Long.valueOf(appUser.getSalaryMax()));
-                   newSearch.setMaxSalary(Long.valueOf(appUser.getSalaryMax()));
+            }
-               }
+            if(!StringUtil.isEmptyOrNull(appUser.getSalaryMin())){
-               if(!StringUtil.isEmptyOrNull(appUser.getSalaryMin())){
+                newSearch.setMinSalary(Long.valueOf(appUser.getSalaryMin()));
-                   newSearch.setMinSalary(Long.valueOf(appUser.getSalaryMin()));
+            }
-               }
+        }
-           }
 
-            if(!StringUtil.isEmptyOrNull(esJobSearch.getArea())){
+        if(!StringUtil.isEmptyOrNull(esJobSearch.getArea())){
-                newSearch.setArea(esJobSearch.getArea());
+            newSearch.setArea(esJobSearch.getArea());
-            }
+        }
-            if(!StringUtil.isEmptyOrNull(esJobSearch.getEducation())){
+        if(!StringUtil.isEmptyOrNull(esJobSearch.getEducation())){
-                newSearch.setEducation(esJobSearch.getEducation());
+            newSearch.setEducation(esJobSearch.getEducation());
-            }
+        }
-            if(!StringUtil.isEmptyOrNull(esJobSearch.getJobTitle())){
+        if(!StringUtil.isEmptyOrNull(esJobSearch.getJobTitle())){
-                newSearch.setJobTitle(esJobSearch.getJobTitle());
+            newSearch.setJobTitle(esJobSearch.getJobTitle());
-            }
+        }
-            if(!StringUtil.isEmptyOrNull(esJobSearch.getJobType())){
+        if(!StringUtil.isEmptyOrNull(esJobSearch.getJobType())){
-                newSearch.setJobType(esJobSearch.getJobType());
+            newSearch.setJobType(esJobSearch.getJobType());
-            }
+        }
-            if(!StringUtil.isEmptyOrNull(esJobSearch.getType())){
+        if(!StringUtil.isEmptyOrNull(esJobSearch.getType())){
-                newSearch.setType(esJobSearch.getType());
+            newSearch.setType(esJobSearch.getType());
-            }
+        }
-            if(!StringUtil.isEmptyOrNull(esJobSearch.getDescription())){
+        if(!StringUtil.isEmptyOrNull(esJobSearch.getDescription())){
-                newSearch.setDescription(esJobSearch.getDescription());
+            newSearch.setDescription(esJobSearch.getDescription());
-            }
+        }
-            if(!StringUtil.isEmptyOrNull(esJobSearch.getCompanyNature())){
+        if(!StringUtil.isEmptyOrNull(esJobSearch.getCompanyNature())){
-                newSearch.setCompanyNature(esJobSearch.getCompanyNature());
+            newSearch.setCompanyNature(esJobSearch.getCompanyNature());
-            }
+        }
-            if(!StringUtil.isEmptyOrNull(esJobSearch.getCode())){
+        if(!StringUtil.isEmptyOrNull(esJobSearch.getCode())){
-                newSearch.setCode(esJobSearch.getCode());
+            newSearch.setCode(esJobSearch.getCode());
-            }
         }
 
         LambdaEsQueryWrapper<ESJobDocument> wrapper = getWrapper(newSearch,jobIds);

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

@@ -108,4 +108,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         )
     </insert>
 
+    <select id="getMyTj" resultType="com.ruoyi.cms.domain.vo.MyChart">
+        SELECT t1.yzj,t2.ysc,t3.ytd,0 AS yyy FROM
+        (SELECT COUNT(user_id) AS yzj FROM app_review_job WHERE user_id = #{userId} AND del_flag = '0') t1
+            CROSS JOIN (SELECT COUNT(user_id) AS ysc FROM job_collection WHERE user_id = #{userId} AND del_flag = '0') t2
+            CROSS JOIN (SELECT COUNT(user_id) AS ytd FROM job_apply WHERE user_id = #{userId} AND del_flag = '0') t3
+    </select>
+
 </mapper>