From 943a2364c76db4c4e570e0d0219a81b6caa9bffc Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Thu, 13 May 2021 14:27:08 +0800 Subject: [PATCH] deivce相关接口 --- screen-api/src/main/java/com/moral/api/controller/UserController.java | 83 ++++++++++++++++++++--------------------- 1 files changed, 40 insertions(+), 43 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/controller/UserController.java b/screen-api/src/main/java/com/moral/api/controller/UserController.java index 34e7464..ba6d30a 100644 --- a/screen-api/src/main/java/com/moral/api/controller/UserController.java +++ b/screen-api/src/main/java/com/moral/api/controller/UserController.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; + import lombok.extern.slf4j.Slf4j; import java.util.Map; @@ -11,19 +12,21 @@ import javax.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.moral.api.entity.User; import com.moral.api.service.UserService; import com.moral.constant.ResponseCodeEnum; import com.moral.constant.ResultMessage; -import com.moral.util.WebUtils; +import com.moral.util.PageResult; @Slf4j -@Api(tags = {"������"}) +@Api(tags = {"������������"}) @RestController @RequestMapping("/user") public class UserController { @@ -33,22 +36,15 @@ @ApiOperation(value = "������������", notes = "������������") @ApiImplicitParams({ - @ApiImplicitParam(name = "account", value = "������,������6-10", required = true, paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "password", value = "������,������6-20", required = true, paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "userName", value = "������������", required = false, paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "email", value = "������,������123456@qq.com", required = false, paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "mobile", value = "���������,1������11���������", required = false, paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "wechat", value = "������", required = false, paramType = "query", dataType = "String"), @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String") }) - @RequestMapping(value = "addUser", method = RequestMethod.POST) - public ResultMessage addUser(User user, HttpServletRequest request) { + @RequestMapping(value = "insert", method = RequestMethod.POST) + public ResultMessage insert(@RequestBody User user) { if (user.getAccount().isEmpty() || user.getPassword().isEmpty()) { return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); } - String token = request.getHeader("token"); - Map<String, Object> result = userService.addUser(user, token); + Map<String, Object> result = userService.addUser(user); if (!result.isEmpty()) { return ResultMessage.fail((int) result.get("code"), result.get("msg").toString()); } @@ -57,19 +53,20 @@ @ApiOperation(value = "������������", notes = "������������") @ApiImplicitParams({ - @ApiImplicitParam(name = "userId", value = "������id", required = true, paramType = "query", dataType = "String"), @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String") }) - @RequestMapping(value = "deleteUser", method = RequestMethod.POST) - public ResultMessage deleteUser(String userId) { - if (userId == null) { - return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); + @RequestMapping(value = "delete", method = RequestMethod.POST) + public ResultMessage delete(@RequestBody User user) { + if (user.getId() == null) { + return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), + ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); } QueryWrapper<User> queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("id", userId); - User user = userService.getOne(queryWrapper); + queryWrapper.eq("id", user.getId()); + user = userService.getOne(queryWrapper); if (user == null) { - return ResultMessage.fail(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode(), ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg()); + return ResultMessage.fail(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode(), + ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg()); } userService.deleteUser(user); return ResultMessage.ok(); @@ -77,42 +74,42 @@ @ApiOperation(value = "������������������", notes = "������������������") @ApiImplicitParams({ - @ApiImplicitParam(name = "account", value = "������,������6-10", required = true, paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "password", value = "������,������6-20", required = true, paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "userName", value = "������������", required = false, paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "email", value = "������,������123456@qq.com", required = false, paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "mobile", value = "���������,1������11���������", required = false, paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "wechat", value = "������", required = false, paramType = "query", dataType = "String"), @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String") }) - @RequestMapping(value = "updateUser", method = RequestMethod.POST) - public ResultMessage updateUser(User user, HttpServletRequest request) { - if (user.getAccount().isEmpty() || user.getPassword().isEmpty()) { + @RequestMapping(value = "update", method = RequestMethod.POST) + public ResultMessage update(@RequestBody User user) { + if (user.getId() == null) { return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); } - String token = request.getHeader("token"); - Map<String, Object> result = userService.addUser(user, token); + Map<String, Object> result = userService.updateUser(user); if (!result.isEmpty()) { return ResultMessage.fail((int) result.get("code"), result.get("msg").toString()); } return ResultMessage.ok(); } - @ApiOperation(value = "������������������", notes = "������������������") + @ApiOperation(value = "������������������������", notes = "������������������������") @ApiImplicitParams({ - @ApiImplicitParam(name = "userId", value = "������id", required = false, paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String") + @ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "Integer"), + @ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "Integer"), + @ApiImplicitParam(name = "order", value = "������������", required = false, paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "orderType", value = "������������������������0������������1", defaultValue = "0", required = false, paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"), + @ApiImplicitParam(name = "account", value = "������������������", required = false, paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "userName", value = "���������������������", required = false, paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "mobile", value = "���������������������", required = false, paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "email", value = "������������������", required = false, paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "wechat", value = "������������������", required = false, paramType = "query", dataType = "String"), + }) - @RequestMapping(value = "getUserInfo", method = RequestMethod.POST) - public ResultMessage getUserInfo(HttpServletRequest request) { - Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null); - parameters.put("token", request.getHeader("token")); - Map<String, Object> users = userService.getUsers(parameters); - if (users.containsKey("msg")) { - return ResultMessage.fail(users.get("msg").toString()); - } - return ResultMessage.ok(users.get("users")); + @RequestMapping(value = "select", method = RequestMethod.POST) + public ResultMessage select(@RequestBody Map<String, Object> parameters) { + Page<User> userPage = userService.selectUsers(parameters); + PageResult<User> pageResult = new PageResult<>( + userPage.getTotal(), userPage.getPages(), userPage.getRecords() + ); + return ResultMessage.ok(pageResult); } } -- Gitblit v1.8.0