From 5e23b5966d393f1eb94bca82498e09a67274e321 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 15 Mar 2021 08:24:16 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/controller/AccountController.java | 51 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 11 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 779cea6..960862c 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,8 +1,15 @@
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.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,7 +19,6 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import java.util.Map;
@Slf4j
@Api(tags = {"������������������"})
@@ -27,22 +33,45 @@
@PostMapping("login")
- public ResultMessage login(@RequestBody Map<String, Object> paramters) {
- if (!ObjectUtils.checkParamAndMap(paramters, "account", "password"))
- return ResultMessage.fail("���������������");
+ public ResultMessage login(@RequestBody LoginRequest loginRequest) {
+ if (!loginRequest.valid())
+ return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
- Map<String, Object> result = accountService.login(paramters);
+ LoginDTO loginDTO = accountService.login(loginRequest);
- if ((int) result.get("accountId") < 0)
- return ResultMessage.fail(result);
- return ResultMessage.ok(result);
+ 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 Map<String, Object> paramters, HttpServletRequest request) {
+ 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);
- return null;
+ 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.convertToInsert(accountDTO);
+
+ if(accountVO.getCode().equals(accountVO.SUCCESS))
+ return ResultMessage.ok(accountVO);
+ return ResultMessage.fail(accountVO);
}
--
Gitblit v1.8.0