diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/postBean/ReqUserRole.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/postBean/ReqUserRole.java index cfc1b5a..09ec518 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/postBean/ReqUserRole.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/postBean/ReqUserRole.java @@ -19,6 +19,7 @@ import java.io.Serializable; public class ReqUserRole implements Serializable { private static final long serialVersionUID = 1L; + private java.lang.String id; /**用户名*/ @Excel(name = "用户名", width = 15) diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/postBean/ReqUserRole2.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/postBean/ReqUserRole2.java index 1887771..1c50c46 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/postBean/ReqUserRole2.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/postBean/ReqUserRole2.java @@ -19,6 +19,10 @@ import java.io.Serializable; public class ReqUserRole2 implements Serializable { private static final long serialVersionUID = 1L; + + private String id; + + /**用户名*/ @Excel(name = "用户名", width = 15) @ApiModelProperty(value = "用户名") diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/controller/UserController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/controller/UserController.java index 13cf8da..2dce41d 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/controller/UserController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/controller/UserController.java @@ -56,25 +56,22 @@ public class UserController { @ApiOperation(value = "小程序-绑定手机号") public Result bindPhone(@RequestBody CodeBeanModel codeBeanModel) { Result result = new Result<>(); - if(StringUtils.isEmpty(codeBeanModel.getEncryptedData())){ + if (StringUtils.isEmpty(codeBeanModel.getEncryptedData())) { result.setCode(500); result.setMessage("请授权手机号"); - return result; + return result; } return appletLoginService.bindPhone(codeBeanModel); } - @PostMapping(value = "/updateUserInfo") @ApiOperation(value = "修改头像和昵称,传nickName和headimgurl") public Result updateUserInfo(@RequestBody CodeBeanModel codeBeanModel, @RequestHeader("X-Access-Token") String token) { - return appletLoginService.updateUserInfo(codeBeanModel,token); + return appletLoginService.updateUserInfo(codeBeanModel, token); } - - @ApiOperation(value = "求职者填写信息") @RequestMapping(value = "/role", method = RequestMethod.POST) public Result role(@RequestBody ReqUserRole2 reqUserRole, @RequestHeader("X-Access-Token") String token) { @@ -85,6 +82,18 @@ public class UserController { } + + + @ApiOperation(value = "求职者修改信息 传id修改") + @RequestMapping(value = "/updateRole", method = RequestMethod.POST) + public Result updateRole(@RequestBody ReqUserRole2 reqUserRole, @RequestHeader("X-Access-Token") String token) { + if (ValidateTool.isNull(reqUserRole)) { + return Result.error("参数错误"); + } + return appletLoginService.updateWorkRole(reqUserRole, token); + } + + @ApiOperation(value = "招聘方填写信息") @RequestMapping(value = "/roleBoss", method = RequestMethod.POST) public Result roleBoss(@RequestBody ReqUserRole reqUserRole, @RequestHeader("X-Access-Token") String token) { @@ -96,6 +105,34 @@ public class UserController { } + + @ApiOperation(value = "招聘方修改信息 传id修改") + @RequestMapping(value = "/updateRoleBoss", method = RequestMethod.POST) + public Result updateRoleBoss(@RequestBody ReqUserRole reqUserRole, @RequestHeader("X-Access-Token") String token) { + if (ValidateTool.isNull(reqUserRole)) { + return Result.error("参数错误"); + } + + return appletLoginService.updateRoleBoss(reqUserRole, token); + } + + + + /** + * 查看我的角色信息 0 1 2 + * + * @param id + * @return + */ + //@AutoLog(value = "tb_user_role-通过id查询") + @ApiOperation(value = "查看我的角色信息 返回三个角色信息,取当前身份对应的信息展示或修改", notes = "大厅信息查询详情") + @GetMapping(value = "/myRole") + public Result myRole(@RequestParam(name = "role", required = true) Integer role, @RequestHeader("X-Access-Token") String token) { + Result objectResult = appletLoginService.myRole(token, role); + return Result.OK(objectResult); + } + + @ApiOperation(value = "公司发布任务", notes = "发布任务") @PostMapping(value = "/addTask") public Result addTask(@RequestBody TaskReq tbTask, @RequestHeader("X-Access-Token") String token) { @@ -136,6 +173,4 @@ public class UserController { } - - } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/AppletLoginService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/AppletLoginService.java index dede91e..0697882 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/AppletLoginService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/AppletLoginService.java @@ -28,8 +28,18 @@ public interface AppletLoginService { Result role(ReqUserRole reqUserRole, String token); + Result updateRoleBoss(ReqUserRole reqUserRole, String token); + + Result role2(ReqUserRole2 reqUserRole, String token); + Result myRole(String token,Integer role); + + Result updateWorkRole(ReqUserRole2 reqUserRole, String token); + + + + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/impl/AppletLoginServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/impl/AppletLoginServiceImpl.java index 8eab344..eed5a6c 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/impl/AppletLoginServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/userCode/service/impl/AppletLoginServiceImpl.java @@ -183,6 +183,49 @@ public class AppletLoginServiceImpl implements AppletLoginService { return result; } + + @Override + public Result myRole(String token,Integer role) { + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); + Map roleInfo = tbUserRoleService.getRoleInfo(hanHaiMember.getId(), false); + return Result.ok(roleInfo); + } + + @Override + public Result updateWorkRole(ReqUserRole2 reqUserRole, String token) { + + TbUserRole byId = tbUserRoleService.getById(reqUserRole.getId()); + if (ValidateTool.isNull(byId)){ + throw new JeecgBootException("参数不正确"); + } + TbUserRole tbUserRole = new TbUserRole(); + BeanUtils.copyProperties(reqUserRole, tbUserRole); + tbUserRole.setId(reqUserRole.getId()); + tbUserRole.setAuditStatus(0); + tbUserRole.setRole(2); + tbUserRoleService.updateById(tbUserRole); + return Result.OK("提交成功"); + } + + + @Override + public Result updateRoleBoss(ReqUserRole reqUserRole, String token) { + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); + TbUserRole byId = tbUserRoleService.getById(reqUserRole.getId()); + if (ValidateTool.isNull(byId)){ + throw new JeecgBootException("参数不正确"); + } + TbUserRole tbUserRole = new TbUserRole(); + BeanUtils.copyProperties(reqUserRole, tbUserRole); + tbUserRole.setId(reqUserRole.getId()); + tbUserRole.setAuditStatus(0); + tbUserRoleService.updateById(tbUserRole); + return Result.OK("提交成功"); + } + + + + /** * 小程序注册 * @@ -352,7 +395,7 @@ public class AppletLoginServiceImpl implements AppletLoginService { } -// /** + // /** // * 微信小程序登录绑定手机号码接口 // * @param loginReq // * @return