From 6ebf2b2a84b903f3600238dd084b3ae9ee4d6d3b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 16 Apr 2021 17:33:07 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/java/com/moral/api/service/impl/UserLogServiceImpl.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserLogServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserLogServiceImpl.java
index 381f1d0..61e14ef 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserLogServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserLogServiceImpl.java
@@ -1,10 +1,22 @@
package com.moral.api.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.UserLog;
import com.moral.api.mapper.UserLogMapper;
import com.moral.api.service.UserLogService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.util.TokenUtils;
+
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import java.util.Map;
+import java.util.Objects;
+
+import javax.servlet.http.HttpServletRequest;
/**
* <p>
@@ -17,4 +29,27 @@
@Service
public class UserLogServiceImpl extends ServiceImpl<UserLogMapper, UserLog> implements UserLogService {
+ @Autowired
+ private UserLogMapper userLogMapper;
+
+ @Override
+ public Page<UserLog> selectLogs(Map<String, Object> parameters) {
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ String token = request.getHeader("token");
+ Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+ Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
+ Object orgId = orgInfo.get("id");
+ QueryWrapper<UserLog> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("organization_id", orgId);
+ Object type = parameters.get("type");
+ if (type != null) {
+ queryWrapper.eq("type", type);
+ }
+ queryWrapper.orderByDesc("create_time");
+ Integer page = (Integer) parameters.get("page");
+ Integer size = (Integer) parameters.get("size");
+ Page<UserLog> userLogPage = new Page<>(page, size);
+ userLogMapper.selectPage(userLogPage, queryWrapper);
+ return userLogPage;
+ }
}
--
Gitblit v1.8.0