From 367bf1f4d64505e9e97faa85ec4769444e95fd7f Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Sun, 22 Dec 2024 21:08:36 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller2/ContractController.java | 6 +- .../jeecg/modules/apiService/ContractService.java | 3 +- .../apiService/impl/AuthenticationServiceImpl.java | 123 ++--- .../apiService/impl/BossApiServiceImpl.java | 483 ++++++++++---------- .../modules/apiService/impl/CheckServiceImpl.java | 278 ++++++------ .../apiService/impl/CollectionServiceImpl.java | 202 +++++---- .../apiService/impl/CompanyServiceImpl.java | 60 ++- .../modules/apiService/impl/ConfigServiceImpl.java | 103 +++-- .../apiService/impl/ContractServiceImpl.java | 140 ++++-- .../apiService/impl/EmployeeApiServiceImpl.java | 496 ++++++++++++--------- .../apiService/impl/ExaminationServiceImpl.java | 113 +++-- .../apiService/impl/ExchangeServiceImpl.java | 56 +-- .../modules/apiService/impl/JobServiceImpl.java | 200 +++++---- .../apiService/impl/NotebookServiceImpl.java | 256 ++++++----- .../modules/apiService/impl/ResumeServiceImpl.java | 107 +++-- .../modules/apiService/impl/ScoreServiceImpl.java | 175 ++++---- .../apiService/impl/UserInfoServiceImpl.java | 145 +++--- 17 files changed, 1664 insertions(+), 1282 deletions(-) diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ContractController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ContractController.java index 1c323c4..42c8773 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ContractController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ContractController.java @@ -27,10 +27,10 @@ public class ContractController { /******************************************************************************************************************/ //我的服务-电子合同 - @ApiOperation(value="电子合同-获取电子合同列表", notes="电子合同-获取电子合同列表") + @ApiOperation(value="电子合同-获取电子合同列表", notes="role(用户类型): 0-个人 1-企业") @RequestMapping(value = "/queryContractList", method = {RequestMethod.GET}) - public Result queryContractBossList(@RequestHeader("X-Access-Token")String token, EmployContract employContract, PageBean pageBean){ - return contractService.queryContractList(token, employContract, pageBean); + public Result queryContractBossList(@RequestHeader("X-Access-Token")String token, String role, EmployContract employContract, PageBean pageBean){ + return contractService.queryContractList(token, role, employContract, pageBean); } //我的服务-电子合同 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ContractService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ContractService.java index 626e7dc..afd904b 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ContractService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ContractService.java @@ -9,11 +9,12 @@ public interface ContractService { /** * 电子合同-获取电子合同列表 * @param token + * @param role * @param employContract * @param pageBean * @return */ - public Result queryContractList(String token, EmployContract employContract, PageBean pageBean); + public Result queryContractList(String token, String role, EmployContract employContract, PageBean pageBean); /** * 电子合同-获取电子合同详情 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AuthenticationServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AuthenticationServiceImpl.java index b5eadc9..561a105 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AuthenticationServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AuthenticationServiceImpl.java @@ -41,35 +41,43 @@ public class AuthenticationServiceImpl implements AuthenticationService { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - EmployAuthenticationPerson one = employAuthenticationPersonService.lambdaQuery() - .eq(EmployAuthenticationPerson::getUserId, hanHaiMember.getId()) - .one(); - - EmployAuthenticationPerson cerNo = employAuthenticationPersonService.lambdaQuery() - .eq(EmployAuthenticationPerson::getCerNo, employAuthenticationPerson.getCerNo()) - .eq(EmployAuthenticationPerson::getStatus, "1") - .one(); - - if(null != cerNo){ - return Result.error("该身份证已认证过，不能重复使用！"); - } + try{ + //查询实名认证信息 + EmployAuthenticationPerson one = employAuthenticationPersonService.lambdaQuery() + .eq(EmployAuthenticationPerson::getUserId, hanHaiMember.getId()) + .one(); + + //判断用户是否已实名认证通过 + EmployAuthenticationPerson cerNo = employAuthenticationPersonService.lambdaQuery() + .eq(EmployAuthenticationPerson::getCerNo, employAuthenticationPerson.getCerNo()) + .eq(EmployAuthenticationPerson::getStatus, "1") + .one(); + + if(null != cerNo){ + return Result.error("该身份证已认证过，不能重复使用！"); + } - //如果存在则修改信息 - if(null != one){ - if(!"1".equals(one.getStatus())){ - employAuthenticationPerson.setId(one.getId()); - employAuthenticationPerson.setStatus("0"); - employAuthenticationPersonService.updateById(employAuthenticationPerson); - message = "个人实名修改成功！"; + //如果存在则修改信息 + if(null != one){ + if(!"1".equals(one.getStatus())){ + employAuthenticationPerson.setId(one.getId()); + employAuthenticationPerson.setStatus("0"); + employAuthenticationPersonService.updateById(employAuthenticationPerson); + message = "个人实名修改成功！"; + }else { + message = "审核已通过，不能修改！"; + } }else { - message = "审核已通过，不能修改！"; + employAuthenticationPerson.setUserId(hanHaiMember.getId()); + boolean result = employAuthenticationPersonService.save(employAuthenticationPerson); + message = "个人实名添加成功！"; } - }else { - employAuthenticationPerson.setUserId(hanHaiMember.getId()); - boolean result = employAuthenticationPersonService.save(employAuthenticationPerson); - message = "个人实名添加成功！"; + return Result.OK(message); + }catch (Exception e){ + e.printStackTrace(); + return Result.error(message); } - return Result.OK(message); + } @@ -78,38 +86,48 @@ public class AuthenticationServiceImpl implements AuthenticationService { public Result getAuthenticationPerson(String token) { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - EmployAuthenticationPerson one = employAuthenticationPersonService.lambdaQuery() - .eq(EmployAuthenticationPerson::getUserId, hanHaiMember.getId()) - .one(); - return Result.OK("个人实名认证信息", one); + try{ + EmployAuthenticationPerson one = employAuthenticationPersonService.lambdaQuery() + .eq(EmployAuthenticationPerson::getUserId, hanHaiMember.getId()) + .one(); + return Result.OK("个人实名认证信息", one); + }catch (Exception e){ + e.printStackTrace(); + return Result.OK("个人实名认证信息查询失败"); + } } //会员中心-企业实名认证 @Override public Result addAuthenticationCompany(String token, EmployAhthenticationCompany employAhthenticationCompany) { - String message = ""; + String message = "企业实名认证操作失败"; //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - EmployAhthenticationCompany one = employAhthenticationCompanyService.lambdaQuery() - .eq(EmployAhthenticationCompany::getUserId, hanHaiMember.getId()) - .one(); - //如果存在则修改信息 - if(null != one){ - if(!"1".equals(one.getStatus())){ - employAhthenticationCompany.setId(one.getId()); - employAhthenticationCompany.setStatus("0"); - employAhthenticationCompanyService.updateById(employAhthenticationCompany); - message = "企业实名修改成功！"; + try{ + EmployAhthenticationCompany one = employAhthenticationCompanyService.lambdaQuery() + .eq(EmployAhthenticationCompany::getUserId, hanHaiMember.getId()) + .one(); + //如果存在则修改信息 + if(null != one){ + if(!"1".equals(one.getStatus())){ + employAhthenticationCompany.setId(one.getId()); + employAhthenticationCompany.setStatus("0"); + employAhthenticationCompanyService.updateById(employAhthenticationCompany); + message = "企业实名修改成功！"; + }else { + message = "审核已通过，不能修改！"; + } }else { - message = "审核已通过，不能修改！"; + employAhthenticationCompany.setUserId(hanHaiMember.getId()); + boolean result = employAhthenticationCompanyService.save(employAhthenticationCompany); + message = "企业实名添加成功！"; } - }else { - employAhthenticationCompany.setUserId(hanHaiMember.getId()); - boolean result = employAhthenticationCompanyService.save(employAhthenticationCompany); - message = "企业实名添加成功！"; + return Result.OK(message); + }catch (Exception e){ + e.printStackTrace(); + return Result.error(message); } - return Result.OK(message); } //我的服务-查询企业实名认证信息 @@ -117,10 +135,15 @@ public class AuthenticationServiceImpl implements AuthenticationService { public Result getAuthenticationCompany(String token) { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - EmployAhthenticationCompany one = employAhthenticationCompanyService.lambdaQuery() - .eq(EmployAhthenticationCompany::getUserId, hanHaiMember.getId()) - .one(); - return Result.OK("企业实名认证信息", one); + try{ + EmployAhthenticationCompany one = employAhthenticationCompanyService.lambdaQuery() + .eq(EmployAhthenticationCompany::getUserId, hanHaiMember.getId()) + .one(); + return Result.OK("企业实名认证信息", one); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("企业实名认证信息查询失败"); + } } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/BossApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/BossApiServiceImpl.java index 4f23274..a1616f6 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/BossApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/BossApiServiceImpl.java @@ -71,10 +71,15 @@ public class BossApiServiceImpl implements BossApiService { //获取所有简历带分页 @Override public Result queryResumeListByAll(EmployResume employResume, PageBean pageBean, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(employResume, req.getParameterMap()); - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employResumeService.page(page, queryWrapper); - return Result.OK("简历列表", pageList); + try{ + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(employResume, req.getParameterMap()); + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employResumeService.page(page, queryWrapper); + return Result.OK("简历列表", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("简历列表查询失败"); + } } //根据id查看简历详情 @@ -85,95 +90,65 @@ public class BossApiServiceImpl implements BossApiService { //返回信息 Map map = new HashMap<>(); - //1、获取简历详情 - EmployResume resume = employResumeService.getById(resumeId); - map.put("resume", resume); - - //2、获取简历拥有者信息 - HanHaiMember member = hanHaiMemberService.getById(resume.getUserId()); - map.put("hanHaiMember", member); - - //3、添加是否被收藏标识 - EmployCollectionResume collection = employCollectionResumeService - .lambdaQuery() - .eq(EmployCollectionResume::getResumeId, resume.getId()) - .eq(EmployCollectionResume::getUserId, hanHaiMember.getId()) - .one(); - if(null != collection){ - map.put("collectionFlag", true); - }else { - map.put("collectionFlag", false); - } + try{ + //1、获取简历详情 + EmployResume resume = employResumeService.getById(resumeId); + map.put("resume", resume); - //4、添加简历被查看记录 - EmployCheckResume employCheckResume = new EmployCheckResume(); - employCheckResume.setResumeId(resume.getId()); - employCheckResume.setUserId(hanHaiMember.getId()); - employCheckResumeService.saveOrUpdate(employCheckResume); + //2、获取简历拥有者信息 + HanHaiMember member = hanHaiMemberService.getById(resume.getUserId()); + map.put("hanHaiMember", member); - return Result.OK("简历详情", map); + //3、添加是否被收藏标识 + EmployCollectionResume collection = employCollectionResumeService + .lambdaQuery() + .eq(EmployCollectionResume::getResumeId, resume.getId()) + .eq(EmployCollectionResume::getUserId, hanHaiMember.getId()) + .one(); + if(null != collection){ + map.put("collectionFlag", true); + }else { + map.put("collectionFlag", false); + } + + //4、添加简历被查看记录 + EmployCheckResume employCheckResume = new EmployCheckResume(); + employCheckResume.setResumeId(resume.getId()); + employCheckResume.setUserId(hanHaiMember.getId()); + employCheckResumeService.saveOrUpdate(employCheckResume); + + return Result.OK("简历详情", map); + }catch (Exception e){ + e.printStackTrace(); + return Result.OK("简历详情查询失败", map); + } } -// //首页-根据Id查看简历详情 -// @Override -// public Result queryResumeById(String token, String resumeId) { -// -// CollectionBean collectionBean = new CollectionBean(); -// Boolean collectionFlag = false; -// //获取简历详情 -// EmployResume one = employResumeService -// .lambdaQuery() -// .eq(EmployResume::getId, resumeId) -// .one(); -// -// collectionBean.setEmployResume(one); -// -// if(null != token){ -// //权限验证 -// HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); -// -// //添加简历被查看记录 -// EmployCheckResume employCheckResume = new EmployCheckResume(); -// employCheckResume.setResumeId(one.getId()); -// employCheckResume.setUserId(hanHaiMember.getId()); -// employCheckResumeService.saveOrUpdate(employCheckResume); -// -// //添加是否被收藏标识 -// EmployCollectionResume collection = employCollectionResumeService -// .lambdaQuery() -// .eq(EmployCollectionResume::getResumeId, one.getId()) -// .eq(EmployCollectionResume::getUserId, hanHaiMember.getId()) -// .one(); -// -// if(null != collection){ -// collectionFlag = true; -// } -// } -// collectionBean.setCollectionFlag(collectionFlag); -// -// return Result.OK("简历详情", collectionBean); -// } - //首页-发布招工 @Override public Result addJob(EmployJob employJob) { - //权限验证 - //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //返回信息 - String message; - - //添加招工信息 - //employJob.setUserId(hanHaiMember.getId()); - boolean result = employJobService.save(employJob); - - //判断招工信息是否添加成功 - if(result){ - message = "发布招工成功！"; - }else { - message = "发布招工失败！"; + String message = "发布招工失败"; + + try{ + //权限验证 + //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //添加招工信息 + //employJob.setUserId(hanHaiMember.getId()); + boolean result = employJobService.save(employJob); + + //判断招工信息是否添加成功 + if(result){ + message = "发布招工成功！"; + }else { + message = "发布招工失败！"; + } + return Result.OK(message); + }catch (Exception e){ + e.printStackTrace(); + return Result.error(message); } - return Result.OK(message); } /***************会员中心***************/ @@ -183,22 +158,26 @@ public class BossApiServiceImpl implements BossApiService { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - //获取收藏列表 - Page pageList = employCollectionResumeService - .lambdaQuery() - .eq(EmployCollectionResume::getUserId, hanHaiMember.getId()) - .page(page); - - //根据收藏列表关联简历id获取简历信息 - for (EmployCollectionResume record : pageList.getRecords()) { - //获取简历信息 - EmployResume resume = employResumeService.getById(record.getResumeId()); - //将简历信息添加到我的收藏中 - record.setEmployResume(resume); + try{ + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + //获取收藏列表 + Page pageList = employCollectionResumeService + .lambdaQuery() + .eq(EmployCollectionResume::getUserId, hanHaiMember.getId()) + .page(page); + + //根据收藏列表关联简历id获取简历信息 + for (EmployCollectionResume record : pageList.getRecords()) { + //获取简历信息 + EmployResume resume = employResumeService.getById(record.getResumeId()); + //将简历信息添加到我的收藏中 + record.setEmployResume(resume); + } + return Result.OK("简历收藏列表", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("简历收藏列表查询失败"); } - - return Result.OK("简历收藏列表", pageList); } //会员中心-我的收藏(数量统计) @@ -207,15 +186,20 @@ public class BossApiServiceImpl implements BossApiService { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //获取收藏列表 - List list = employCollectionResumeService - .lambdaQuery() - .eq(EmployCollectionResume::getUserId, hanHaiMember.getId()) - .list(); + try{ + //获取收藏列表 + List list = employCollectionResumeService + .lambdaQuery() + .eq(EmployCollectionResume::getUserId, hanHaiMember.getId()) + .list(); - int count = list.size(); + int count = list.size(); - return Result.OK("简历收藏数量统计", count); + return Result.OK("简历收藏数量统计", count); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("简历收藏数量统计失败", 0); + } } //会员中心-联系记录-我看过谁 @@ -224,22 +208,27 @@ public class BossApiServiceImpl implements BossApiService { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //查看简历查看记录 - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employCheckResumeService - .lambdaQuery() - .eq(EmployCheckResume::getUserId, hanHaiMember.getId()) - .page(page); - - //根据查看记录关联简历id获取简历信息 - for (EmployCheckResume record : pageList.getRecords()) { - //获取简历信息 - EmployResume employResume = employResumeService.getById(record.getResumeId()); - //将简历信息添加到查看记录中 - record.setEmployResume(employResume); + try{ + //查看简历查看记录 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employCheckResumeService + .lambdaQuery() + .eq(EmployCheckResume::getUserId, hanHaiMember.getId()) + .page(page); + + //根据查看记录关联简历id获取简历信息 + for (EmployCheckResume record : pageList.getRecords()) { + //获取简历信息 + EmployResume employResume = employResumeService.getById(record.getResumeId()); + //将简历信息添加到查看记录中 + record.setEmployResume(employResume); + } + + return Result.OK("我看过谁", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("我看过谁列表查询失败"); } - - return Result.OK("我看过谁", pageList); } //会员中心-联系记录-我看过谁(数量统计) @@ -248,15 +237,20 @@ public class BossApiServiceImpl implements BossApiService { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //查看简历查看记录 - List list = employCheckResumeService - .lambdaQuery() - .eq(EmployCheckResume::getUserId, hanHaiMember.getId()) - .list(); + try{ + //查看简历查看记录 + List list = employCheckResumeService + .lambdaQuery() + .eq(EmployCheckResume::getUserId, hanHaiMember.getId()) + .list(); - int count = list.size(); + int count = list.size(); - return Result.OK("我看过谁(数量统计)", count); + return Result.OK("我看过谁(数量统计)", count); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("我看过谁(数量统计)失败", 0); + } } //会员中心-联系记录-谁看过我(谁看过我的招工) @@ -265,61 +259,66 @@ public class BossApiServiceImpl implements BossApiService { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //查询我发布的工作列表 - List jobList = employJobService - .lambdaQuery() - .eq(EmployJob::getUserId, hanHaiMember.getId()) - .list(); - - //获取查看我发布的工作id列表 - int jobSize = (int)jobList.size(); - Object[] jobIds = new Object[jobSize]; - int jobIndex = 0; - for (EmployJob job : jobList) { - jobIds[jobIndex] = job.getId(); - jobIndex++; - } - if(jobSize == 0){ - return Result.OK("您还没有发布过招工", jobList); - } - - //获取工作被查询的记录 - List checkJobList = employCheckJobService - .lambdaQuery() - .in(EmployCheckJob::getJobId, jobIds) - .list(); - - //获取查看我的工作的求职者id - int size = (int)checkJobList.size(); - Object[] employeeIds = new Object[size]; - int index = 0; - for (EmployCheckJob employCheckJob : checkJobList) { - employeeIds[index] = employCheckJob.getUserId(); - index++; - } - - if(size == 0){ - return Result.OK("没有人看过我的招工", checkJobList); - } - - //根据求职者id查询求职者基本信息 - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page hanHaiMemberList = hanHaiMemberService - .lambdaQuery() - .in(HanHaiMember::getId, employeeIds) - .page(page); + try{ + //查询我发布的工作列表 + List jobList = employJobService + .lambdaQuery() + .eq(EmployJob::getUserId, hanHaiMember.getId()) + .list(); - //根据求职者id查询求职者简历 - for (HanHaiMember record : hanHaiMemberList.getRecords()) { - List employResumeList = employResumeService + //获取查看我发布的工作id列表 + int jobSize = (int)jobList.size(); + Object[] jobIds = new Object[jobSize]; + int jobIndex = 0; + for (EmployJob job : jobList) { + jobIds[jobIndex] = job.getId(); + jobIndex++; + } + if(jobSize == 0){ + return Result.OK("您还没有发布过招工", jobList); + } + + //获取工作被查询的记录 + List checkJobList = employCheckJobService .lambdaQuery() - .eq(EmployResume::getUserId, record.getId()) + .in(EmployCheckJob::getJobId, jobIds) .list(); - record.setEmployResumeList(employResumeList); + //获取查看我的工作的求职者id + int size = (int)checkJobList.size(); + Object[] employeeIds = new Object[size]; + int index = 0; + for (EmployCheckJob employCheckJob : checkJobList) { + employeeIds[index] = employCheckJob.getUserId(); + index++; + } + + if(size == 0){ + return Result.OK("没有人看过我的招工", checkJobList); + } + + //根据求职者id查询求职者基本信息 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page hanHaiMemberList = hanHaiMemberService + .lambdaQuery() + .in(HanHaiMember::getId, employeeIds) + .page(page); + + //根据求职者id查询求职者简历 + for (HanHaiMember record : hanHaiMemberList.getRecords()) { + List employResumeList = employResumeService + .lambdaQuery() + .eq(EmployResume::getUserId, record.getId()) + .list(); + + record.setEmployResumeList(employResumeList); + } + + return Result.OK("谁看过我(谁看过我的招工)列表", hanHaiMemberList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("谁看过我(谁看过我的招工)列表查询失败"); } - - return Result.OK("谁看过我(谁看过我的招工)列表", hanHaiMemberList); } //会员中心-联系记录-谁看过我(谁看过我的招工) @@ -328,33 +327,38 @@ public class BossApiServiceImpl implements BossApiService { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //查询我发布的工作列表 - List jobList = employJobService - .lambdaQuery() - .eq(EmployJob::getUserId, hanHaiMember.getId()) - .list(); - - //获取查看我发布的工作id列表 - int jobSize = (int)jobList.size(); - Object[] jobIds = new Object[jobSize]; - int jobIndex = 0; - for (EmployJob job : jobList) { - jobIds[jobIndex] = job.getId(); - jobIndex++; - } - if(jobSize == 0){ - return Result.OK("您还没有发布过招工", jobList); - } + try{ + //查询我发布的工作列表 + List jobList = employJobService + .lambdaQuery() + .eq(EmployJob::getUserId, hanHaiMember.getId()) + .list(); - //获取工作被查询的记录 - List checkJobList = employCheckJobService - .lambdaQuery() - .in(EmployCheckJob::getJobId, jobIds) - .list(); + //获取查看我发布的工作id列表 + int jobSize = (int)jobList.size(); + Object[] jobIds = new Object[jobSize]; + int jobIndex = 0; + for (EmployJob job : jobList) { + jobIds[jobIndex] = job.getId(); + jobIndex++; + } + if(jobSize == 0){ + return Result.OK("您还没有发布过招工", jobList); + } + + //获取工作被查询的记录 + List checkJobList = employCheckJobService + .lambdaQuery() + .in(EmployCheckJob::getJobId, jobIds) + .list(); - int count = checkJobList.size(); + int count = checkJobList.size(); - return Result.OK("谁看过我(数量统计)", count); + return Result.OK("谁看过我(数量统计)", count); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("谁看过我(数量统计)失败", 0); + } } //我的招工 @@ -363,13 +367,18 @@ public class BossApiServiceImpl implements BossApiService { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employJobService - .lambdaQuery() - .eq(EmployJob::getUserId, hanHaiMember.getId()) - .page(page); + try{ + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employJobService + .lambdaQuery() + .eq(EmployJob::getUserId, hanHaiMember.getId()) + .page(page); - return Result.OK("我的招工", pageList); + return Result.OK("我的招工", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("我的招工列表查询失败"); + } } //电子合同-获取电子合同列表 @@ -378,25 +387,30 @@ public class BossApiServiceImpl implements BossApiService { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //分页 - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - LambdaQueryChainWrapper query = employContractService - .lambdaQuery() - .eq(EmployContract::getBossId, hanHaiMember.getId()); - - //组装查询条件 - if(null != employContract.getSignCompany()){ - query.like(EmployContract::getSignCompany, employContract.getSignCompany()); - } - if(null != employContract.getSignPerson()){ - query.like(EmployContract::getSignPerson, employContract.getSignPerson()); + try{ + //分页 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + LambdaQueryChainWrapper query = employContractService + .lambdaQuery() + .eq(EmployContract::getBossId, hanHaiMember.getId()); + + //组装查询条件 + if(null != employContract.getSignCompany()){ + query.like(EmployContract::getSignCompany, employContract.getSignCompany()); + } + if(null != employContract.getSignPerson()){ + query.like(EmployContract::getSignPerson, employContract.getSignPerson()); + } + + //获取电子合同信息 + Page pageList = query.page(page); + + return Result.OK("电子合同列表", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("电子合同列表查询失败"); } - //获取电子合同信息 - Page pageList = query.page(page); - - return Result.OK("电子合同列表", pageList); - } //电子合同-获取电子合同详情 @@ -405,12 +419,17 @@ public class BossApiServiceImpl implements BossApiService { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - EmployContract one = employContractService - .lambdaQuery() - .eq(EmployContract::getBossId, hanHaiMember.getId()) - .eq(EmployContract::getId, contractId) - .one(); - - return Result.OK("电子合同详情", one); + try{ + EmployContract one = employContractService + .lambdaQuery() + .eq(EmployContract::getBossId, hanHaiMember.getId()) + .eq(EmployContract::getId, contractId) + .one(); + + return Result.OK("电子合同详情", one); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("电子合同详情查询失败"); + } } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CheckServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CheckServiceImpl.java index 0b6647a..78a02c4 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CheckServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CheckServiceImpl.java @@ -57,22 +57,27 @@ public class CheckServiceImpl implements CheckService { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //查看简历查看记录 - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employCheckResumeService - .lambdaQuery() - .eq(EmployCheckResume::getUserId, hanHaiMember.getId()) - .page(page); - - //根据查看记录关联简历id获取简历信息 - for (EmployCheckResume record : pageList.getRecords()) { - //获取简历信息 - EmployResume employResume = employResumeService.getById(record.getResumeId()); - //将简历信息添加到查看记录中 - record.setEmployResume(employResume); + try{ + //查看简历查看记录 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employCheckResumeService + .lambdaQuery() + .eq(EmployCheckResume::getUserId, hanHaiMember.getId()) + .page(page); + + //根据查看记录关联简历id获取简历信息 + for (EmployCheckResume record : pageList.getRecords()) { + //获取简历信息 + EmployResume employResume = employResumeService.getById(record.getResumeId()); + //将简历信息添加到查看记录中 + record.setEmployResume(employResume); + } + + return Result.OK("我看过谁", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("我看过谁列表查询失败"); } - - return Result.OK("我看过谁", pageList); } //会员中心-联系记录-谁看过我(谁看过我的招工) @@ -81,61 +86,66 @@ public class CheckServiceImpl implements CheckService { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //查询我发布的工作列表 - List jobList = employJobService - .lambdaQuery() - .eq(EmployJob::getUserId, hanHaiMember.getId()) - .list(); - - //获取查看我发布的工作id列表 - int jobSize = (int)jobList.size(); - Object[] jobIds = new Object[jobSize]; - int jobIndex = 0; - for (EmployJob job : jobList) { - jobIds[jobIndex] = job.getId(); - jobIndex++; - } - if(jobSize == 0){ - return Result.OK("您还没有发布过招工", jobList); - } - - //获取工作被查询的记录 - List checkJobList = employCheckJobService - .lambdaQuery() - .in(EmployCheckJob::getJobId, jobIds) - .list(); - - //获取查看我的工作的求职者id - int size = (int)checkJobList.size(); - Object[] employeeIds = new Object[size]; - int index = 0; - for (EmployCheckJob employCheckJob : checkJobList) { - employeeIds[index] = employCheckJob.getUserId(); - index++; - } - - if(size == 0){ - return Result.OK("没有人看过我的招工", checkJobList); - } - - //根据求职者id查询求职者基本信息 - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page hanHaiMemberList = hanHaiMemberService - .lambdaQuery() - .in(HanHaiMember::getId, employeeIds) - .page(page); + try{ + //查询我发布的工作列表 + List jobList = employJobService + .lambdaQuery() + .eq(EmployJob::getUserId, hanHaiMember.getId()) + .list(); - //根据求职者id查询求职者简历 - for (HanHaiMember record : hanHaiMemberList.getRecords()) { - List employResumeList = employResumeService + //获取查看我发布的工作id列表 + int jobSize = (int)jobList.size(); + Object[] jobIds = new Object[jobSize]; + int jobIndex = 0; + for (EmployJob job : jobList) { + jobIds[jobIndex] = job.getId(); + jobIndex++; + } + if(jobSize == 0){ + return Result.OK("您还没有发布过招工", jobList); + } + + //获取工作被查询的记录 + List checkJobList = employCheckJobService .lambdaQuery() - .eq(EmployResume::getUserId, record.getId()) + .in(EmployCheckJob::getJobId, jobIds) .list(); - record.setEmployResumeList(employResumeList); + //获取查看我的工作的求职者id + int size = (int)checkJobList.size(); + Object[] employeeIds = new Object[size]; + int index = 0; + for (EmployCheckJob employCheckJob : checkJobList) { + employeeIds[index] = employCheckJob.getUserId(); + index++; + } + + if(size == 0){ + return Result.OK("没有人看过我的招工", checkJobList); + } + + //根据求职者id查询求职者基本信息 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page hanHaiMemberList = hanHaiMemberService + .lambdaQuery() + .in(HanHaiMember::getId, employeeIds) + .page(page); + + //根据求职者id查询求职者简历 + for (HanHaiMember record : hanHaiMemberList.getRecords()) { + List employResumeList = employResumeService + .lambdaQuery() + .eq(EmployResume::getUserId, record.getId()) + .list(); + + record.setEmployResumeList(employResumeList); + } + + return Result.OK("谁看过我(谁看过我的招工)列表", hanHaiMemberList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("谁看过我(谁看过我的招工)列表查询失败"); } - - return Result.OK("谁看过我(谁看过我的招工)列表", hanHaiMemberList); } //会员中心-联系记录-我看过谁 @@ -144,22 +154,27 @@ public class CheckServiceImpl implements CheckService { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //获取我看过谁的记录信息 - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employCheckJobService - .lambdaQuery() - .eq(EmployCheckJob::getUserId, hanHaiMember.getId()) - .page(page); - - //添加工作信息 - for (EmployCheckJob record : pageList.getRecords()) { - //获取工作信息 - EmployJob employJob = employJobService.getById(record.getJobId()); + try { + //获取我看过谁的记录信息 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employCheckJobService + .lambdaQuery() + .eq(EmployCheckJob::getUserId, hanHaiMember.getId()) + .page(page); + //添加工作信息 - record.setEmployJob(employJob); + for (EmployCheckJob record : pageList.getRecords()) { + //获取工作信息 + EmployJob employJob = employJobService.getById(record.getJobId()); + //添加工作信息 + record.setEmployJob(employJob); + } + + return Result.OK("我看过谁", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.OK("我看过谁列表查询失败"); } - - return Result.OK("我看过谁", pageList); } //会员中心-联系记录-谁看过我(谁看过我的简历) @@ -169,61 +184,66 @@ public class CheckServiceImpl implements CheckService { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //查询我发布的简历列表 - List resumeList = employResumeService - .lambdaQuery() - .eq(EmployResume::getUserId, hanHaiMember.getId()) - .list(); - - //获取查看我发布的简历id列表 - int resumeSize = (int)resumeList.size(); - Object[] resumeIds = new Object[resumeSize]; - int jobIndex = 0; - for (EmployResume resume : resumeList) { - resumeIds[jobIndex] = resume.getId(); - jobIndex++; - } - if(resumeSize == 0){ - return Result.OK("您还没有发布过简历", resumeList); - } - - //获取简历被查询的记录 - List checkResumeList = employCheckResumeService - .lambdaQuery() - .in(EmployCheckResume::getResumeId, resumeIds) - .list(); - - //获取查看我的简历的招聘者id - int size = (int)checkResumeList.size(); - Object[] bossIds = new Object[size]; - int index = 0; - for (EmployCheckResume employCheckResume : checkResumeList) { - bossIds[index] = employCheckResume.getUserId(); - index++; - } - - if(size == 0){ - return Result.OK("没有人看过我的简历", checkResumeList); - } - - //根据招聘者id查询招聘者基本信息 - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page hanHaiMemberList = hanHaiMemberService - .lambdaQuery() - .in(HanHaiMember::getId, bossIds) - .page(page); + try{ + //查询我发布的简历列表 + List resumeList = employResumeService + .lambdaQuery() + .eq(EmployResume::getUserId, hanHaiMember.getId()) + .list(); - //根据招聘者id查询招聘者发布的工作 - for (HanHaiMember record : hanHaiMemberList.getRecords()) { - List employJobList = employJobService + //获取查看我发布的简历id列表 + int resumeSize = (int)resumeList.size(); + Object[] resumeIds = new Object[resumeSize]; + int jobIndex = 0; + for (EmployResume resume : resumeList) { + resumeIds[jobIndex] = resume.getId(); + jobIndex++; + } + if(resumeSize == 0){ + return Result.OK("您还没有发布过简历", resumeList); + } + + //获取简历被查询的记录 + List checkResumeList = employCheckResumeService .lambdaQuery() - .eq(EmployJob::getUserId, record.getId()) + .in(EmployCheckResume::getResumeId, resumeIds) .list(); - record.setEmployJobList(employJobList); + //获取查看我的简历的招聘者id + int size = (int)checkResumeList.size(); + Object[] bossIds = new Object[size]; + int index = 0; + for (EmployCheckResume employCheckResume : checkResumeList) { + bossIds[index] = employCheckResume.getUserId(); + index++; + } + + if(size == 0){ + return Result.OK("没有人看过我的简历", checkResumeList); + } + + //根据招聘者id查询招聘者基本信息 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page hanHaiMemberList = hanHaiMemberService + .lambdaQuery() + .in(HanHaiMember::getId, bossIds) + .page(page); + + //根据招聘者id查询招聘者发布的工作 + for (HanHaiMember record : hanHaiMemberList.getRecords()) { + List employJobList = employJobService + .lambdaQuery() + .eq(EmployJob::getUserId, record.getId()) + .list(); + + record.setEmployJobList(employJobList); + } + + return Result.OK("谁看过我(谁看过我的简历)", hanHaiMemberList); + }catch (Exception e){ + e.printStackTrace(); + return Result.OK("谁看过我(谁看过我的简历)列表查询失败"); } - - return Result.OK("谁看过我(谁看过我的简历)", hanHaiMemberList); } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CollectionServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CollectionServiceImpl.java index 3316607..b0be701 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CollectionServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CollectionServiceImpl.java @@ -46,62 +46,72 @@ public class CollectionServiceImpl implements CollectionService { //我的收藏-收藏工作信息 @Override public Result queryJobCollectionList(String token, PageBean pageBean) { - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - - //获取工作收藏列表 - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employCollectionJobService - .lambdaQuery() - .eq(EmployCollectionJob::getUserId, hanHaiMember.getId()) - .page(page); - - //根据收藏列表工作id查询工作信息 - for (EmployCollectionJob record : pageList.getRecords()) { - //获取工作信息 - EmployJob job = employJobService.getById(record.getJobId()); - - //将工作信息添加至收藏列表 - record.setEmployJob(job); - } + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //获取工作收藏列表 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employCollectionJobService + .lambdaQuery() + .eq(EmployCollectionJob::getUserId, hanHaiMember.getId()) + .page(page); + + //根据收藏列表工作id查询工作信息 + for (EmployCollectionJob record : pageList.getRecords()) { + //获取工作信息 + EmployJob job = employJobService.getById(record.getJobId()); + + //将工作信息添加至收藏列表 + record.setEmployJob(job); + } - return Result.OK("工作收藏列表", pageList); + return Result.OK("工作收藏列表", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.OK("工作收藏列表查询失败！"); + } } //我的收藏-添加工作收藏 @Override public Result addJobCollection(String token, String jobId){ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - - //判断该工作是否已经被收藏，如果已被收藏，则取消收藏 - EmployCollectionJob collection = employCollectionJobService - .lambdaQuery() - .eq(EmployCollectionJob::getUserId, hanHaiMember.getId()) - .eq(EmployCollectionJob::getJobId, jobId) - .one(); - if(null != collection){ - //执行取消收藏 - boolean result = employCollectionJobService.removeById(collection.getId()); - if(result){ - return Result.OK("取消收藏成功"); - }else { - return Result.OK("取消收藏失败"); + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //判断该工作是否已经被收藏，如果已被收藏，则取消收藏 + EmployCollectionJob collection = employCollectionJobService + .lambdaQuery() + .eq(EmployCollectionJob::getUserId, hanHaiMember.getId()) + .eq(EmployCollectionJob::getJobId, jobId) + .one(); + if(null != collection){ + //执行取消收藏 + boolean result = employCollectionJobService.removeById(collection.getId()); + if(result){ + return Result.OK("取消收藏成功"); + }else { + return Result.error("取消收藏失败"); + } } - } - //添加收藏 - EmployCollectionJob collectionJob = new EmployCollectionJob(); - collectionJob.setJobId(jobId); - collectionJob.setUserId(hanHaiMember.getId()); + //添加收藏 + EmployCollectionJob collectionJob = new EmployCollectionJob(); + collectionJob.setJobId(jobId); + collectionJob.setUserId(hanHaiMember.getId()); - //执行工作收藏操作 - boolean result = employCollectionJobService.save(collectionJob); + //执行工作收藏操作 + boolean result = employCollectionJobService.save(collectionJob); - if(result){ - return Result.OK("收藏成功"); - }else { - return Result.OK("收藏失败"); + if(result){ + return Result.OK("收藏成功"); + }else { + return Result.error("收藏失败"); + } + }catch (Exception e){ + e.printStackTrace(); + return Result.error("收藏失败"); } } @@ -109,61 +119,71 @@ public class CollectionServiceImpl implements CollectionService { //我的收藏-收藏简历信息 @Override public Result queryResumeCollectionList(String token, PageBean pageBean) { - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - //获取收藏列表 - Page pageList = employCollectionResumeService - .lambdaQuery() - .eq(EmployCollectionResume::getUserId, hanHaiMember.getId()) - .page(page); - - //根据收藏列表关联简历id获取简历信息 - for (EmployCollectionResume record : pageList.getRecords()) { - //获取简历信息 - EmployResume resume = employResumeService.getById(record.getResumeId()); - //将简历信息添加到我的收藏中 - record.setEmployResume(resume); - } + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + //获取收藏列表 + Page pageList = employCollectionResumeService + .lambdaQuery() + .eq(EmployCollectionResume::getUserId, hanHaiMember.getId()) + .page(page); + + //根据收藏列表关联简历id获取简历信息 + for (EmployCollectionResume record : pageList.getRecords()) { + //获取简历信息 + EmployResume resume = employResumeService.getById(record.getResumeId()); + //将简历信息添加到我的收藏中 + record.setEmployResume(resume); + } - return Result.OK("简历收藏列表", pageList); + return Result.OK("简历收藏列表", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("简历收藏列表获取失败"); + } } //我的收藏-添加简历收藏 @Override public Result addResumeCollection(String token, String resumeId){ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - - //判断该工作是否已经被收藏，如果已被收藏，则取消收藏 - EmployCollectionResume collection = employCollectionResumeService - .lambdaQuery() - .eq(EmployCollectionResume::getUserId, hanHaiMember.getId()) - .eq(EmployCollectionResume::getResumeId, resumeId) - .one(); - if(null != collection){ - //执行取消收藏 - boolean result = employCollectionResumeService.removeById(collection.getId()); - if(result){ - return Result.OK("取消收藏成功"); - }else { - return Result.OK("取消收藏失败"); + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //1、判断该工作是否已经被收藏，如果已被收藏，则取消收藏 + EmployCollectionResume collection = employCollectionResumeService + .lambdaQuery() + .eq(EmployCollectionResume::getUserId, hanHaiMember.getId()) + .eq(EmployCollectionResume::getResumeId, resumeId) + .one(); + if(null != collection){ + //执行取消收藏 + boolean result = employCollectionResumeService.removeById(collection.getId()); + if(result){ + return Result.OK("取消收藏成功"); + }else { + return Result.error("取消收藏失败"); + } } - } - //添加收藏 - EmployCollectionResume collectionResume = new EmployCollectionResume(); - collectionResume.setResumeId(resumeId); - collectionResume.setUserId(hanHaiMember.getId()); + //2、添加收藏 + EmployCollectionResume collectionResume = new EmployCollectionResume(); + collectionResume.setResumeId(resumeId); + collectionResume.setUserId(hanHaiMember.getId()); - //执行工作收藏操作 - boolean result = employCollectionResumeService.save(collectionResume); + //执行工作收藏操作 + boolean result = employCollectionResumeService.save(collectionResume); - if(result){ - return Result.OK("收藏成功"); - }else { - return Result.OK("收藏失败"); + if(result){ + return Result.OK("收藏成功"); + }else { + return Result.error("收藏失败"); + } + }catch (Exception e){ + e.printStackTrace(); + return Result.error("收藏失败"); } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CompanyServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CompanyServiceImpl.java index 4854ee8..4f552ee 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CompanyServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CompanyServiceImpl.java @@ -27,39 +27,51 @@ public class CompanyServiceImpl implements CompanyService { //查看企业信息 @Override public Result queryCompany(String token) { - String message = ""; - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //获取工作详情 - EmployAhthenticationCompany one = employAhthenticationCompanyService - .lambdaQuery() - .eq(EmployAhthenticationCompany::getUserId, hanHaiMember.getId()) - .one(); + String message = "企业信息查询失败"; - if(null != one){ - message = "企业信息！"; - }else { - message = "没有企业信息！"; - } + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //获取工作详情 + EmployAhthenticationCompany one = employAhthenticationCompanyService + .lambdaQuery() + .eq(EmployAhthenticationCompany::getUserId, hanHaiMember.getId()) + .one(); + + if(null != one){ + message = "企业信息！"; + }else { + message = "没有企业信息！"; + } - return Result.OK(message, one); + return Result.OK(message, one); + }catch (Exception e){ + e.printStackTrace(); + return Result.error(message); + } } //修改企业信息 @Override public Result updateCompany(String token, EmployAhthenticationCompany company) { - String message = ""; - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + String message = "修改企业信息失败！"; - boolean result = employAhthenticationCompanyService.updateById(company); + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - if(result){ - message = "修改企业信息成功！"; - }else { - message = "修改企业信息失败！"; - } + boolean result = employAhthenticationCompanyService.updateById(company); + + if(result){ + message = "修改企业信息成功！"; + }else { + message = "修改企业信息失败！"; + } - return Result.OK(message); + return Result.OK(message); + }catch (Exception e){ + e.printStackTrace(); + return Result.error(message); + } } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java index de47eb7..48a8a3d 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java @@ -52,70 +52,99 @@ public class ConfigServiceImpl implements ConfigService { //获取配置信息列表 @Override public Result queryConfigList() { - //获取收藏列表 - List pageList = employConfigService - .lambdaQuery() - .list(); - - return Result.OK("配置信息列表", pageList); + try{ + //获取收藏列表 + List pageList = employConfigService + .lambdaQuery() + .list(); + + return Result.OK("配置信息列表", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("配置信息列表查询失败"); + } } //根据配置编码获取配置信息 @Override public Result queryConfig(String paramCode) { - EmployConfig one = employConfigService - .lambdaQuery() - .eq(EmployConfig::getParamCode, paramCode) - .one(); - - return Result.OK("配置信息详情", one); + try{ + EmployConfig one = employConfigService + .lambdaQuery() + .eq(EmployConfig::getParamCode, paramCode) + .one(); + + return Result.OK("配置信息详情", one); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("配置信息详情查询失败"); + } } //获取轮播图列表带分页 @Override public Result queryBannerList(String bannerCategoryId, PageBean pageBean) { - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employImageService - .lambdaQuery() - .page(page); - - return Result.OK("轮播图列表", pageList); + try{ + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employImageService + .lambdaQuery() + .page(page); + + return Result.OK("轮播图列表", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("轮播图列表查询失败"); + } } //获取工种列表带分页 @Override public Result queryJobTypeList(PageBean pageBean) { - - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employJobTypeService - .lambdaQuery() - .page(page); - - return Result.OK("工种列表", pageList); + try{ + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employJobTypeService + .lambdaQuery() + .page(page); + + return Result.OK("工种列表", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("工种列表查询失败"); + } } //获取工作性质带分页 @Override public Result queryJobNatureList(PageBean pageBean) { - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employNatureService - .lambdaQuery() - .page(page); - - return Result.OK("工作性质列表", pageList); + try{ + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employNatureService + .lambdaQuery() + .page(page); + + return Result.OK("工作性质列表", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("工作性质列表查询失败"); + } } //获取地址列表带分页 @Override public Result queryAddressList(PageBean pageBean) { - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employAddressService - .lambdaQuery() - .page(page); - - return Result.OK("地址列表", pageList); + try{ + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employAddressService + .lambdaQuery() + .page(page); + + return Result.OK("地址列表", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("地址列表查询失败"); + } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ContractServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ContractServiceImpl.java index 9a3653f..9f40ae6 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ContractServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ContractServiceImpl.java @@ -6,9 +6,16 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.apiBean.PageBean; import org.jeecg.modules.apiService.ContractService; +import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany; +import org.jeecg.modules.employAhthenticationCompany.service.IEmployAhthenticationCompanyService; +import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson; +import org.jeecg.modules.employAuthenticationPerson.service.IEmployAuthenticationPersonService; import org.jeecg.modules.employContract.entity.EmployContract; import org.jeecg.modules.employContract.service.IEmployContractService; +import org.jeecg.modules.employResume.entity.EmployResume; +import org.jeecg.modules.employResume.service.IEmployResumeService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -21,51 +28,128 @@ public class ContractServiceImpl implements ContractService { @Resource private ShiroRealm shiroRealm; + //电子合同表 @Resource private IEmployContractService employContractService; + + //企业实名认证表 + @Resource + private IEmployAhthenticationCompanyService ahthenticationCompanyService; + + //个人实名认证表 + @Resource + private IEmployAuthenticationPersonService authenticationPersonService; + + //简历信息表 + @Resource + private IEmployResumeService employResumeService; /******************************************************************************************************************/ //电子合同-获取电子合同列表 @Override - public Result queryContractList(String token, EmployContract employContract, PageBean pageBean) { - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - - //分页 - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - LambdaQueryChainWrapper query = employContractService - .lambdaQuery() - .eq(EmployContract::getBossId, hanHaiMember.getId()); - - //组装查询条件 - if(null != employContract.getSignCompany()){ - query.like(EmployContract::getSignCompany, employContract.getSignCompany()); - } - if(null != employContract.getSignPerson()){ - query.like(EmployContract::getSignPerson, employContract.getSignPerson()); - } + public Result queryContractList(String token, String role, EmployContract employContract, PageBean pageBean) { + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //获取电子合同信息 - Page pageList = query.page(page); + //分页 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + LambdaQueryChainWrapper query = employContractService + .lambdaQuery() + .eq(EmployContract::getBossId, hanHaiMember.getId()); - return Result.OK("电子合同列表", pageList); + //组装查询条件 + if("0".equals(role)){ + //用户为个人 + query.eq(EmployContract::getPersonId, hanHaiMember.getId()); + }else if("1".equals(role)){ + //用户为企业 + query.eq(EmployContract::getBossId, hanHaiMember.getId()); + }else { + return Result.error("角色类型输入错误，电子合同列表查询失败"); + } + if(null != employContract.getSignCompany()){ + query.eq(EmployContract::getSignCompany, employContract.getSignCompany()); + } + if(null != employContract.getSignPerson()){ + query.eq(EmployContract::getSignPerson, employContract.getSignPerson()); + } + + //获取电子合同信息 + Page pageList = query.page(page); + + return Result.OK("电子合同列表", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("电子合同列表查询失败"); + } } //电子合同-获取电子合同详情 @Override public Result queryContracById(String token, String contractId) { - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - EmployContract one = employContractService - .lambdaQuery() - .eq(EmployContract::getBossId, hanHaiMember.getId()) - .eq(EmployContract::getId, contractId) - .one(); + EmployContract one = employContractService + .lambdaQuery() + .eq(EmployContract::getId, contractId) + .one(); - return Result.OK("电子合同详情", one); + return Result.OK("电子合同详情", one); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("电子合同详情查询失败"); + } + } + + //添加电子合同信息 + public Result addContract(String token, String resumeId) { + String message = "电子合同添加失败！"; + + //电子合同对象 + EmployContract contract = new EmployContract(); + + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //获取招聘者id + contract.setBossId(hanHaiMember.getId()); + + //获取招聘者实名公司名称 + EmployAhthenticationCompany company = ahthenticationCompanyService + .lambdaQuery() + .eq(EmployAhthenticationCompany::getUserId, hanHaiMember.getId()) + .one(); + contract.setNameA(company.getCompanyName()); + + //获取求职者id + EmployResume resume = employResumeService.getById(resumeId); + contract.setPersonId(resume.getUserId()); + + //获取实名用户姓名 + EmployAuthenticationPerson person = authenticationPersonService + .lambdaQuery() + .eq(EmployAuthenticationPerson::getUserId, resume.getUserId()) + .one(); + contract.setNameB(person.getName()); + + //执行合同添加操作 + boolean result = employContractService.save(contract); + if(result){ + return Result.OK("电子合同添加成功"); + }else { + return Result.error("电子合同添加失败"); + } + + }catch (Exception e){ + e.printStackTrace(); + return Result.error("电子合同添加失败"); + } } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/EmployeeApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/EmployeeApiServiceImpl.java index d81480b..63059a7 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/EmployeeApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/EmployeeApiServiceImpl.java @@ -135,39 +135,44 @@ public class EmployeeApiServiceImpl implements EmployeeApiService { CollectionBean collectionBean = new CollectionBean(); Boolean collectionFlag = false; - //获取工作详情 - EmployJob one = employJobService - .lambdaQuery() - .eq(EmployJob::getId, jobId) - .one(); + try{ + //获取工作详情 + EmployJob one = employJobService + .lambdaQuery() + .eq(EmployJob::getId, jobId) + .one(); - collectionBean.setEmployJob(one); + collectionBean.setEmployJob(one); - //添加工作被查看记录 - if(null != token){ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //添加工作被查看记录 + if(null != token){ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - EmployCheckJob employCheckJob = new EmployCheckJob(); - employCheckJob.setJobId(one.getId()); - employCheckJob.setUserId(hanHaiMember.getId()); - employCheckJobService.saveOrUpdate(employCheckJob); + EmployCheckJob employCheckJob = new EmployCheckJob(); + employCheckJob.setJobId(one.getId()); + employCheckJob.setUserId(hanHaiMember.getId()); + employCheckJobService.saveOrUpdate(employCheckJob); - //添加是否被收藏标识 - EmployCollectionJob collection = employCollectionJobService - .lambdaQuery() - .eq(EmployCollectionJob::getJobId, one.getId()) - .eq(EmployCollectionJob::getUserId, hanHaiMember.getId()) - .one(); + //添加是否被收藏标识 + EmployCollectionJob collection = employCollectionJobService + .lambdaQuery() + .eq(EmployCollectionJob::getJobId, one.getId()) + .eq(EmployCollectionJob::getUserId, hanHaiMember.getId()) + .one(); - if(null != collection){ - collectionFlag = true; + if(null != collection){ + collectionFlag = true; + } } - } - collectionBean.setCollectionFlag(collectionFlag); + collectionBean.setCollectionFlag(collectionFlag); - return Result.OK("工作详情", collectionBean); + return Result.OK("工作详情", collectionBean); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("工作详情获取失败", collectionBean); + } } /**************************************我的简历***********************************************/ @@ -177,22 +182,28 @@ public class EmployeeApiServiceImpl implements EmployeeApiService { public Result queryResume(String token) { //返回信息 String message = "简历信息查询失败"; - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //获取简历详情 - EmployJob one = employJobService - .lambdaQuery() - .eq(EmployJob::getUserId, hanHaiMember.getId()) - .one(); + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - if(null == one){ - message = "没有查询到简历信息"; - }else { - message = "简历详情"; - } + //获取简历详情 + EmployJob one = employJobService + .lambdaQuery() + .eq(EmployJob::getUserId, hanHaiMember.getId()) + .one(); - return Result.OK("简历详情", one); + if(null == one){ + message = "没有查询到简历信息"; + }else { + message = "简历详情"; + } + + return Result.OK("简历详情", one); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("简历详情获取失败"); + } } //添加简历 @@ -267,102 +278,127 @@ public class EmployeeApiServiceImpl implements EmployeeApiService { //考证咨询-证书查询 @Override public Result queryCertList(PageBean pageBean) { - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employCertService - .lambdaQuery() - .page(page); + try{ + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employCertService + .lambdaQuery() + .page(page); - return Result.OK("证书咨询列表", pageList); + return Result.OK("证书咨询列表", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("证书咨询列表查询失败"); + } } //考证咨询-提交报名材料 @Override public Result addMaterial(String token, EmployRedister employRedister) { - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //返回信息 - String message; + String message = "报名材料提交失败！"; + + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //提交报名材料 - employRedister.setUserId(hanHaiMember.getId()); - boolean result = employRedisterService.save(employRedister); + //提交报名材料 + employRedister.setUserId(hanHaiMember.getId()); + boolean result = employRedisterService.save(employRedister); - //判断招工信息是否添加成功 - if(result){ - message = "报名材料提交成功！"; - }else { - message = "报名材料提交失败！"; + //判断招工信息是否添加成功 + if(result){ + message = "报名材料提交成功！"; + }else { + message = "报名材料提交失败！"; + } + return Result.OK(message); + }catch (Exception e){ + e.printStackTrace(); + return Result.error(message); } - return Result.OK(message); } /***************会员中心***************/ //会员中心-我的收藏 @Override public Result queryJobCollectionList(String token, PageBean pageBean) { - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //获取工作收藏列表 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employCollectionJobService + .lambdaQuery() + .eq(EmployCollectionJob::getUserId, hanHaiMember.getId()) + .page(page); - //获取工作收藏列表 - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employCollectionJobService - .lambdaQuery() - .eq(EmployCollectionJob::getUserId, hanHaiMember.getId()) - .page(page); + //根据收藏列表工作id查询工作信息 + for (EmployCollectionJob record : pageList.getRecords()) { + //获取工作信息 + EmployJob job = employJobService.getById(record.getJobId()); - //根据收藏列表工作id查询工作信息 - for (EmployCollectionJob record : pageList.getRecords()) { - //获取工作信息 - EmployJob job = employJobService.getById(record.getJobId()); + //将工作信息添加至收藏列表 + record.setEmployJob(job); + } - //将工作信息添加至收藏列表 - record.setEmployJob(job); + return Result.OK("工作收藏列表", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("工作收藏列表查询失败"); } - - return Result.OK("工作收藏列表", pageList); } //会员中心-我的收藏(数量统计) @Override public Result queryJobCollectionCount(String token) { - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //获取工作收藏列表 - List list = employCollectionJobService - .lambdaQuery() - .eq(EmployCollectionJob::getUserId, hanHaiMember.getId()) - .list(); + //获取工作收藏列表 + List list = employCollectionJobService + .lambdaQuery() + .eq(EmployCollectionJob::getUserId, hanHaiMember.getId()) + .list(); - //工作收藏数量 - int count = list.size(); + //工作收藏数量 + int count = list.size(); - return Result.OK("我的收藏数量", count); + return Result.OK("我的收藏数量", count); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("我的收藏数量查询失败"); + } } //会员中心-联系记录-我看过谁 @Override public Result queryWatchWho(String token, PageBean pageBean) { - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //获取我看过谁的记录信息 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employCheckJobService + .lambdaQuery() + .eq(EmployCheckJob::getUserId, hanHaiMember.getId()) + .page(page); - //获取我看过谁的记录信息 - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employCheckJobService - .lambdaQuery() - .eq(EmployCheckJob::getUserId, hanHaiMember.getId()) - .page(page); - - //添加工作信息 - for (EmployCheckJob record : pageList.getRecords()) { - //获取工作信息 - EmployJob employJob = employJobService.getById(record.getJobId()); //添加工作信息 - record.setEmployJob(employJob); - } + for (EmployCheckJob record : pageList.getRecords()) { + //获取工作信息 + EmployJob employJob = employJobService.getById(record.getJobId()); + //添加工作信息 + record.setEmployJob(employJob); + } - return Result.OK("我看过谁", pageList); + return Result.OK("我看过谁", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("我看过谁列表查询失败"); + } } //会员中心-联系记录-我看过谁(数量统计) @@ -371,174 +407,204 @@ public class EmployeeApiServiceImpl implements EmployeeApiService { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //获取我看过谁的记录信息 - List list = employCheckJobService - .lambdaQuery() - .eq(EmployCheckJob::getUserId, hanHaiMember.getId()) - .list(); + try{ + //获取我看过谁的记录信息 + List list = employCheckJobService + .lambdaQuery() + .eq(EmployCheckJob::getUserId, hanHaiMember.getId()) + .list(); - //获取数量统计 - int count = list.size(); + //获取数量统计 + int count = list.size(); - return Result.OK("我看过谁(数量统计)", count); + return Result.OK("我看过谁(数量统计)", count); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("我看过谁(数量统计)失败"); + } } //会员中心-联系记录-谁看过我(谁看过我的简历) @Override public Result queryWatchMe(String token, PageBean pageBean) { - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //查询我发布的简历列表 - List resumeList = employResumeService - .lambdaQuery() - .eq(EmployResume::getUserId, hanHaiMember.getId()) - .list(); - - //获取查看我发布的简历id列表 - int resumeSize = (int)resumeList.size(); - Object[] resumeIds = new Object[resumeSize]; - int jobIndex = 0; - for (EmployResume resume : resumeList) { - resumeIds[jobIndex] = resume.getId(); - jobIndex++; - } - if(resumeSize == 0){ - return Result.OK("您还没有发布过简历", resumeList); - } + //查询我发布的简历列表 + List resumeList = employResumeService + .lambdaQuery() + .eq(EmployResume::getUserId, hanHaiMember.getId()) + .list(); - //获取简历被查询的记录 - List checkResumeList = employCheckResumeService - .lambdaQuery() - .in(EmployCheckResume::getResumeId, resumeIds) - .list(); - - //获取查看我的简历的招聘者id - int size = (int)checkResumeList.size(); - Object[] bossIds = new Object[size]; - int index = 0; - for (EmployCheckResume employCheckResume : checkResumeList) { - bossIds[index] = employCheckResume.getUserId(); - index++; - } + //获取查看我发布的简历id列表 + int resumeSize = (int)resumeList.size(); + Object[] resumeIds = new Object[resumeSize]; + int jobIndex = 0; + for (EmployResume resume : resumeList) { + resumeIds[jobIndex] = resume.getId(); + jobIndex++; + } + if(resumeSize == 0){ + return Result.OK("您还没有发布过简历", resumeList); + } - if(size == 0){ - return Result.OK("没有人看过我的简历", checkResumeList); - } + //获取简历被查询的记录 + List checkResumeList = employCheckResumeService + .lambdaQuery() + .in(EmployCheckResume::getResumeId, resumeIds) + .list(); - //根据招聘者id查询招聘者基本信息 - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page hanHaiMemberList = hanHaiMemberService - .lambdaQuery() - .in(HanHaiMember::getId, bossIds) - .page(page); + //获取查看我的简历的招聘者id + int size = (int)checkResumeList.size(); + Object[] bossIds = new Object[size]; + int index = 0; + for (EmployCheckResume employCheckResume : checkResumeList) { + bossIds[index] = employCheckResume.getUserId(); + index++; + } - //根据招聘者id查询招聘者发布的工作 - for (HanHaiMember record : hanHaiMemberList.getRecords()) { - List employJobList = employJobService + if(size == 0){ + return Result.OK("没有人看过我的简历", checkResumeList); + } + + //根据招聘者id查询招聘者基本信息 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page hanHaiMemberList = hanHaiMemberService .lambdaQuery() - .eq(EmployJob::getUserId, record.getId()) - .list(); + .in(HanHaiMember::getId, bossIds) + .page(page); - record.setEmployJobList(employJobList); - } + //根据招聘者id查询招聘者发布的工作 + for (HanHaiMember record : hanHaiMemberList.getRecords()) { + List employJobList = employJobService + .lambdaQuery() + .eq(EmployJob::getUserId, record.getId()) + .list(); + + record.setEmployJobList(employJobList); + } - return Result.OK("谁看过我(谁看过我的简历)", hanHaiMemberList); + return Result.OK("谁看过我(谁看过我的简历)", hanHaiMemberList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("谁看过我(谁看过我的简历)查询失败"); + } } //会员中心-联系记录-谁看过我(谁看过我的简历-数量统计) @Override public Result queryWatchMeCount(String token) { - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //查询我发布的简历列表 - List resumeList = employResumeService - .lambdaQuery() - .eq(EmployResume::getUserId, hanHaiMember.getId()) - .list(); - - //获取查看我发布的简历id列表 - int resumeSize = (int)resumeList.size(); - Object[] resumeIds = new Object[resumeSize]; - int jobIndex = 0; - for (EmployResume resume : resumeList) { - resumeIds[jobIndex] = resume.getId(); - jobIndex++; - } - if(resumeSize == 0){ - return Result.OK("您还没有发布过简历", resumeList); - } + //查询我发布的简历列表 + List resumeList = employResumeService + .lambdaQuery() + .eq(EmployResume::getUserId, hanHaiMember.getId()) + .list(); - //获取简历被查询的记录 - List checkResumeList = employCheckResumeService - .lambdaQuery() - .in(EmployCheckResume::getResumeId, resumeIds) - .list(); + //获取查看我发布的简历id列表 + int resumeSize = (int)resumeList.size(); + Object[] resumeIds = new Object[resumeSize]; + int jobIndex = 0; + for (EmployResume resume : resumeList) { + resumeIds[jobIndex] = resume.getId(); + jobIndex++; + } + if(resumeSize == 0){ + return Result.OK("您还没有发布过简历", resumeList); + } - int count = checkResumeList.size(); + //获取简历被查询的记录 + List checkResumeList = employCheckResumeService + .lambdaQuery() + .in(EmployCheckResume::getResumeId, resumeIds) + .list(); + + int count = checkResumeList.size(); - return Result.OK("谁看过我(谁看过我的简历-数量统计)", count); + return Result.OK("谁看过我(谁看过我的简历-数量统计)", count); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("谁看过我(谁看过我的简历-数量统计)查询失败", 0); + } } //会员中心-我的找活 @Override public Result queryResumeByUserId(String token, PageBean pageBean) { - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employResumeService - .lambdaQuery() - .eq(EmployResume::getUserId, hanHaiMember.getId()) - .page(page); + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employResumeService + .lambdaQuery() + .eq(EmployResume::getUserId, hanHaiMember.getId()) + .page(page); - return Result.OK("我的找活", pageList); + return Result.OK("我的找活", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("我的找活列表查询失败"); + } } //电子合同-获取电子合同列表 @Override public Result queryContractList(String token, EmployContract employContract, PageBean pageBean) { - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //分页 - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - LambdaQueryChainWrapper query = employContractService - .lambdaQuery() - .eq(EmployContract::getPersonId, hanHaiMember.getId()); + //分页 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + LambdaQueryChainWrapper query = employContractService + .lambdaQuery() + .eq(EmployContract::getPersonId, hanHaiMember.getId()); - //组装查询条件 - if(null != employContract.getSignCompany()){ - query.like(EmployContract::getSignCompany, employContract.getSignCompany()); - } - if(null != employContract.getSignPerson()){ - query.like(EmployContract::getSignPerson, employContract.getSignPerson()); - } + //组装查询条件 + if(null != employContract.getSignCompany()){ + query.like(EmployContract::getSignCompany, employContract.getSignCompany()); + } + if(null != employContract.getSignPerson()){ + query.like(EmployContract::getSignPerson, employContract.getSignPerson()); + } - //获取电子合同信息 - Page pageList = query.page(page); + //获取电子合同信息 + Page pageList = query.page(page); - return Result.OK("电子合同列表", pageList); + return Result.OK("电子合同列表", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("电子合同列表查询失败"); + } } //电子合同-获取电子合同详情 @Override public Result queryContracById(String token, String contractId) { - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - EmployContract one = employContractService - .lambdaQuery() - .eq(EmployContract::getId, contractId) - .eq(EmployContract::getPersonId, hanHaiMember.getId()) - .one(); + EmployContract one = employContractService + .lambdaQuery() + .eq(EmployContract::getId, contractId) + .eq(EmployContract::getPersonId, hanHaiMember.getId()) + .one(); - return Result.OK("电子合同详情", one); + return Result.OK("电子合同详情", one); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("电子合同详情查询失败"); + } } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ExaminationServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ExaminationServiceImpl.java index fa4e8f1..11c835d 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ExaminationServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ExaminationServiceImpl.java @@ -48,17 +48,52 @@ public class ExaminationServiceImpl implements ExaminationService { //考证咨询-证书查询 @Override public Result queryCertList(PageBean pageBean) { - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employCertService - .lambdaQuery() - .page(page); + try{ + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employCertService + .lambdaQuery() + .page(page); + + for (EmployCert record : pageList.getRecords()) { + + //获取证书相关报名材料关联 + List employCertMaterialList = employCertMaterialService + .lambdaQuery() + .eq(EmployCertMaterial::getCertId, record.getId()) + .list(); + + //获取报名材料 + List employMaterialList = new ArrayList<>(); + for (EmployCertMaterial employCertMaterial : employCertMaterialList) { + EmployMaterial material = employMaterialService + .lambdaQuery() + .eq(EmployMaterial::getId, employCertMaterial.getMaterialId()) + .one(); + employMaterialList.add(material); + } + record.setEmployMaterialList(employMaterialList); - for (EmployCert record : pageList.getRecords()) { + } + return Result.OK("证书咨询列表", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("证书咨询列表查询失败"); + } + } + + //查询证书详情 + @Override + public Result queryCertById(String cerId) { + + try{ + //查询证书详情 + EmployCert cert = employCertService.getById(cerId); //获取证书相关报名材料关联 List employCertMaterialList = employCertMaterialService .lambdaQuery() - .eq(EmployCertMaterial::getCertId, record.getId()) + .eq(EmployCertMaterial::getCertId, cert.getId()) + .orderByAsc(EmployCertMaterial::getOrderNo) .list(); //获取报名材料 @@ -70,60 +105,40 @@ public class ExaminationServiceImpl implements ExaminationService { .one(); employMaterialList.add(material); } - record.setEmployMaterialList(employMaterialList); - - } - return Result.OK("证书咨询列表", pageList); - } - - //查询证书详情 - @Override - public Result queryCertById(String cerId) { - - //查询证书详情 - EmployCert cert = employCertService.getById(cerId); + cert.setEmployMaterialList(employMaterialList); - //获取证书相关报名材料关联 - List employCertMaterialList = employCertMaterialService - .lambdaQuery() - .eq(EmployCertMaterial::getCertId, cert.getId()) - .orderByAsc(EmployCertMaterial::getOrderNo) - .list(); - - //获取报名材料 - List employMaterialList = new ArrayList<>(); - for (EmployCertMaterial employCertMaterial : employCertMaterialList) { - EmployMaterial material = employMaterialService - .lambdaQuery() - .eq(EmployMaterial::getId, employCertMaterial.getMaterialId()) - .one(); - employMaterialList.add(material); + return Result.OK("证书详情", cert); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("证书详情查询失败"); } - cert.setEmployMaterialList(employMaterialList); - - return Result.OK("证书详情", cert); } //考证咨询-提交报名材料 @Override public Result addMaterial(String token, EmployRedister employRedister) { - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //返回信息 - String message; + String message = "报名材料提交失败！"; + + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //提交报名材料 - employRedister.setUserId(hanHaiMember.getId()); - boolean result = employRedisterService.save(employRedister); + //提交报名材料 + employRedister.setUserId(hanHaiMember.getId()); + boolean result = employRedisterService.save(employRedister); - //判断招工信息是否添加成功 - if(result){ - message = "报名材料提交成功！"; - }else { - message = "报名材料提交失败！"; + //判断招工信息是否添加成功 + if(result){ + message = "报名材料提交成功！"; + }else { + message = "报名材料提交失败！"; + } + return Result.OK(message); + }catch (Exception e){ + e.printStackTrace(); + return Result.error(message); } - return Result.OK(message); } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ExchangeServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ExchangeServiceImpl.java index 88fc8aa..50c5499 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ExchangeServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ExchangeServiceImpl.java @@ -126,37 +126,6 @@ public class ExchangeServiceImpl implements ExchangeService { //修改积分 scoreFlag = hanHaiMemberService.updateById(hanHaiMember); -// //查询该用户是否有积分信息 -// EmployScore one = employScoreService -// .lambdaQuery() -// .eq(EmployScore::getUserId, hanHaiMember.getId()) -// .one(); -// -// double score = exchange.getScore(); -// -// //如果有积分信息，就在该基础上增加积分 -// EmployScore employScore = new EmployScore(); -// employScore.setUserId(hanHaiMember.getId()); -// if(null != one){ -// double newScore; -// if(null != one.getScore()){ -// newScore = one.getScore() + score; -// }else { -// newScore = score; -// } -// -// employScore.setId(one.getId()); -// employScore.setScore(newScore); -// -// //添加/修改积分信息 -// scoreFlag = employScoreService.updateById(employScore); -// -// }else { -// //如果没有积分信息，就新建积分信息 -// employScore.setScore(score); -// scoreFlag = employScoreService.save(employScore); -// -// } //5、添加用户积分记录 EmployScoreRecord scoreRecord = new EmployScoreRecord(); @@ -184,19 +153,24 @@ public class ExchangeServiceImpl implements ExchangeService { @Override public Result addExchange(EmployExchange employExchange) { - UUID code = UUID.randomUUID();//生成兑换码 + try{ + UUID code = UUID.randomUUID();//生成兑换码 - EmployExchange exchange = new EmployExchange(); - exchange.setCode(code.toString());//兑换码 - exchange.setStatus("0");//兑换码状态 - exchange.setScore(employExchange.getScore());//兑换码可换取积分数量 - exchange.setOverdueTime(employExchange.getOverdueTime());//兑换码过期时间 + EmployExchange exchange = new EmployExchange(); + exchange.setCode(code.toString());//兑换码 + exchange.setStatus("0");//兑换码状态 + exchange.setScore(employExchange.getScore());//兑换码可换取积分数量 + exchange.setOverdueTime(employExchange.getOverdueTime());//兑换码过期时间 - boolean result = employExchangeService.save(exchange); + boolean result = employExchangeService.save(exchange); - if(result){ - return Result.error("兑换码生成成功"); - }else { + if(result){ + return Result.OK("兑换码生成成功"); + }else { + return Result.error("兑换码使用失败"); + } + }catch (Exception e){ + e.printStackTrace(); return Result.error("兑换码使用失败"); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java index 45329ca..93527c8 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java @@ -125,70 +125,90 @@ public class JobServiceImpl implements JobService { @Override public Result queryJobById(String token, String jobId) { - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //返回信息 Map map = new HashMap<>(); - //查看工作详情信息 - EmployJob job = employJobService.getById(jobId); - map.put("jobInfo", job); - - - //查看招聘者信息 - HanHaiMember member = hanHaiMemberService.getById(job.getUserId()); - map.put("hanHaiMember", member); - - //根据工作关联用户id查询出用户实名认证信息 - EmployAuthenticationPerson person = employAuthenticationPersonService - .lambdaQuery() - .eq(EmployAuthenticationPerson::getUserId, job.getUserId()) - .one(); - map.put("personInfo", person); - - //根据关联公司id查询出公司信息 - EmployCompany company = employCompanyService - .lambdaQuery() - .eq(EmployCompany::getId, job.getCompany()) - .one(); - map.put("companyInfo", company); - - //添加工作是否被收藏标识 - EmployCollectionJob collection = employCollectionJobService - .lambdaQuery() - .eq(EmployCollectionJob::getJobId, job.getId()) - .eq(EmployCollectionJob::getUserId, hanHaiMember.getId()) - .one(); - if(null != collection){ - map.put("CollectionFlage", true); - }else { - map.put("CollectionFlage", false); - } + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //1、查看工作详情信息 + EmployJob job = employJobService.getById(jobId); + map.put("jobInfo", job); + + + //2、查看招聘者信息 + HanHaiMember member = hanHaiMemberService.getById(job.getUserId()); + map.put("hanHaiMember", member); + + //3、根据工作关联用户id查询出用户实名认证信息 + EmployAuthenticationPerson person = employAuthenticationPersonService + .lambdaQuery() + .eq(EmployAuthenticationPerson::getUserId, job.getUserId()) + .one(); + map.put("personInfo", person); + + //4、根据关联公司id查询出公司信息 + EmployCompany company = employCompanyService + .lambdaQuery() + .eq(EmployCompany::getId, job.getCompany()) + .one(); + map.put("companyInfo", company); - //添加工作被查看记录 - EmployCheckJob employCheckJob = new EmployCheckJob(); - employCheckJob.setJobId(job.getId()); - employCheckJob.setUserId(hanHaiMember.getId()); - employCheckJobService.saveOrUpdate(employCheckJob); + //5、添加工作是否被收藏标识 + EmployCollectionJob collection = employCollectionJobService + .lambdaQuery() + .eq(EmployCollectionJob::getJobId, job.getId()) + .eq(EmployCollectionJob::getUserId, hanHaiMember.getId()) + .one(); + if(null != collection){ + map.put("CollectionFlage", true); + }else { + map.put("CollectionFlage", false); + } + //6、添加工作被查看记录 + //如果之前查看过相同的工作信息，将之前的记录删除掉，只保留最新的记录 + EmployCheckJob checkRecord = employCheckJobService + .lambdaQuery() + .eq(EmployCheckJob::getJobId, job.getId()) + .eq(EmployCheckJob::getUserId, hanHaiMember.getId()) + .one(); + if(null != checkRecord){ + employCheckJobService.removeById(checkRecord.getId()); + } + //添加新的记录 + EmployCheckJob employCheckJob = new EmployCheckJob(); + employCheckJob.setJobId(job.getId()); + employCheckJob.setUserId(hanHaiMember.getId()); + employCheckJobService.save(employCheckJob); - return Result.OK("工作详情", map); + return Result.OK("工作详情", map); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("工作详情获取失败", map); + } } //我的招工 @Override public Result queryJobListByUserId(String token, PageBean pageBean) { - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employJobService - .lambdaQuery() - .eq(EmployJob::getUserId, hanHaiMember.getId()) - .page(page); + //查询我的招工列表信息 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employJobService + .lambdaQuery() + .eq(EmployJob::getUserId, hanHaiMember.getId()) + .page(page); - return Result.OK("我的招工", pageList); + return Result.OK("我的招工", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.OK("我的招工列表查询失败"); + } } //添加工作信息 @@ -198,47 +218,48 @@ public class JobServiceImpl implements JobService { String message = "工作信息添加失败"; //执行结果 boolean result = false; - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - employJob.setUserId(hanHaiMember.getId()); - - //判断用户是否通过个人实名认证企业信息，没有通过实名认证信息则不能发布工作岗位信息 - EmployAuthenticationPerson authenticationPerson = employAuthenticationPersonService - .lambdaQuery() - .eq(EmployAuthenticationPerson::getUserId, hanHaiMember.getId()) - .eq(EmployAuthenticationPerson::getStatus, "1") - .one(); - if(null == authenticationPerson){ - return Result.error("未进行个人实名认证或个人实名认证审核未通过，请先去进行个人实名认证"); - } - //判断用户是否通过企业实名认证信息，没有通过实名认证信息则不能发布工作岗位信息 - EmployAhthenticationCompany ahthenticationCompany = employAhthenticationCompanyService - .lambdaQuery() - .eq(EmployAhthenticationCompany::getUserId, hanHaiMember.getId()) - .eq(EmployAhthenticationCompany::getStatus, "1") - .one(); - if(null == ahthenticationCompany){ - return Result.error("未进行企业实名认证或企业实名认证审核未通过，请先去进行企业实名认证"); - }else { - //查询企业信息 - EmployCompany company = employCompanyService + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + employJob.setUserId(hanHaiMember.getId()); + + //1、判断用户是否通过个人实名认证企业信息，没有通过实名认证信息则不能发布工作岗位信息 + EmployAuthenticationPerson authenticationPerson = employAuthenticationPersonService .lambdaQuery() - .eq(EmployCompany::getSocialCode, ahthenticationCompany.getSocialCode()) + .eq(EmployAuthenticationPerson::getUserId, hanHaiMember.getId()) + .eq(EmployAuthenticationPerson::getStatus, "1") .one(); - if(null != company){ - employJob.setCompany(company.getId());//工作信息关联公司 - if(null == employJob.getWorkAddress()){ - employJob.setWorkAddress(company.getAddress());//如果没有填写工作地址，则默认为公司地址 - } - }else { - return Result.error("未查询到企业信息，工作发布失败"); + if(null == authenticationPerson){ + return Result.error("未进行个人实名认证或个人实名认证审核未通过，请先去进行个人实名认证"); } - } + //2、判断用户是否通过企业实名认证信息，没有通过实名认证信息则不能发布工作岗位信息 + EmployAhthenticationCompany ahthenticationCompany = employAhthenticationCompanyService + .lambdaQuery() + .eq(EmployAhthenticationCompany::getUserId, hanHaiMember.getId()) + .eq(EmployAhthenticationCompany::getStatus, "1") + .one(); + if(null == ahthenticationCompany){ + return Result.error("未进行企业实名认证或企业实名认证审核未通过，请先去进行企业实名认证"); + }else { + //查询企业信息 + EmployCompany company = employCompanyService + .lambdaQuery() + .eq(EmployCompany::getSocialCode, ahthenticationCompany.getSocialCode()) + .one(); + if(null != company){ + employJob.setCompany(company.getId());//工作信息关联公司 + if(null == employJob.getWorkAddress()){ + employJob.setWorkAddress(company.getAddress());//如果没有填写工作地址，则默认为公司地址 + } + }else { + return Result.error("未查询到企业信息，工作发布失败"); + } - try{ - //执行工作信息添加 + } + + //3、执行工作信息添加 result = employJobService.save(employJob); //判断执行结果 @@ -248,7 +269,7 @@ public class JobServiceImpl implements JobService { message = "工作信息添加失败！"; } - //返回执行结果 + //4、返回执行结果 return Result.OK(message); }catch (Exception e){ @@ -265,10 +286,11 @@ public class JobServiceImpl implements JobService { String message = "工作信息修改失败"; //执行结果 boolean result = false; - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //执行工作信息修改 result = employJobService.updateById(employJob); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NotebookServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NotebookServiceImpl.java index 8bfaacc..4abb38b 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NotebookServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NotebookServiceImpl.java @@ -48,110 +48,129 @@ public class NotebookServiceImpl implements NotebookService { //记工记账-新建账本 @Override public Result addNoteBook(String token, EmployNotebook employNotebook) { - String message = ""; - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - - employNotebook.setStatus("0"); - employNotebook.setUserId(hanHaiMember.getId()); - boolean result = employNotebookService.save(employNotebook); + String message = "新建账本失败！"; + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + employNotebook.setUserId(hanHaiMember.getId()); + boolean result = employNotebookService.save(employNotebook); + + if(result){ + message = "新建账本成功！"; + }else { + message = "新建账本失败！"; + } - if(result){ - message = "新建账本成功！"; - }else { - message = "新建账本失败！"; + return Result.OK(message); + }catch (Exception e){ + e.printStackTrace(); + return Result.error(message); } - - return Result.OK(message); } //记工记账-修改账本 @Override public Result updateNoteBook(String token, EmployNotebook employNotebook) { - String message = ""; - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + String message = "修改账本失败！"; + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - boolean result = employNotebookService.updateById(employNotebook); + boolean result = employNotebookService.updateById(employNotebook); - if(result){ - message = "修改账本成功！"; - }else { - message = "修改账本失败！"; - } + if(result){ + message = "修改账本成功！"; + }else { + message = "修改账本失败！"; + } - return Result.OK(message); + return Result.OK(message); + }catch (Exception e){ + e.printStackTrace(); + return Result.error(message); + } } //记工记账-全年收支 @Override public Result queryBill(String token, String employNoteBookId, PageBean pageBean) { - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - - //获取账本id列表 - Object[] notebooIds = null; - if(null == employNoteBookId){ - //根据用户id查询用户账本列表 - List notebookList = employNotebookService - .lambdaQuery() - .eq(EmployNotebook::getUserId, hanHaiMember.getId()) - .list(); + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //获取账本id列表 - int size = (int)notebookList.size(); - notebooIds = new Object[size]; - int index = 0; - for (EmployNotebook employNotebook : notebookList) { - notebooIds[index] = employNotebook.getId(); - index++; - } - - if(size == 0){ - return Result.OK("没有收支记录", notebookList); + Object[] notebooIds = null; + if(null == employNoteBookId){ + //根据用户id查询用户账本列表 + List notebookList = employNotebookService + .lambdaQuery() + .eq(EmployNotebook::getUserId, hanHaiMember.getId()) + .list(); + + //获取账本id列表 + int size = (int)notebookList.size(); + notebooIds = new Object[size]; + int index = 0; + for (EmployNotebook employNotebook : notebookList) { + notebooIds[index] = employNotebook.getId(); + index++; + } + + if(size == 0){ + return Result.OK("没有收支记录", notebookList); + } + + }else { + notebooIds = new Object[]{employNoteBookId}; + + //判断用户输入账本id是否为自己所有 + EmployNotebook employNotebook = employNotebookService + .lambdaQuery() + .eq(EmployNotebook::getUserId, hanHaiMember.getId()) + .eq(EmployNotebook::getId, employNoteBookId) + .one(); + if(null == employNotebook){ + return Result.OK("该用户没有此账本的收支记录，请检查账本id输入是否错误", employNotebook); + } } - }else { - notebooIds = new Object[]{employNoteBookId}; - - //判断用户输入账本id是否为自己所有 - EmployNotebook employNotebook = employNotebookService + //根据账本id列表查询收支记录 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employBillInfoService .lambdaQuery() - .eq(EmployNotebook::getUserId, hanHaiMember.getId()) - .eq(EmployNotebook::getId, employNoteBookId) - .one(); - if(null == employNotebook){ - return Result.OK("该用户没有此账本的收支记录，请检查账本id输入是否错误", employNotebook); - } - } + .in(EmployBillInfo::getNotebookId, notebooIds) + .page(page); - //根据账本id列表查询收支记录 - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employBillInfoService - .lambdaQuery() - .in(EmployBillInfo::getNotebookId, notebooIds) - .page(page); - - return Result.OK("收支记录", pageList); + return Result.OK("收支记录", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("收支记录获取失败"); + } } //记工记账-技工问题 @Override public Result addQuestion(String token, EmployFeedback employFeedback) { - String message = ""; - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - - employFeedback.setUserId(hanHaiMember.getId()); - boolean result = employFeedbackService.save(employFeedback); + String message = "技工问题添加失败！"; + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + employFeedback.setUserId(hanHaiMember.getId()); + boolean result = employFeedbackService.save(employFeedback); + + if(result){ + message = "技工问题添加成功！"; + }else { + message = "技工问题添加失败！"; + } - if(result){ - message = "技工问题添加成功！"; - }else { - message = "技工问题添加失败！"; + return Result.OK(message); + }catch (Exception e){ + e.printStackTrace(); + return Result.error(message); } - - return Result.OK(message); } //记工记账-在建结束项目 @@ -160,59 +179,74 @@ public class NotebookServiceImpl implements NotebookService { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //分页 - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - LambdaQueryChainWrapper query = employNotebookService - .lambdaQuery(); + try{ + //分页 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + LambdaQueryChainWrapper query = employNotebookService + .lambdaQuery(); - //组装查询条件 - query.eq(EmployNotebook::getUserId, hanHaiMember.getId()); - if(null != type){ - query.eq(EmployNotebook::getType, type); - } - if(null != status){ - query.eq(EmployNotebook::getStatus, status); - } + //组装查询条件 + query.eq(EmployNotebook::getUserId, hanHaiMember.getId()); + if(null != type){ + query.eq(EmployNotebook::getType, type); + } + if(null != status){ + query.eq(EmployNotebook::getStatus, status); + } - //获取账本信息 - Page pageList = query.page(page); + //获取账本信息 + Page pageList = query.page(page); - return Result.OK("在建/结束项目", pageList); + return Result.OK("在建/结束项目", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("在建/结束项目列表获取失败"); + } } //记工记账-项目记账 @Override public Result addBillInfo(String token, EmployBillInfo employBillInfo) { - String message = ""; - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + String message = "项目记账添加失败！"; + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - boolean result = employBillInfoService.save(employBillInfo); + boolean result = employBillInfoService.save(employBillInfo); - if(result){ - message = "项目记账添加成功！"; - }else { - message = "项目记账添加失败！"; - } + if(result){ + message = "项目记账添加成功！"; + }else { + message = "项目记账添加失败！"; + } - return Result.OK(message); + return Result.OK(message); + }catch (Exception e){ + e.printStackTrace(); + return Result.error(message); + } } //记工记账-项目记工 @Override public Result addWorkInfo(String token, EmployWorkInfo employWorkInfo) { - String message = ""; - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + String message = "项目记工添加失败！"; + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - boolean result = employWorkInfoService.save(employWorkInfo); + boolean result = employWorkInfoService.save(employWorkInfo); - if(result){ - message = "项目记工添加成功！"; - }else { - message = "项目记工添加失败！"; - } + if(result){ + message = "项目记工添加成功！"; + }else { + message = "项目记工添加失败！"; + } - return Result.OK(message); + return Result.OK(message); + }catch (Exception e){ + e.printStackTrace(); + return Result.error(message); + } } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ResumeServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ResumeServiceImpl.java index 3a9ae8d..3b911d3 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ResumeServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ResumeServiceImpl.java @@ -10,6 +10,7 @@ import org.jeecg.modules.apiBean.PageBean; import org.jeecg.modules.apiService.ResumeService; import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson; import org.jeecg.modules.employAuthenticationPerson.service.IEmployAuthenticationPersonService; +import org.jeecg.modules.employCheckJob.entity.EmployCheckJob; import org.jeecg.modules.employCheckJob.service.IEmployCheckJobService; import org.jeecg.modules.employCheckResume.entity.EmployCheckResume; import org.jeecg.modules.employCheckResume.service.IEmployCheckResumeService; @@ -120,61 +121,81 @@ public class ResumeServiceImpl implements ResumeService { //根据id查看简历详情 @Override public Result queryResumeById(String token, String resumeId) { - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //返回信息 Map map = new HashMap<>(); - //1、获取简历详情 - EmployResume resume = employResumeService.getById(resumeId); - map.put("resume", resume); - - - //2、获取个人实名认证信息 - EmployAuthenticationPerson person = employAuthenticationPersonService - .lambdaQuery() - .eq(EmployAuthenticationPerson::getUserId, resume.getUserId()) - .one(); - map.put("authenticationPerson", person); - - //3、获取简历拥有者信息 - HanHaiMember member = hanHaiMemberService.getById(resume.getUserId()); - map.put("hanHaiMember", member); - - //4、添加是否被收藏标识 - EmployCollectionResume collection = employCollectionResumeService - .lambdaQuery() - .eq(EmployCollectionResume::getResumeId, resume.getId()) - .eq(EmployCollectionResume::getUserId, hanHaiMember.getId()) - .one(); - if(null != collection){ - map.put("collectionFlag", true); - }else { - map.put("collectionFlag", false); - } + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //1、获取简历详情 + EmployResume resume = employResumeService.getById(resumeId); + map.put("resume", resume); + + //2、获取个人实名认证信息 + EmployAuthenticationPerson person = employAuthenticationPersonService + .lambdaQuery() + .eq(EmployAuthenticationPerson::getUserId, resume.getUserId()) + .one(); + map.put("authenticationPerson", person); + + //3、获取简历拥有者信息 + HanHaiMember member = hanHaiMemberService.getById(resume.getUserId()); + map.put("hanHaiMember", member); + + //4、添加是否被收藏标识 + EmployCollectionResume collection = employCollectionResumeService + .lambdaQuery() + .eq(EmployCollectionResume::getResumeId, resume.getId()) + .eq(EmployCollectionResume::getUserId, hanHaiMember.getId()) + .one(); + if(null != collection){ + map.put("collectionFlag", true); + }else { + map.put("collectionFlag", false); + } - //5、添加简历被查看记录 - EmployCheckResume employCheckResume = new EmployCheckResume(); - employCheckResume.setResumeId(resume.getId()); - employCheckResume.setUserId(hanHaiMember.getId()); - employCheckResumeService.saveOrUpdate(employCheckResume); + //5、添加简历被查看记录 + //如果之前查看过相同的工作信息，将之前的记录删除掉，只保留最新的记录 + EmployCheckResume resumeRecord = employCheckResumeService + .lambdaQuery() + .eq(EmployCheckResume::getResumeId, resume.getId()) + .eq(EmployCheckResume::getUserId, hanHaiMember.getId()) + .one(); + if(null != resumeRecord){ + employCheckResumeService.removeById(resumeRecord.getId()); + } + //添加新的记录 + EmployCheckResume employCheckResume = new EmployCheckResume(); + employCheckResume.setResumeId(resume.getId()); + employCheckResume.setUserId(hanHaiMember.getId()); + employCheckResumeService.saveOrUpdate(employCheckResume); - return Result.OK("简历详情", map); + return Result.OK("简历详情", map); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("简历详情查询失败", map); + } } //会员中心-我的简历 @Override public Result queryResumeByUserId(String token, PageBean pageBean) { - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employResumeService - .lambdaQuery() - .eq(EmployResume::getUserId, hanHaiMember.getId()) - .page(page); + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employResumeService + .lambdaQuery() + .eq(EmployResume::getUserId, hanHaiMember.getId()) + .page(page); - return Result.OK("我的简历", pageList); + return Result.OK("我的简历", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("我的简历信息获取失败"); + } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java index 6bf38c3..fa60c39 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java @@ -41,38 +41,48 @@ public class ScoreServiceImpl implements ScoreService { //会员中心-积分 @Override public Result queryScore(String token) { - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - - //获取积分 - EmployScore score = employScoreService - .lambdaQuery() - .eq(EmployScore::getUserId, hanHaiMember.getId()) - .one(); - - return Result.OK("积分信息", score); + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //获取积分 + EmployScore score = employScoreService + .lambdaQuery() + .eq(EmployScore::getUserId, hanHaiMember.getId()) + .one(); + + return Result.OK("积分信息", score); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("积分信息获取失败"); + } } //会员中心-积分记录 @Override public Result queryScoreRecord(String token, String type, PageBean pageBean) { - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - - //分页 - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - LambdaQueryChainWrapper query = employScoreRecordService.lambdaQuery(); - - //组装查询条件 - query.eq(EmployScoreRecord::getUserId, hanHaiMember.getId()); - if(null != type){ - query.eq(EmployScoreRecord::getType, type); + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //分页 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + LambdaQueryChainWrapper query = employScoreRecordService.lambdaQuery(); + + //组装查询条件 + query.eq(EmployScoreRecord::getUserId, hanHaiMember.getId()); + if(null != type){ + query.eq(EmployScoreRecord::getType, type); + } + + //获取积分记录 + Page pageList = query.page(page); + + return Result.OK("积分记录", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("积分记录获取失败"); } - - //获取积分记录 - Page pageList = query.page(page); - - return Result.OK("积分记录", pageList); } //我的服务-获取积分-邀请工友获取积分 @@ -89,38 +99,44 @@ public class ScoreServiceImpl implements ScoreService { //我的服务-获取积分-每日签到获取积分 @Override public Result addScoreBySign(String token) { - String message = ""; - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - - //判断今日是否已签到 - boolean flag = judgeSign(token); - if(flag){ - return Result.error("已签到，不可重复签到"); + String message = "积分添加失败！"; + + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //判断今日是否已签到 + boolean flag = judgeSign(token); + if(flag){ + return Result.error("已签到，不可重复签到"); + } + + BigDecimal score = BigDecimal.valueOf(2);//签到积分 + + BigDecimal newScore = hanHaiMember.getIntegerPrice().add(score); + hanHaiMember.setIntegerPrice(newScore); + + //修改积分 + boolean result = hanHaiMemberService.updateById(hanHaiMember); + if(result){ + message = "积分添加成功！"; + }else { + message = "积分添加失败！"; + } + + //积分记录添加 + EmployScoreRecord record = new EmployScoreRecord(); + record.setScore(score); + record.setUserId(hanHaiMember.getId()); + record.setTitle("每日签到获取积分"); + record.setType("0"); + employScoreRecordService.save(record); + + return Result.OK(message); + }catch (Exception e){ + e.printStackTrace(); + return Result.error(message); } - - BigDecimal score = BigDecimal.valueOf(2);//签到积分 - - BigDecimal newScore = hanHaiMember.getIntegerPrice().add(score); - hanHaiMember.setIntegerPrice(newScore); - - //修改积分 - boolean result = hanHaiMemberService.updateById(hanHaiMember); - if(result){ - message = "积分添加成功！"; - }else { - message = "积分添加失败！"; - } - - //积分记录添加 - EmployScoreRecord record = new EmployScoreRecord(); - record.setScore(score); - record.setUserId(hanHaiMember.getId()); - record.setTitle("每日签到获取积分"); - record.setType("0"); - employScoreRecordService.save(record); - - return Result.OK(message); } //判断当日是否已签到 @@ -128,27 +144,32 @@ public class ScoreServiceImpl implements ScoreService { public Boolean judgeSign(String token) { Boolean result = true; - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - - //获取当天日期 - LocalDate date = LocalDate.now(); - - //查询当日签到记录 - EmployScoreRecord record = employScoreRecordService - .lambdaQuery() - .eq(EmployScoreRecord::getUserId, hanHaiMember.getId()) - .like(EmployScoreRecord::getCreateTime, date) - .eq(EmployScoreRecord::getTitle, "每日签到获取积分") - .one(); - - if(null != record){ - result = true; - } else { - result = false; + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //获取当天日期 + LocalDate date = LocalDate.now(); + + //查询当日签到记录 + EmployScoreRecord record = employScoreRecordService + .lambdaQuery() + .eq(EmployScoreRecord::getUserId, hanHaiMember.getId()) + .like(EmployScoreRecord::getCreateTime, date) + .eq(EmployScoreRecord::getTitle, "每日签到获取积分") + .one(); + + if(null != record){ + result = true; + } else { + result = false; + } + + return result; + }catch (Exception e){ + e.printStackTrace(); + return result; } - - return result; } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java index 9ef5f8d..616f316 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserInfoServiceImpl.java @@ -59,30 +59,40 @@ public class UserInfoServiceImpl implements UserInfoService { @Override public Result queryUserInfo(String token){ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - HanHaiMember byId = hanHaiMemberService.getById(hanHaiMember.getId()); - return Result.OK(byId); + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + HanHaiMember byId = hanHaiMemberService.getById(hanHaiMember.getId()); + return Result.OK(byId); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("用户信息获取失败", null); + } } @Override public Result updateUserInfo(String token,String nickName,String phone,String headImage){ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //用户昵称不能为空 - if(StringUtils.isBlank(nickName)){ - return Result.error("用户昵称不能为空"); - } - if(StringUtils.isBlank(headImage)){ - return Result.error("头像不能为空"); + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //用户昵称不能为空 + if(StringUtils.isBlank(nickName)){ + return Result.error("用户昵称不能为空"); + } + if(StringUtils.isBlank(headImage)){ + return Result.error("头像不能为空"); + } + + hanHaiMember.setNickName(nickName); + hanHaiMember.setPhone(phone); + hanHaiMember.setHeadImage(headImage); + hanHaiMemberService.updateById(hanHaiMember); + + return Result.OK("修改成功"); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("修改失败"); } - - hanHaiMember.setNickName(nickName); - hanHaiMember.setPhone(phone); - hanHaiMember.setHeadImage(headImage); - hanHaiMemberService.updateById(hanHaiMember); - - return Result.OK("修改成功"); } @@ -90,55 +100,66 @@ public class UserInfoServiceImpl implements UserInfoService { //lzx：获取个人中心基础数据信息 @Override public Result getUserCenterData(String token){ - - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - - //获取个人实名信息 - EmployAuthenticationPerson person = employAuthenticationPersonService - .lambdaQuery() - .eq(EmployAuthenticationPerson::getUserId, hanHaiMember.getId()) - .one(); - - //获取是否签到 - boolean signFlag = scoreService.judgeSign(token); - - //获取用户vip类型 - String vipType = getVip(token); - - //组装个人基础数据 + //返回信息 Map map = new HashMap(); - map.put("integerNum",hanHaiMember.getIntegerPrice()); - map.put("scNum",0); - map.put("lxNum",0); - if(null != person){ - map.put("status",person.getStatus());//实名状态 - }else { - map.put("status","0");//实名状态 + + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //获取个人实名信息 + EmployAuthenticationPerson person = employAuthenticationPersonService + .lambdaQuery() + .eq(EmployAuthenticationPerson::getUserId, hanHaiMember.getId()) + .one(); + + //获取是否签到 + boolean signFlag = scoreService.judgeSign(token); + + //获取用户vip类型 + String vipType = getVip(token); + + //组装个人基础数据 + map.put("integerNum",hanHaiMember.getIntegerPrice()); + map.put("scNum",0); + map.put("lxNum",0); + if(null != person){ + map.put("status",person.getStatus());//实名状态 + }else { + map.put("status","0");//实名状态 + } + map.put("signFlag",signFlag); + map.put("vipType", vipType);//VIP类型 + return Result.OK("获取个人中心基础数据信息",map); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("获取个人中心基础数据信息失败",map); } - map.put("signFlag",signFlag); - map.put("vipType", vipType);//VIP类型 - return Result.OK("获取个人中心基础数据信息",map); } //获取用户VIP信息 public String getVip(String token){ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - - //查询用户vip关联 - EmployVipUser vu = employVipUserService - .lambdaQuery() - .eq(EmployVipUser::getUserId, hanHaiMember.getId()) - .one(); - - if(null == vu){ - return "暂未开通VIP"; + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //查询用户vip关联 + EmployVipUser vu = employVipUserService + .lambdaQuery() + .eq(EmployVipUser::getUserId, hanHaiMember.getId()) + .one(); + + if(null == vu){ + return "暂未开通VIP"; + } + + //查询vip信息 + EmployVipType vt = employVipTypeService.getById(vu.getTypeId()); + + return vt.getName(); + }catch (Exception e){ + e.printStackTrace(); + return "Vip信息查询失败"; } - - //查询vip信息 - EmployVipType vt = employVipTypeService.getById(vu.getTypeId()); - - return vt.getName(); } }