From 1a6f33ee01883917f5698e0a529438cdf11a9436 Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Mon, 15 Mar 2021 08:37:58 +0800 Subject: [PATCH] manage模块: 更改方法名 --- screen-manage/src/main/java/com/moral/api/controller/AccountController.java | 69 ++++++++++++++++++++++++++++------ 1 files changed, 57 insertions(+), 12 deletions(-) diff --git a/screen-manage/src/main/java/com/moral/api/controller/AccountController.java b/screen-manage/src/main/java/com/moral/api/controller/AccountController.java index 0a55944..149ff67 100644 --- a/screen-manage/src/main/java/com/moral/api/controller/AccountController.java +++ b/screen-manage/src/main/java/com/moral/api/controller/AccountController.java @@ -1,32 +1,77 @@ package com.moral.api.controller; +import com.moral.api.pojo.dto.AccountDTO; +import com.moral.api.pojo.dto.LoginDTO; +import com.moral.api.pojo.request.AccountAddRequest; +import com.moral.api.pojo.request.LoginRequest; +import com.moral.api.pojo.request.LogoutRequest; +import com.moral.api.pojo.vo.AccountVO; +import com.moral.api.pojo.vo.LoginVO; import com.moral.api.service.ManageAccountService; +import com.moral.constant.Constants; import com.moral.constant.ResultMessage; -import com.moral.util.ObjectUtils; -import io.netty.util.internal.ObjectUtil; -import io.swagger.annotations.Api; +import io.swagger.annotations.*; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.Map; +import javax.servlet.http.HttpServletRequest; @Slf4j -@Api(tags = {"������������"}) +@Api(tags = {"������������������"}) @RestController @RequestMapping("/account") public class AccountController { @Resource ManageAccountService accountService; + @Autowired + @Qualifier("tokenRedisTemplate") + RedisTemplate redisTemplate; + @PostMapping("login") - public ResultMessage login(@RequestBody Map<String,Object> paramters){ - if(!ObjectUtils.checkParamAndMap(paramters,"account","password")) - return ResultMessage.fail("���������������"); - Map<String, Object> result = accountService.login(paramters); - if(result.get("accountId").equals(-1)) - return ResultMessage.fail(result); - return ResultMessage.ok(result); + public ResultMessage login(@RequestBody LoginRequest loginRequest) { + if (!loginRequest.valid()) + return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING); + + LoginDTO loginDTO = accountService.login(loginRequest); + + LoginVO loginVO = LoginVO.convert(loginDTO); + + if(loginVO.getCode().equals(loginVO.SUCCESS)) + return ResultMessage.ok(loginVO); + return ResultMessage.fail(loginVO); + } + + + @PostMapping("logout") + public ResultMessage logout(@RequestBody LogoutRequest logoutRequest, HttpServletRequest request) { + if(!logoutRequest.valid()) + return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING); + String token = request.getHeader("token"); + logoutRequest.setToken(token); + + if(accountService.logout(logoutRequest)) + return ResultMessage.ok("������������"); + return ResultMessage.fail("������������"); + + } + + @PostMapping("add") + public ResultMessage add(@RequestBody AccountAddRequest accountAddRequest){ + if(!accountAddRequest.valid()) + return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING); + + AccountDTO accountDTO = accountService.addAccount(accountAddRequest); + + AccountVO accountVO = AccountVO.convertToInsertPage(accountDTO); + + if(accountVO.getCode().equals(accountVO.SUCCESS)) + return ResultMessage.ok(accountVO); + return ResultMessage.fail(accountVO); } -- Gitblit v1.8.0