|
|
@ -75,6 +75,7 @@ public class SysUserRest implements SysUserFeign { |
|
|
|
PagerVo<SysUserVo> pv = sysUserService.listPageVo(pq); |
|
|
|
return rb.success().setData(pv); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultBean<List<SysUserVo>> listAll(@RequestBody SysUserQuery query) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
@ -169,6 +170,7 @@ public class SysUserRest implements SysUserFeign { |
|
|
|
} |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean pSave(SysUserDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
//手机号
|
|
|
@ -248,14 +250,16 @@ public class SysUserRest implements SysUserFeign { |
|
|
|
// }
|
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
|
|
|
|
@PostMapping("/saveOpenId") |
|
|
|
public ResultBean saveOpenId(@RequestBody SysUserDto dto){ |
|
|
|
ResultBean rb=new ResultBean(); |
|
|
|
SysUser sysUser=sysUserService.getOne(new QueryWrapper<SysUser>().eq("sid",dto.getSid())); |
|
|
|
public ResultBean saveOpenId(@RequestBody SysUserDto dto) { |
|
|
|
ResultBean rb = new ResultBean(); |
|
|
|
SysUser sysUser = sysUserService.getOne(new QueryWrapper<SysUser>().eq("sid", dto.getSid())); |
|
|
|
sysUser.setOpenId(dto.getOpenid()); |
|
|
|
sysUserService.update(sysUser,new QueryWrapper<SysUser>().eq("sid",dto.getSid())); |
|
|
|
sysUserService.update(sysUser, new QueryWrapper<SysUser>().eq("sid", dto.getSid())); |
|
|
|
return rb.success().setMsg("保存成功"); |
|
|
|
} |
|
|
|
|
|
|
|
@PostMapping("/saveBank") |
|
|
|
public ResultBean saveBank(@RequestBody SysUserDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
@ -314,6 +318,7 @@ public class SysUserRest implements SysUserFeign { |
|
|
|
// }
|
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultBean delSysUserByMobile(String mobile) { |
|
|
|
int i = sysUserService.delSysUserByMobile(mobile); |
|
|
@ -322,8 +327,9 @@ public class SysUserRest implements SysUserFeign { |
|
|
|
} |
|
|
|
return new ResultBean().success().setMsg("删除成功"); |
|
|
|
} |
|
|
|
|
|
|
|
@GetMapping("/getUserBySid") |
|
|
|
public ResultBean<SysUser> getUserBySid(@RequestParam("sid")String sid) { |
|
|
|
public ResultBean<SysUser> getUserBySid(@RequestParam("sid") String sid) { |
|
|
|
SysUser sysUser = sysUserService.getUserBySid(sid); |
|
|
|
return new ResultBean().success().setData(sysUser); |
|
|
|
} |
|
|
@ -450,8 +456,8 @@ public class SysUserRest implements SysUserFeign { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultBean reGetPwd(String userName, String userPhone,String verificationCode) { |
|
|
|
return sysUserService.reGetPwd(userName, userPhone,verificationCode); |
|
|
|
public ResultBean reGetPwd(String userName, String userPhone, String verificationCode) { |
|
|
|
return sysUserService.reGetPwd(userName, userPhone, verificationCode); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
@ -592,7 +598,8 @@ public class SysUserRest implements SysUserFeign { |
|
|
|
return rb.success().setData(vo); |
|
|
|
} |
|
|
|
|
|
|
|
// @Override
|
|
|
|
// @Override
|
|
|
|
@PostMapping(value = "/loginDetails") |
|
|
|
public ResultBean<SysUserVo> loginDetails(HttpServletRequest httpServletRequest) { |
|
|
|
String token = httpServletRequest.getHeader("token"); |
|
|
|
if (StringUtils.isBlank(token)) { |
|
|
@ -609,8 +616,9 @@ public class SysUserRest implements SysUserFeign { |
|
|
|
} |
|
|
|
return new ResultBean<SysUserVo>().success().setData(userInfoOneVo); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultBean<SysUserVo> loginDetailsNew(@RequestHeader("token")String token) { |
|
|
|
public ResultBean<SysUserVo> loginDetailsNew(@RequestHeader("token") String token) { |
|
|
|
// String token = httpServletRequest.getHeader("token");
|
|
|
|
if (StringUtils.isBlank(token)) { |
|
|
|
return new ResultBean<SysUserVo>().fail().setMsg("请重新登录"); |
|
|
@ -626,6 +634,7 @@ public class SysUserRest implements SysUserFeign { |
|
|
|
} |
|
|
|
return new ResultBean<SysUserVo>().success().setData(userInfoOneVo); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultBean<AppUserOrgInfoVo> getUserOrgInfoByUserSid(String userSid) { |
|
|
|
AppUserOrgInfoVo vo = sysUserService.getUserOrgInfoByUserSid(userSid); |
|
|
@ -654,7 +663,7 @@ public class SysUserRest implements SysUserFeign { |
|
|
|
@Override |
|
|
|
public ResultBean<SysUserInfoVo> selectUserInfoByUserSid(String userSid, String orgSid) { |
|
|
|
ResultBean<SysUserInfoVo> rb = ResultBean.fireFail(); |
|
|
|
SysUserInfoVo sysUserInfoVo = sysUserService.selectUserInfoByUserSid(userSid,orgSid); |
|
|
|
SysUserInfoVo sysUserInfoVo = sysUserService.selectUserInfoByUserSid(userSid, orgSid); |
|
|
|
if (sysUserInfoVo == null) { |
|
|
|
return rb.setData(new SysUserInfoVo()).setMsg("该用户未设置所属部门"); |
|
|
|
} |
|
|
@ -720,11 +729,12 @@ public class SysUserRest implements SysUserFeign { |
|
|
|
} |
|
|
|
|
|
|
|
@GetMapping("getUserByType") |
|
|
|
public ResultBean getUserByType(@RequestParam("userType") String userType){ |
|
|
|
public ResultBean getUserByType(@RequestParam("userType") String userType) { |
|
|
|
return sysUserService.getUserByType(userType); |
|
|
|
} |
|
|
|
|
|
|
|
@GetMapping("getUserOrgBySid") |
|
|
|
public ResultBean getUserOrgBySid(@RequestParam("sid") String sid){ |
|
|
|
public ResultBean getUserOrgBySid(@RequestParam("sid") String sid) { |
|
|
|
return sysUserService.getUserOrgBySid(sid); |
|
|
|
} |
|
|
|
|
|
|
@ -739,11 +749,12 @@ public class SysUserRest implements SysUserFeign { |
|
|
|
} |
|
|
|
|
|
|
|
@PostMapping("/uploadImage") |
|
|
|
public ResultBean updateSysUserImage(@RequestBody Map<String, String> map){ |
|
|
|
public ResultBean updateSysUserImage(@RequestBody Map<String, String> map) { |
|
|
|
return sysUserService.updateSysUserImage(map); |
|
|
|
} |
|
|
|
|
|
|
|
@PostMapping("/getUsersBySid") |
|
|
|
public ResultBean<List<SysUser>> getUsersBySid(@RequestBody List<String> list){ |
|
|
|
public ResultBean<List<SysUser>> getUsersBySid(@RequestBody List<String> list) { |
|
|
|
return sysUserService.getUsersBySid(list); |
|
|
|
} |
|
|
|
} |
|
|
|