From 0b6952d0fe5c7f865f78b0531f3d476634fa091a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 08 五月 2021 17:05:18 +0800
Subject: [PATCH] fix 日志时间sql符号转换问题
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
index 10ec41c..2c2c8e4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
@@ -1,13 +1,18 @@
package com.ruoyi.system.service.impl;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.domain.SysLogininfor;
import com.ruoyi.system.mapper.SysLogininforMapper;
import com.ruoyi.system.service.ISysLogininforService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Arrays;
+import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* 绯荤粺璁块棶鏃ュ織鎯呭喌淇℃伅 鏈嶅姟灞傚鐞�
@@ -17,9 +22,6 @@
@Service
public class SysLogininforServiceImpl extends ServiceImpl<SysLogininforMapper, SysLogininfor> implements ISysLogininforService {
- @Autowired
- private SysLogininforMapper logininforMapper;
-
/**
* 鏂板绯荤粺鐧诲綍鏃ュ織
*
@@ -27,7 +29,8 @@
*/
@Override
public void insertLogininfor(SysLogininfor logininfor) {
- logininforMapper.insertLogininfor(logininfor);
+ logininfor.setLoginTime(new Date());
+ save(logininfor);
}
/**
@@ -38,7 +41,18 @@
*/
@Override
public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor) {
- return logininforMapper.selectLogininforList(logininfor);
+ Map<String, Object> params = logininfor.getParams();
+ return list(new LambdaQueryWrapper<SysLogininfor>()
+ .like(StrUtil.isNotBlank(logininfor.getIpaddr()),SysLogininfor::getIpaddr,logininfor.getIpaddr())
+ .eq(StrUtil.isNotBlank(logininfor.getStatus()),SysLogininfor::getStatus,logininfor.getStatus())
+ .like(StrUtil.isNotBlank(logininfor.getUserName()),SysLogininfor::getUserName,logininfor.getUserName())
+ .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(SysLogininfor::getInfoId));
}
/**
@@ -49,7 +63,7 @@
*/
@Override
public int deleteLogininforByIds(Long[] infoIds) {
- return logininforMapper.deleteLogininforByIds(infoIds);
+ return baseMapper.deleteBatchIds(Arrays.asList(infoIds));
}
/**
@@ -57,6 +71,6 @@
*/
@Override
public void cleanLogininfor() {
- logininforMapper.cleanLogininfor();
+ remove(new LambdaQueryWrapper<>());
}
}
--
Gitblit v1.9.3