From c90b6e135f2f609ba187e243e37ae37d3da6ddee Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 02 Apr 2021 17:32:41 +0800
Subject: [PATCH] 大屏web端操作日志功能

---
 screen-api/src/main/java/com/moral/api/controller/LoginController.java |   59 +++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/controller/LoginController.java b/screen-api/src/main/java/com/moral/api/controller/LoginController.java
index faf1d3b..7fe1193 100644
--- a/screen-api/src/main/java/com/moral/api/controller/LoginController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/LoginController.java
@@ -10,15 +10,22 @@
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
+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.moral.api.entity.SysConfig;
+import com.moral.api.entity.UserLog;
 import com.moral.api.service.SysConfigService;
+import com.moral.api.service.UserLogService;
 import com.moral.api.service.UserService;
+import com.moral.constant.Constants;
 import com.moral.constant.ResponseCodeEnum;
 import com.moral.constant.ResultMessage;
 import com.moral.pojo.VerificationCode;
@@ -37,38 +44,44 @@
     @Autowired
     private SysConfigService sysConfigService;
 
+    @Autowired
+    private UserLogService userLogService;
+
     @ApiOperation(value = "������", notes = "������")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "account", value = "������", required = true, paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "password", value = "������", required = true, paramType = "query", dataType = "String")
-    })
     @RequestMapping(value = "login", method = RequestMethod.POST)
-    public ResultMessage login(HttpServletRequest request) {
-        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+    public ResultMessage login(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
         if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {
-            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
         }
         Map<String, Object> result = userService.login(parameters);
         if (!result.containsKey("data")) {
             return ResultMessage.fail((int) result.get("code"), (String) result.get("msg"));
         }
-        return ResultMessage.ok(result.get("data"));
+        Map<String, Object> data = (Map<String, Object>) result.get("data");
+        Map<String, Object> userInfo = (Map<String, Object>) data.get("user");
+        UserLog userLog = new UserLog();
+        String ip = WebUtils.getIpAddr(request);
+        userLog.setIp(ip);
+        userLog.setOperateId((Integer) userInfo.get("userId"));
+        userLog.setOrganizationId((Integer) userInfo.get("organizationId"));
+        userLog.setContent(userInfo.get("account") + "���������");
+        userLogService.save(userLog);
+        return ResultMessage.ok(data);
     }
 
-    @ApiOperation(value = "������", notes = "������")
+    @ApiOperation(value = "������", notes = "������")
     @RequestMapping(value = "logout", method = RequestMethod.POST)
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "uid", value = "������", required = false, paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
     })
-    public ResultMessage logout(HttpServletRequest request) {
-        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+    public ResultMessage logout(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
         if (!parameters.containsKey("uid")) {
-            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
         }
-        String userId = parameters.get("uid").toString();
         String token = request.getHeader("token");
-        TokenUtils.destoryToken(userId, token);
+        TokenUtils.destoryToken(parameters.get("uid").toString(), token);
         return ResultMessage.ok();
     }
 
@@ -81,9 +94,19 @@
      */
 
     @ApiOperation(value = "���������������������������", notes = "���������������������������")
-    @RequestMapping(value = "verificationCodeConfig", method = RequestMethod.GET)
-    public ResultMessage verifyConfig() {
-        return null;
+    @RequestMapping(value = "verificationCode/config", method = RequestMethod.GET)
+    public void verifyConfig(HttpServletResponse response) {
+        QueryWrapper<SysConfig> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("type", Constants.VERIFICATION_TYPE);
+        SysConfig sysConfig = sysConfigService.getOne(queryWrapper);
+        String code = sysConfig.getCode();
+        if (Constants.VERFICATIONCODE_OPEN.equals(code)) {
+            try {
+                response.sendRedirect("/verificationCode/get");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
     }
 
     @ApiOperation(value = "���������������", notes = "���������������")

--
Gitblit v1.8.0