接口更新

whyczh

2021-12-27 b7605191cf3b4502c20efdefd9af65954cfa8a1c

 src/main/java/com/whyc/controller/UserController.java

@@ -1,24 +1,23 @@
package com.whyc.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.R;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.whyc.dto.Response;
import com.whyc.pojo.User;
import com.whyc.service.LoginService;
import com.whyc.pojo.UserInf;
import com.whyc.service.UserService;
import com.whyc.util.ActionUtil;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List;

@RestController
@RequestMapping("user")
@Api(tags = "用户")
@Api(tags = "用户管理-用户")
@Slf4j
public class UserController {

@@ -27,39 +26,107 @@

    @PostMapping
    @ApiOperation(value = "添加")
    public Response add(@RequestBody User user){
    public Response add(@RequestBody UserInf user){
        return userService.add(user);
    }

    @GetMapping
    @ApiOperation(value = "查询byId")
    public User getById(@RequestParam int id){
        return userService.getById(id);
    public Response<UserInf> getById(@RequestParam int id){
        return new Response<UserInf>().set(1,userService.getById(id));
    }

    @GetMapping("/all")
    @GetMapping("all")
    @ApiOperation(value = "查询所有")
    public List<User> getAll(){
        return userService.getAll();
    public Response<List<UserInf>> getAll(){
        return new Response<List<UserInf>>().set(1,userService.getAll());
    }

    @GetMapping("/page")
    @GetMapping("page")
    @ApiOperation(value = "查询分页")
    public IPage<User> getPage(@RequestParam int pageNum,int pageSize){
    public Response<IPage<UserInf>> getPage(@RequestParam int pageNum,int pageSize){
        Page<Object> page = new Page<>(pageNum, pageSize);
        return userService.getAllWithPage(page);
        return new Response<IPage<UserInf>>().set(1,userService.getAllWithPage(page));
    }

    @PutMapping
    @ApiOperation(value = "编辑")
    public boolean update(@RequestBody User user){
        return userService.update(user);
    public Response update(@RequestBody UserInf user){
        userService.update(user);
        return new Response().setII(1,"更新成功");
    }

    @DeleteMapping
    @ApiOperation(value = "删除")
    public boolean delete(@RequestParam int id){
        return userService.delete(id);
    public Response delete(@RequestParam int id){
        userService.delete(id);
        return new Response().setII(1,"删除成功");
    }
    @GetMapping("/searchUKeyToUName")
    @ApiOperation(value = "根据Ukey查询用户")
    public Response getUserByUkey(@RequestParam String uKeyId){
        UserInf userInf = userService.getUserByUKeyId(uKeyId);
        Response response = new Response();
        if (userInf!=null){
            response.set(1,userInf,"UKey有绑定用户");
        }else{
            response.set(0,"Ukey没有绑定用户");
        }
        return response;
    }

    @GetMapping("/searchUNameToUKey")
    @ApiOperation(value = "根据用户名查绑定的Ukey")
    public Response getUserByUserName(@RequestParam String uKeyId){
        UserInf userInf = userService.getUserByUKeyId(uKeyId);
        Response response = new Response();
        if (userInf!=null){
            if (StringUtils.isEmpty(userInf.getUkeyId())){
                response.set(0,"该用户没有绑定Ukey");
            }else {
                response.set(1,userInf);
            }
        }else{
            response.set(0,"该用户不存在");
        }
        return response;
    }
    @PostMapping("/bindUkey")
    @ApiOperation(value = "绑定uKey")
    public Response bindUkey(@RequestBody UserInf userInf){
        boolean b = userService.bindUkey(userInf);
        if (b){
            return new Response().set(1,"绑定成功");
        }else {
            return new Response().set(0,"绑定失败");
        }

    }

    @PostMapping("/checkUserPassword")
    @ApiOperation(value = "检查用户密码")
    public Response checkUserPassword(@RequestParam String password){
        UserInf userInf = ActionUtil.getUser();
        String userPassword = userInf.getUpassword();
        if (password.equals(userPassword)){
            return new Response().set(1);
        }else {
            return new Response().set(0);
        }

    }


    @PostMapping("/updatePassword")
    @ApiOperation(value = "修改密码")
    public Response updatePassword(@RequestParam String password){
        UserInf userInf = ActionUtil.getUser();
        return userService.updatePassword(userInf,password);
    }






}