From 2af534eea471f4adb104906c7a814bcc66d4d68d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 13 九月 2021 13:03:58 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java | 99 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 72 insertions(+), 27 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 5489815..ff518bd 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,76 +1,121 @@
package com.ruoyi.system.service.impl;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+import cn.hutool.core.util.ArrayUtil;
+import com.ruoyi.common.utils.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.PageUtils;
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;
/**
* 鎿嶄綔鏃ュ織 鏈嶅姟灞傚鐞�
- *
+ *
* @author ruoyi
*/
@Service
-public class SysOperLogServiceImpl implements ISysOperLogService
-{
- @Autowired
- private SysOperLogMapper operLogMapper;
+public class SysOperLogServiceImpl extends ServicePlusImpl<SysOperLogMapper, SysOperLog, SysOperLog> implements ISysOperLogService {
+
+ @Override
+ public TableDataInfo<SysOperLog> selectPageOperLogList(SysOperLog operLog) {
+ 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())
+ .apply(StringUtils.isNotEmpty(params.get("beginTime")),
+ "date_format(oper_time,'%y%m%d') >= date_format({0},'%y%m%d')",
+ params.get("beginTime"))
+ .apply(StringUtils.isNotEmpty(params.get("endTime")),
+ "date_format(oper_time,'%y%m%d') <= date_format({0},'%y%m%d')",
+ params.get("endTime"));
+ return PageUtils.buildDataInfo(page(PageUtils.buildPage("oper_id","desc"), lqw));
+ }
/**
* 鏂板鎿嶄綔鏃ュ織
- *
+ *
* @param operLog 鎿嶄綔鏃ュ織瀵硅薄
*/
@Override
- public void insertOperlog(SysOperLog operLog)
- {
- operLogMapper.insertOperlog(operLog);
+ public void insertOperlog(SysOperLog operLog) {
+ operLog.setOperTime(new Date());
+ save(operLog);
}
/**
* 鏌ヨ绯荤粺鎿嶄綔鏃ュ織闆嗗悎
- *
+ *
* @param operLog 鎿嶄綔鏃ュ織瀵硅薄
* @return 鎿嶄綔鏃ュ織闆嗗悎
*/
@Override
- public List<SysOperLog> selectOperLogList(SysOperLog operLog)
- {
- return operLogMapper.selectOperLogList(operLog);
+ public List<SysOperLog> selectOperLogList(SysOperLog operLog) {
+ Map<String, Object> params = operLog.getParams();
+ return list(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())
+ .apply(StringUtils.isNotEmpty(params.get("beginTime")),
+ "date_format(oper_time,'%y%m%d') >= date_format({0},'%y%m%d')",
+ params.get("beginTime"))
+ .apply(StringUtils.isNotEmpty(params.get("endTime")),
+ "date_format(oper_time,'%y%m%d') <= date_format({0},'%y%m%d')",
+ params.get("endTime"))
+ .orderByDesc(SysOperLog::getOperId));
}
/**
* 鎵归噺鍒犻櫎绯荤粺鎿嶄綔鏃ュ織
- *
+ *
* @param operIds 闇�瑕佸垹闄ょ殑鎿嶄綔鏃ュ織ID
* @return 缁撴灉
*/
@Override
- public int deleteOperLogByIds(Long[] operIds)
- {
- return operLogMapper.deleteOperLogByIds(operIds);
+ public int deleteOperLogByIds(Long[] operIds) {
+ return baseMapper.deleteBatchIds(Arrays.asList(operIds));
}
/**
* 鏌ヨ鎿嶄綔鏃ュ織璇︾粏
- *
+ *
* @param operId 鎿嶄綔ID
* @return 鎿嶄綔鏃ュ織瀵硅薄
*/
@Override
- public SysOperLog selectOperLogById(Long operId)
- {
- return operLogMapper.selectOperLogById(operId);
+ public SysOperLog selectOperLogById(Long operId) {
+ return getById(operId);
}
/**
* 娓呯┖鎿嶄綔鏃ュ織
*/
@Override
- public void cleanOperLog()
- {
- operLogMapper.cleanOperLog();
+ public void cleanOperLog() {
+ remove(new LambdaQueryWrapper<>());
}
}
--
Gitblit v1.9.3