From 4a062bbdbdd5e1870bdecddc90a0a3af8192b95f Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 12 Mar 2021 17:16:49 +0800
Subject: [PATCH] manage模块:     登陆功能完善,增加了过滤前端不需要参数的功能。     注销功能完成

---
 screen-manage/src/main/java/com/moral/api/controller/AccountController.java |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 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..600db90 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,6 +1,8 @@
 package com.moral.api.controller;
 
+import com.moral.api.pojo.dto.LoginDTO;
 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.*;
@@ -27,22 +29,30 @@
 
 
     @PostMapping("login")
-    public ResultMessage login(@RequestBody Map<String, Object> paramters) {
-        if (!ObjectUtils.checkParamAndMap(paramters, "account", "password"))
-            return ResultMessage.fail("���������������");
+    public ResultMessage login(@RequestBody Map<String, Object> parameters) {
+        if (!ObjectUtils.isNotAllEmpty(parameters, "account", "password"))
+            return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
+        String AESAccount = (String) parameters.get("account");
+        String AESPassword = (String) parameters.get("password");
 
-        Map<String, Object> result = accountService.login(paramters);
+        LoginDTO loginDTO = accountService.login(AESAccount,AESPassword);
 
-        if ((int) result.get("accountId") < 0)
-            return ResultMessage.fail(result);
-        return ResultMessage.ok(result);
+        if(loginDTO.getCode().equals(LoginDTO.SUCCESS))
+            return ResultMessage.ok(loginDTO);
+        return ResultMessage.fail(loginDTO);
     }
 
 
     @PostMapping("logout")
-    public ResultMessage logout(@RequestBody Map<String, Object> paramters, HttpServletRequest request) {
+    public ResultMessage logout(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
+        if(!ObjectUtils.isNotAllEmpty(parameters,"accountId"))
+            return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
+        String token = request.getHeader("token");
 
-        return null;
+        if(accountService.logout(String.valueOf(parameters.get("accountId")),token))
+            return ResultMessage.ok("������������");
+        return ResultMessage.fail("������������");
+
     }
 
 

--
Gitblit v1.8.0