Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-pla...

zhaoxiaohao

2020-08-13 0eb0c43113ed9c4585ba936dcbe87feb4df6ba24

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java

@@ -199,8 +199,6 @@
    })
    @GetMapping("/users")
    public PageResult<SysUser> findUsers(@RequestParam Map<String, Object> params) {
//        log.info("租户ID："+ TenantContextHolder.getTenant());
//        log.info("IP:"+request.getHeader(CommonConstant.USER_AGENT_IP));
        return appUserService.findUsers(params);
    }
    /**
@@ -247,7 +245,7 @@
     */
    @PutMapping(value = "/users/{id}/password")
    @AuditLog(operation = "'重置用户密码:' + #id")
    public ResultBody resetPassword(@PathVariable Long id) {
    public ResultBody resetPassword(@PathVariable Long id) throws Exception{
        if (checkAdmin(id)) {
            return ResultBody.failed(ADMIN_CHANGE_MSG);
        }
@@ -255,10 +253,22 @@
    }

    /**
     * 返回给Python加密密码
     */
    @GetMapping(value = "/users/python")
    public ResultBody jiaMipython(@RequestBody String password)  {
        if (password==null||"".equals(password)) {
            return ResultBody.failed().msg("请输入密码");
        }
        ResultBody resultBody = appUserService.jiaMipython(password);
        return resultBody;
    }

    /**
     * 用户自己修改密码
     */
    @PutMapping(value = "/users/password")
    public ResultBody resetPassword(@RequestBody SysUser sysUser) {
    public ResultBody resetPassword(@RequestBody SysUser sysUser) throws Exception {
        if (checkAdmin(sysUser.getId())) {
            return ResultBody.failed().msg(ADMIN_CHANGE_MSG);
        }
@@ -270,7 +280,7 @@
     * 用户自己修改密码-后端以外
     */
    @PutMapping(value = "/users/resetpassword")
    public ResultBody resetClientPassword(@RequestParam Map<String, Object> params) {
    public ResultBody resetClientPassword(@RequestParam Map<String, Object> params) throws Exception {
        Long id = MapUtils.getLong(params, "id");
        String oldPassword = MapUtils.getString(params, "oldPassword");
        String newPassword = MapUtils.getString(params, "newPassword");
@@ -293,7 +303,7 @@
     * @return
     */
    @PutMapping(value = "/users/updateusertel")
    public ResultBody updateUserTel(@RequestParam Map<String, Object> params,@LoginUser SysUser sysUser) {
    public ResultBody updateUserTel(@RequestParam Map<String, Object> params,@LoginUser SysUser sysUser) throws Exception  {
        String oldTel = MapUtils.getString(params, "oldTel");
        if (oldTel==null){
            return ResultBody.failed("请输入原账号");
@@ -318,7 +328,20 @@
        boolean v = appUserService.delUser(id);
        return ResultBody.ok().msg("删除成功").data(v);
    }

    /**
     * 删除用户  不删除关系表 ，role_user 表  和 用户组织
     *
     * @param id
     */
    @DeleteMapping(value = "/users/deleteNoContact/{id}")
    //@AuditLog(operation = "'删除用户:' + #id")
    public ResultBody deleteNoContact(@PathVariable Long id) {
        if (checkAdmin(id)) {
            return ResultBody.failed(ADMIN_CHANGE_MSG);
        }
        boolean v = appUserService.deleteNoContact(id);
        return ResultBody.ok().msg("删除成功").data(v);
    }

    /**
     * 新增or更新
@@ -341,7 +364,7 @@
     */
    @PostMapping("/users/doctorUserReg")
    @AuditLog(operation = "'注册/添加用户:' + #userRegVo.mobile")
    public ResultBody doctorUserReg(@RequestBody UserRegVo userRegVo,SysUser sysUser) {
    public ResultBody doctorUserReg(@RequestBody UserRegVo userRegVo,SysUser sysUser) throws Exception {
        return appUserService.doctorUserReg(userRegVo,sysUser);
    }

@@ -398,7 +421,7 @@
     * 根据map查询
     */
    private boolean checkAdmin(long id) {
        return id == 1L;
        return id == CommonConstant.ADMIN_USER_ID;
    }

    @PostMapping("/users/findAll")
@@ -429,7 +452,7 @@
     * 通过手机修改密码
     */
    @PutMapping(value = "/users/passwordByPhone")
    public ResultBody passwordByPhone(@RequestBody Map<String, Object> map) {
    public ResultBody passwordByPhone(@RequestBody Map<String, Object> map) throws Exception {
        return appUserService.passwordByPhone(map);
    }