From 6ce4c93b3cb0271a7647f2fae0e982de70036aed Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 08 五月 2021 16:55:50 +0800
Subject: [PATCH] fix 日志时间sql符号转换问题
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 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..ea50e11 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,13 +1,19 @@
package com.ruoyi.system.service.impl;
-import java.util.List;
-
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.system.mapper.SysOperLogMapper;
import com.ruoyi.system.service.ISysOperLogService;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
/**
* 鎿嶄綔鏃ュ織 鏈嶅姟灞傚鐞�
@@ -16,8 +22,6 @@
*/
@Service
public class SysOperLogServiceImpl extends ServiceImpl<SysOperLogMapper, SysOperLog> implements ISysOperLogService {
- @Autowired
- private SysOperLogMapper operLogMapper;
/**
* 鏂板鎿嶄綔鏃ュ織
@@ -26,7 +30,8 @@
*/
@Override
public void insertOperlog(SysOperLog operLog) {
- operLogMapper.insertOperlog(operLog);
+ operLog.setOperTime(new Date());
+ save(operLog);
}
/**
@@ -37,7 +42,26 @@
*/
@Override
public List<SysOperLog> selectOperLogList(SysOperLog operLog) {
- return operLogMapper.selectOperLogList(operLog);
+ Map<String, Object> params = operLog.getParams();
+ return list(new LambdaQueryWrapper<SysOperLog>()
+ .like(StrUtil.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(StrUtil.isNotBlank(operLog.getOperName()),SysOperLog::getOperName,operLog.getOperName())
+ .apply(Validator.isNotEmpty(params.get("beginTime")),
+ "date_format(login_time,'%y%m%d') >= date_format({0},'%y%m%d')",
+ params.get("beginTime"))
+ .apply(Validator.isNotEmpty(params.get("endTime")),
+ "date_format(login_time,'%y%m%d') <= date_format({0},'%y%m%d'",
+ params.get("endTime"))
+ .orderByDesc(SysOperLog::getOperId));
}
/**
@@ -48,7 +72,7 @@
*/
@Override
public int deleteOperLogByIds(Long[] operIds) {
- return operLogMapper.deleteOperLogByIds(operIds);
+ return baseMapper.deleteBatchIds(Arrays.asList(operIds));
}
/**
@@ -59,7 +83,7 @@
*/
@Override
public SysOperLog selectOperLogById(Long operId) {
- return operLogMapper.selectOperLogById(operId);
+ return getById(operId);
}
/**
@@ -67,6 +91,6 @@
*/
@Override
public void cleanOperLog() {
- operLogMapper.cleanOperLog();
+ remove(new LambdaQueryWrapper<>());
}
}
--
Gitblit v1.9.3