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 561a105..28139f2 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 @@ -7,7 +7,6 @@ import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthentication 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.employCompany.entity.EmployCompany; import org.jeecg.modules.employCompany.service.IEmployCompanyService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.springframework.stereotype.Service; 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 a329764..976f33c 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 @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.config.shiro.ShiroRealm; -import org.jeecg.modules.apiBean.CollectionBean; import org.jeecg.modules.apiBean.PageBean; import org.jeecg.modules.apiService.BossApiService; import org.jeecg.modules.employCheckJob.entity.EmployCheckJob; 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 34e8293..70a97fd 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 @@ -9,8 +9,6 @@ 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; -import org.jeecg.modules.employCollectionJob.service.IEmployCollectionJobService; -import org.jeecg.modules.employCollectionResume.service.IEmployCollectionResumeService; import org.jeecg.modules.employJob.entity.EmployJob; import org.jeecg.modules.employJob.service.IEmployJobService; import org.jeecg.modules.employResume.entity.EmployResume; 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 76cf308..27e8800 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 @@ -18,8 +18,6 @@ import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; @Service public class CollectionServiceImpl implements CollectionService { @@ -53,10 +51,10 @@ public class CollectionServiceImpl implements CollectionService { //我的收藏-收藏工作信息 @Override public Result queryJobCollectionList(String token, PageBean pageBean) { - try{ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ //获取工作收藏列表 Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); Page pageList = employCollectionJobService @@ -83,10 +81,10 @@ public class CollectionServiceImpl implements CollectionService { //我的收藏-添加工作收藏 @Override public Result addJobCollection(String token, String jobId){ - try{ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ //判断该工作是否已经被收藏，如果已被收藏，则取消收藏 EmployCollectionJob collection = employCollectionJobService .lambdaQuery() @@ -126,10 +124,10 @@ public class CollectionServiceImpl implements CollectionService { //我的收藏-收藏简历信息 @Override public Result queryResumeCollectionList(String token, PageBean pageBean) { - try{ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); //1、获取收藏列表 Page pageList = employCollectionResumeService @@ -158,10 +156,10 @@ public class CollectionServiceImpl implements CollectionService { //我的收藏-添加简历收藏 @Override public Result addResumeCollection(String token, String resumeId){ - try{ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ //1、判断该工作是否已经被收藏，如果已被收藏，则取消收藏 EmployCollectionResume collection = employCollectionResumeService .lambdaQuery() diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java index 6d82c88..7396e3d 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.apiBean.PageBean; -import org.jeecg.modules.apiBean.ScoreBean; import org.jeecg.modules.apiService.CommonApiService; import org.jeecg.modules.employAddress.entity.EmployAddress; import org.jeecg.modules.employAddress.service.IEmployAddressService; @@ -25,7 +24,6 @@ import org.jeecg.modules.employNature.entity.EmployNature; import org.jeecg.modules.employNature.service.IEmployNatureService; import org.jeecg.modules.employNotebook.entity.EmployNotebook; import org.jeecg.modules.employNotebook.service.IEmployNotebookService; -import org.jeecg.modules.employResume.service.IEmployResumeService; import org.jeecg.modules.employScore.entity.EmployScore; import org.jeecg.modules.employScore.service.IEmployScoreService; import org.jeecg.modules.employScoreRecord.entity.EmployScoreRecord; @@ -37,7 +35,6 @@ import org.jeecg.modules.employVipUser.service.IEmployVipUserService; import org.jeecg.modules.employWorkInfo.entity.EmployWorkInfo; import org.jeecg.modules.employWorkInfo.service.IEmployWorkInfoService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; -import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -52,10 +49,6 @@ public class CommonApiServiceImpl implements CommonApiService { @Resource private ShiroRealm shiroRealm; - //用户表 - @Resource - private IHanHaiMemberService hanHaiMemberService; - //工种类型表 @Resource private IEmployJobTypeService employJobTypeService; @@ -64,10 +57,6 @@ public class CommonApiServiceImpl implements CommonApiService { @Resource private IEmployNatureService employNatureService; - //简历信息表 - @Resource - private IEmployResumeService employResumeService; - //图片信息表表 @Resource private IEmployImageService employImageService; 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 4f552ee..1ffcea1 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 @@ -5,8 +5,6 @@ import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.apiService.CompanyService; import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany; import org.jeecg.modules.employAhthenticationCompany.service.IEmployAhthenticationCompanyService; -import org.jeecg.modules.employCompany.service.IEmployCompanyService; -import org.jeecg.modules.employJob.entity.EmployJob; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import javax.annotation.Resource; 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 48a8a3d..39d1c2a 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 @@ -2,22 +2,18 @@ package org.jeecg.modules.apiService.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.common.api.vo.Result; -import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.apiBean.PageBean; import org.jeecg.modules.apiService.ConfigService; import org.jeecg.modules.employAddress.entity.EmployAddress; import org.jeecg.modules.employAddress.service.IEmployAddressService; -import org.jeecg.modules.employCollectionResume.entity.EmployCollectionResume; import org.jeecg.modules.employConfig.entity.EmployConfig; import org.jeecg.modules.employConfig.service.IEmployConfigService; -import org.jeecg.modules.employContract.entity.EmployContract; import org.jeecg.modules.employImage.entity.EmployImage; import org.jeecg.modules.employImage.service.IEmployImageService; import org.jeecg.modules.employJobType.entity.EmployJobType; import org.jeecg.modules.employJobType.service.IEmployJobTypeService; import org.jeecg.modules.employNature.entity.EmployNature; import org.jeecg.modules.employNature.service.IEmployNatureService; -import org.jeecg.modules.employResume.service.IEmployResumeService; import org.springframework.stereotype.Service; import javax.annotation.Resource; 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 9f40ae6..4b5b2fa 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 @@ -15,7 +15,6 @@ 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; @@ -49,10 +48,10 @@ public class ContractServiceImpl implements ContractService { //电子合同-获取电子合同列表 @Override public Result queryContractList(String token, String role, EmployContract employContract, PageBean pageBean) { - try{ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ //分页 Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); LambdaQueryChainWrapper query = employContractService @@ -90,10 +89,10 @@ public class ContractServiceImpl implements ContractService { //电子合同-获取电子合同详情 @Override public Result queryContracById(String token, String contractId) { - try{ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ EmployContract one = employContractService .lambdaQuery() .eq(EmployContract::getId, contractId) @@ -108,15 +107,14 @@ public class ContractServiceImpl implements ContractService { //添加电子合同信息 public Result addContract(String token, String resumeId) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //返回信息 String message = "电子合同添加失败！"; - //电子合同对象 EmployContract contract = new EmployContract(); try{ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //获取招聘者id contract.setBossId(hanHaiMember.getId()); 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 63059a7..3e0c591 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 @@ -1,10 +1,8 @@ package org.jeecg.modules.apiService.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.common.api.vo.Result; -import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.apiBean.CollectionBean; import org.jeecg.modules.apiBean.PageBean; 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 11c835d..3d942d1 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 @@ -117,13 +117,12 @@ public class ExaminationServiceImpl implements ExaminationService { //考证咨询-提交报名材料 @Override public Result addMaterial(String token, EmployRedister employRedister) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //返回信息 String message = "报名材料提交失败！"; try{ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //提交报名材料 employRedister.setUserId(hanHaiMember.getId()); boolean result = employRedisterService.save(employRedister); 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 50c5499..d36bd13 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 @@ -1,21 +1,16 @@ package org.jeecg.modules.apiService.impl; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.apiBean.PageBean; import org.jeecg.modules.apiService.ExchangeService; -import org.jeecg.modules.employCert.service.IEmployCertService; -import org.jeecg.modules.employCheckResume.entity.EmployCheckResume; import org.jeecg.modules.employExchange.entity.EmployExchange; import org.jeecg.modules.employExchange.service.IEmployExchangeService; import org.jeecg.modules.employExchangeConfig.entity.EmployExchangeConfig; import org.jeecg.modules.employExchangeConfig.service.IEmployExchangeConfigService; import org.jeecg.modules.employExchangeRecord.entity.EmployExchangeRecord; import org.jeecg.modules.employExchangeRecord.service.IEmployExchangeRecordService; -import org.jeecg.modules.employJob.entity.EmployJob; -import org.jeecg.modules.employScore.entity.EmployScore; import org.jeecg.modules.employScore.service.IEmployScoreService; import org.jeecg.modules.employScoreRecord.entity.EmployScoreRecord; import org.jeecg.modules.employScoreRecord.service.IEmployScoreRecordService; @@ -51,10 +46,6 @@ public class ExchangeServiceImpl implements ExchangeService { @Resource private IEmployExchangeConfigService employExchangeConfigService; - //积分表 - @Resource - private IEmployScoreService employScoreService; - //积分记录表 @Resource private IEmployScoreRecordService employScoreRecordService; @@ -93,10 +84,10 @@ public class ExchangeServiceImpl implements ExchangeService { //我的服务-使用兑换码 @Override public Result useExchange(String token, String code) { - try{ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ //1、查询兑换码信息 EmployExchange exchange = employExchangeService .lambdaQuery() 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 ac0d1a9..cfbc90f 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 @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; -import org.jeecg.modules.apiBean.CollectionBean; import org.jeecg.modules.apiBean.PageBean; import org.jeecg.modules.apiService.JobService; import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany; @@ -130,19 +129,16 @@ public class JobServiceImpl implements JobService { @Override public Result queryJobById(String token, String jobId) { - + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //返回信息 Map map = new HashMap<>(); 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); @@ -199,10 +195,10 @@ public class JobServiceImpl implements JobService { //我的招工 @Override public Result queryJobListByUserId(String token, PageBean pageBean) { - try{ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ //查询我的招工列表信息 Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); Page pageList = employJobService @@ -220,16 +216,15 @@ public class JobServiceImpl implements JobService { //添加工作信息 @Override public Result addJob(String token, EmployJob employJob) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + employJob.setUserId(hanHaiMember.getId()); //返回信息 String message = "工作信息添加失败"; //执行结果 boolean result = false; try{ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - employJob.setUserId(hanHaiMember.getId()); - //1、判断用户是否通过个人实名认证企业信息，没有通过实名认证信息则不能发布工作岗位信息 EmployAuthenticationPerson authenticationPerson = employAuthenticationPersonService .lambdaQuery() @@ -288,15 +283,14 @@ public class JobServiceImpl implements JobService { //修改工作信息 @Override public Result updateJob(String token, EmployJob employJob) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //返回信息 String message = "工作信息修改失败"; //执行结果 boolean result = false; 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/LoginApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/LoginApiServiceImpl.java index 01a37a8..168cfe0 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/LoginApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/LoginApiServiceImpl.java @@ -20,12 +20,10 @@ public class LoginApiServiceImpl implements LoginApiService { return appletLoginService.appletLogin(loginReq); } - //小程序-获取用户协议 @Override public Result getUserAgreement() { - return Result.OK("用户协议"); } @@ -33,7 +31,6 @@ public class LoginApiServiceImpl implements LoginApiService { @Override public Result getPrivacyPolicy() { - return Result.OK("隐私政策"); } } 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 168b1f0..496aa48 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 @@ -51,11 +51,11 @@ public class NotebookServiceImpl implements NotebookService { //记工记账-新建账本 @Override public Result addNoteBook(String token, EmployNotebook employNotebook) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); String message = "新建账本失败！"; - try{ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ //判断是否为修改 if(null != employNotebook.getId()){ boolean result = employNotebookService.updateById(employNotebook); @@ -86,11 +86,11 @@ public class NotebookServiceImpl implements NotebookService { //记工记账-修改账本 @Override public Result updateNoteBook(String token, EmployNotebook employNotebook) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); String message = "修改账本失败！"; - try{ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ boolean result = employNotebookService.updateById(employNotebook); if(result){ @@ -109,11 +109,10 @@ public class NotebookServiceImpl implements NotebookService { //记工记账-全年收支 @Override public Result queryBill(String token, String employNoteBookId, PageBean pageBean) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); try{ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //获取账本id列表 Object[] notebooIds = null; if(null == employNoteBookId){ @@ -167,15 +166,14 @@ public class NotebookServiceImpl implements NotebookService { //记工记账-全年收支金额 public Result queryBillAmount(String token, String employNoteBookId){ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //返回信息 Map map = new HashMap<>(); map.put("incomeCount", 0); map.put("expenditureCount", 0); try{ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //获取账本id列表 Object[] notebooIds = null; if(null == employNoteBookId){ @@ -240,11 +238,11 @@ public class NotebookServiceImpl implements NotebookService { //记工记账-技工问题 @Override public Result addQuestion(String token, EmployFeedback employFeedback) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); String message = "技工问题添加失败！"; - try{ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ employFeedback.setUserId(hanHaiMember.getId()); boolean result = employFeedbackService.save(employFeedback); @@ -295,11 +293,11 @@ public class NotebookServiceImpl implements NotebookService { //记工记账-项目记账 @Override public Result addBillInfo(String token, EmployBillInfo employBillInfo) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); String message = "项目记账添加失败！"; - try{ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ boolean result = employBillInfoService.save(employBillInfo); if(result){ @@ -340,7 +338,6 @@ public class NotebookServiceImpl implements NotebookService { //记工记账-查询记工信息 @Override public Result queryWork(String token, EmployWorkInfo workInfo, PageBean pageBean){ - //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); 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 538cd23..1a60554 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 @@ -2,29 +2,21 @@ package org.jeecg.modules.apiService.impl; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; -import org.jeecg.modules.apiBean.CollectionBean; 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; import org.jeecg.modules.employCollectionResume.entity.EmployCollectionResume; import org.jeecg.modules.employCollectionResume.service.IEmployCollectionResumeService; -import org.jeecg.modules.employJob.entity.EmployJob; 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 org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import javax.annotation.Resource; import java.util.HashMap; @@ -123,13 +115,12 @@ public class ResumeServiceImpl implements ResumeService { //根据id查看简历详情 @Override public Result queryResumeById(String token, String resumeId) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //返回信息 Map map = new HashMap<>(); try{ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //1、获取简历详情 EmployResume resume = employResumeService.getById(resumeId); map.put("resume", resume); @@ -183,10 +174,10 @@ public class ResumeServiceImpl implements ResumeService { //会员中心-我的简历 @Override public Result queryResumeByUserId(String token, PageBean pageBean) { - try{ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); Page pageList = employResumeService .lambdaQuery() @@ -258,12 +249,12 @@ public class ResumeServiceImpl implements ResumeService { //修改简历信息 @Override public Result updateResume(String token, EmployResume employResume) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //返回信息 String message = "简历信息修改失败"; //执行结果 boolean result = false; - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); try{ //执行简历信息修改 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 fa60c39..6e0d00d 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,10 +41,10 @@ public class ScoreServiceImpl implements ScoreService { //会员中心-积分 @Override public Result queryScore(String token) { - try{ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ //获取积分 EmployScore score = employScoreService .lambdaQuery() @@ -61,10 +61,10 @@ public class ScoreServiceImpl implements ScoreService { //会员中心-积分记录 @Override public Result queryScoreRecord(String token, String type, PageBean pageBean) { - try{ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ //分页 Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); LambdaQueryChainWrapper query = employScoreRecordService.lambdaQuery(); @@ -99,12 +99,12 @@ public class ScoreServiceImpl implements ScoreService { //我的服务-获取积分-每日签到获取积分 @Override public Result addScoreBySign(String token) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //返回信息 String message = "积分添加失败！"; try{ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //判断今日是否已签到 boolean flag = judgeSign(token); if(flag){ @@ -142,12 +142,12 @@ public class ScoreServiceImpl implements ScoreService { //判断当日是否已签到 @Override public Boolean judgeSign(String token) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //返回结果 Boolean result = true; try{ - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //获取当天日期 LocalDate date = LocalDate.now(); 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 7329798..1e4b700 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 @@ -3,7 +3,6 @@ package org.jeecg.modules.apiService.impl; import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; -import org.jeecg.common.exception.JeecgBoot401Exception; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.apiService.UserInfoService; import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany; @@ -18,15 +17,11 @@ import org.jeecg.modules.employCollectionJob.entity.EmployCollectionJob; import org.jeecg.modules.employCollectionJob.service.IEmployCollectionJobService; import org.jeecg.modules.employCollectionResume.entity.EmployCollectionResume; import org.jeecg.modules.employCollectionResume.service.IEmployCollectionResumeService; -import org.jeecg.modules.employCompany.entity.EmployCompany; -import org.jeecg.modules.employCompany.service.IEmployCompanyService; import org.jeecg.modules.employJob.entity.EmployJob; import org.jeecg.modules.employJob.service.IEmployJobService; import org.jeecg.modules.employResume.entity.EmployResume; import org.jeecg.modules.employResume.service.IEmployResumeService; -import org.jeecg.modules.employScoreRecord.entity.EmployScoreRecord; import org.jeecg.modules.employScoreRecord.service.IEmployScoreRecordService; -import org.jeecg.modules.employVip.entity.EmployVip; import org.jeecg.modules.employVipType.entity.EmployVipType; import org.jeecg.modules.employVipType.service.IEmployVipTypeService; import org.jeecg.modules.employVipUser.entity.EmployVipUser; @@ -36,7 +31,6 @@ import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.time.LocalDate; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -52,10 +46,6 @@ public class UserInfoServiceImpl implements UserInfoService { @Resource private IHanHaiMemberService hanHaiMemberService; - //企业信息表 - @Resource - private IEmployCompanyService employCompanyService; - //个人实名信息 @Resource private IEmployAuthenticationPersonService employAuthenticationPersonService; @@ -88,9 +78,6 @@ public class UserInfoServiceImpl implements UserInfoService { @Resource private IEmployCheckResumeService employCheckResumeService; - @Resource - private IEmployScoreRecordService employScoreRecordService; - //会员信息关联表 @Resource private IEmployVipUserService employVipUserService; @@ -99,7 +86,7 @@ public class UserInfoServiceImpl implements UserInfoService { @Resource private IEmployVipTypeService employVipTypeService; - + //积分信息表 @Resource private ScoreServiceImpl scoreService; /******************************************************************************************************************/ @@ -146,8 +133,6 @@ public class UserInfoServiceImpl implements UserInfoService { } } - - //lzx：获取个人中心基础数据信息 @Override public Result getUserCenterData(String token){ diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VipServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VipServiceImpl.java index 913e0f6..2e97a6f 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VipServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VipServiceImpl.java @@ -4,12 +4,10 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.apiService.VipService; -import org.jeecg.modules.employVip.entity.EmployVip; import org.jeecg.modules.employVipRecord.entity.EmployVipRecord; import org.jeecg.modules.employVipType.entity.EmployVipType; import org.jeecg.modules.employVipType.service.IEmployVipTypeService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; -import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.jeecg.modules.pay.MpWxPayService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service;