From 71a2a8245db4c04be3f96a9eb9b47931d3130650 Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: 星期三, 18 一月 2023 17:09:43 +0800
Subject: [PATCH] refactor 重构 common, framework 包结构, 参照 cloud 版本拆分子模块 ; update 更新模块包名 ; delete 移除 sms 模块, oss 模块, framework 模块 (并入 common 模块) ;
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java | 97 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 83 insertions(+), 14 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
index 95bf7f1..2d89d77 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
@@ -1,23 +1,76 @@
package com.ruoyi.system.service.impl;
-import java.util.List;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ArrayUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.mybatis.core.page.PageQuery;
+import com.ruoyi.common.mybatis.core.page.TableDataInfo;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.ip.AddressUtils;
+import com.ruoyi.common.log.event.OperLogEvent;
import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.system.mapper.SysOperLogMapper;
import com.ruoyi.system.service.ISysOperLogService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
/**
* 鎿嶄綔鏃ュ織 鏈嶅姟灞傚鐞�
*
- * @author ruoyi
+ * @author Lion Li
*/
+@RequiredArgsConstructor
@Service
-public class SysOperLogServiceImpl extends ServiceImpl<SysOperLogMapper, SysOperLog> implements ISysOperLogService {
- @Autowired
- private SysOperLogMapper operLogMapper;
+public class SysOperLogServiceImpl implements ISysOperLogService {
+
+ private final SysOperLogMapper baseMapper;
+
+ /**
+ * 鎿嶄綔鏃ュ織璁板綍
+ *
+ * @param operLogEvent 鎿嶄綔鏃ュ織浜嬩欢
+ */
+ @Async
+ @EventListener
+ public void recordOper(OperLogEvent operLogEvent) {
+ SysOperLog operLog = BeanUtil.toBean(operLogEvent, SysOperLog.class);
+ // 杩滅▼鏌ヨ鎿嶄綔鍦扮偣
+ operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp()));
+ insertOperlog(operLog);
+ }
+
+ @Override
+ public TableDataInfo<SysOperLog> selectPageOperLogList(SysOperLog operLog, PageQuery pageQuery) {
+ Map<String, Object> params = operLog.getParams();
+ LambdaQueryWrapper<SysOperLog> lqw = new LambdaQueryWrapper<SysOperLog>()
+ .like(StringUtils.isNotBlank(operLog.getTitle()), SysOperLog::getTitle, operLog.getTitle())
+ .eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0,
+ SysOperLog::getBusinessType, operLog.getBusinessType())
+ .func(f -> {
+ if (ArrayUtil.isNotEmpty(operLog.getBusinessTypes())) {
+ f.in(SysOperLog::getBusinessType, Arrays.asList(operLog.getBusinessTypes()));
+ }
+ })
+ .eq(operLog.getStatus() != null,
+ SysOperLog::getStatus, operLog.getStatus())
+ .like(StringUtils.isNotBlank(operLog.getOperName()), SysOperLog::getOperName, operLog.getOperName())
+ .between(params.get("beginTime") != null && params.get("endTime") != null,
+ SysOperLog::getOperTime, params.get("beginTime"), params.get("endTime"));
+ if (StringUtils.isBlank(pageQuery.getOrderByColumn())) {
+ pageQuery.setOrderByColumn("oper_id");
+ pageQuery.setIsAsc("desc");
+ }
+ Page<SysOperLog> page = baseMapper.selectPage(pageQuery.build(), lqw);
+ return TableDataInfo.build(page);
+ }
/**
* 鏂板鎿嶄綔鏃ュ織
@@ -26,7 +79,8 @@
*/
@Override
public void insertOperlog(SysOperLog operLog) {
- operLogMapper.insertOperlog(operLog);
+ operLog.setOperTime(new Date());
+ baseMapper.insert(operLog);
}
/**
@@ -37,7 +91,22 @@
*/
@Override
public List<SysOperLog> selectOperLogList(SysOperLog operLog) {
- return operLogMapper.selectOperLogList(operLog);
+ Map<String, Object> params = operLog.getParams();
+ return baseMapper.selectList(new LambdaQueryWrapper<SysOperLog>()
+ .like(StringUtils.isNotBlank(operLog.getTitle()), SysOperLog::getTitle, operLog.getTitle())
+ .eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0,
+ SysOperLog::getBusinessType, operLog.getBusinessType())
+ .func(f -> {
+ if (ArrayUtil.isNotEmpty(operLog.getBusinessTypes())) {
+ f.in(SysOperLog::getBusinessType, Arrays.asList(operLog.getBusinessTypes()));
+ }
+ })
+ .eq(operLog.getStatus() != null && operLog.getStatus() > 0,
+ SysOperLog::getStatus, operLog.getStatus())
+ .like(StringUtils.isNotBlank(operLog.getOperName()), SysOperLog::getOperName, operLog.getOperName())
+ .between(params.get("beginTime") != null && params.get("endTime") != null,
+ SysOperLog::getOperTime, params.get("beginTime"), params.get("endTime"))
+ .orderByDesc(SysOperLog::getOperId));
}
/**
@@ -48,7 +117,7 @@
*/
@Override
public int deleteOperLogByIds(Long[] operIds) {
- return operLogMapper.deleteOperLogByIds(operIds);
+ return baseMapper.deleteBatchIds(Arrays.asList(operIds));
}
/**
@@ -59,7 +128,7 @@
*/
@Override
public SysOperLog selectOperLogById(Long operId) {
- return operLogMapper.selectOperLogById(operId);
+ return baseMapper.selectById(operId);
}
/**
@@ -67,6 +136,6 @@
*/
@Override
public void cleanOperLog() {
- operLogMapper.cleanOperLog();
+ baseMapper.delete(new LambdaQueryWrapper<>());
}
}
--
Gitblit v1.9.3