From 239927b057f65a040594f7a4cb08c8881b303797 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 14:52:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl-230812' into cjl-230812
---
screen-api/src/main/java/com/moral/api/service/impl/UserLogServiceImpl.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 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..a0fc827 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,18 @@
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 java.util.List;
+import java.util.Map;
/**
* <p>
@@ -17,4 +25,25 @@
@Service
public class UserLogServiceImpl extends ServiceImpl<UserLogMapper, UserLog> implements UserLogService {
+ @Autowired
+ private UserLogMapper userLogMapper;
+
+ @Override
+ public Page<UserLog> selectLogs(Map<String, Object> parameters) {
+ Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfo();
+ 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);
+ List<Object> types = (List<Object>) parameters.get("types");
+ if (!types.isEmpty()) {
+ queryWrapper.in("type", types);
+ }
+ 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