Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

8 天以前 97fba4a0e38c0b8455d43d2935aa996676407361

 north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserController.java

@@ -13,6 +13,8 @@
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Map;

@RestController //注解user控制器，挂载到springboot当中
@RequestMapping("/user")  //注解前端异步请求如：localhost：8080/user
public class UserController {
@@ -28,7 +30,6 @@

    @GetMapping
    public List<User> getUser(){
        System.out.println(cacheUtil.getCacheData("admin"));
        return userMapper.findAll();
    }
    @ApiOperation("登录")
@@ -38,7 +39,7 @@
        userService.deleteCache(userDTO.getUserId());
        UserDTO getUserDTO=userService.login(userDTO);
        if(getUserDTO!=null){
            return Result.seccess(userDTO);
            return Result.success(userDTO);
        }else{
            throw new ServiceException(Constants.Code_600,"用户名或密码错误");
        }
@@ -50,9 +51,27 @@
        if(getUser == null){
            throw new ServiceException(Constants.Code_500,"注册失败");
        }else {
            return Result.seccess(getUser);
            return Result.success(getUser);
        }

        //return
    }
    @ApiOperation("修改密码")
    @PostMapping("/updatePassWord")
    public Result updatePassWord(@RequestBody Map<String,Object> object){
        return Result.success( userService.updatePassWord(object));
    }

    @ApiOperation("修改用户名")
    @PostMapping("/updateUserName")
    public Result updateUserName(@RequestBody Map<String,Object> object){
        return Result.success( userService.updateUserName(object));
    }

    @ApiOperation("用户登录记录")
    @PostMapping("/getUserLog")
    public Result getUserLog(){
        return Result.success( userService.getUserLog());
    }

}