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/SysLogininforServiceImpl.java | 74 +++++++++++++++++++++++++-----------
1 files changed, 51 insertions(+), 23 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 a3b5257..8b56619 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,65 +1,93 @@
package com.ruoyi.system.service.impl;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+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.common.utils.StringUtils;
import com.ruoyi.system.domain.SysLogininfor;
import com.ruoyi.system.mapper.SysLogininforMapper;
import com.ruoyi.system.service.ISysLogininforService;
+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 SysLogininforServiceImpl implements ISysLogininforService
-{
+public class SysLogininforServiceImpl extends ServicePlusImpl<SysLogininforMapper, SysLogininfor, SysLogininfor> implements ISysLogininforService {
- @Autowired
- private SysLogininforMapper logininforMapper;
+ @Override
+ public TableDataInfo<SysLogininfor> selectPageLogininforList(SysLogininfor logininfor) {
+ Map<String, Object> params = logininfor.getParams();
+ LambdaQueryWrapper<SysLogininfor> lqw = new LambdaQueryWrapper<SysLogininfor>()
+ .like(StringUtils.isNotBlank(logininfor.getIpaddr()), SysLogininfor::getIpaddr, logininfor.getIpaddr())
+ .eq(StringUtils.isNotBlank(logininfor.getStatus()), SysLogininfor::getStatus, logininfor.getStatus())
+ .like(StringUtils.isNotBlank(logininfor.getUserName()), SysLogininfor::getUserName, logininfor.getUserName())
+ .apply(StringUtils.isNotEmpty(params.get("beginTime")),
+ "date_format(login_time,'%y%m%d') >= date_format({0},'%y%m%d')",
+ params.get("beginTime"))
+ .apply(StringUtils.isNotEmpty(params.get("endTime")),
+ "date_format(login_time,'%y%m%d') <= date_format({0},'%y%m%d')",
+ params.get("endTime"));
+ return PageUtils.buildDataInfo(page(PageUtils.buildPage("info_id","desc"), lqw));
+ }
/**
* 鏂板绯荤粺鐧诲綍鏃ュ織
- *
+ *
* @param logininfor 璁块棶鏃ュ織瀵硅薄
*/
@Override
- public void insertLogininfor(SysLogininfor logininfor)
- {
- logininforMapper.insertLogininfor(logininfor);
+ public void insertLogininfor(SysLogininfor logininfor) {
+ logininfor.setLoginTime(new Date());
+ save(logininfor);
}
/**
* 鏌ヨ绯荤粺鐧诲綍鏃ュ織闆嗗悎
- *
+ *
* @param logininfor 璁块棶鏃ュ織瀵硅薄
* @return 鐧诲綍璁板綍闆嗗悎
*/
@Override
- public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor)
- {
- return logininforMapper.selectLogininforList(logininfor);
+ public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor) {
+ Map<String, Object> params = logininfor.getParams();
+ return list(new LambdaQueryWrapper<SysLogininfor>()
+ .like(StringUtils.isNotBlank(logininfor.getIpaddr()),SysLogininfor::getIpaddr,logininfor.getIpaddr())
+ .eq(StringUtils.isNotBlank(logininfor.getStatus()),SysLogininfor::getStatus,logininfor.getStatus())
+ .like(StringUtils.isNotBlank(logininfor.getUserName()),SysLogininfor::getUserName,logininfor.getUserName())
+ .apply(StringUtils.isNotEmpty(params.get("beginTime")),
+ "date_format(login_time,'%y%m%d') >= date_format({0},'%y%m%d')",
+ params.get("beginTime"))
+ .apply(StringUtils.isNotEmpty(params.get("endTime")),
+ "date_format(login_time,'%y%m%d') <= date_format({0},'%y%m%d')",
+ params.get("endTime"))
+ .orderByDesc(SysLogininfor::getInfoId));
}
/**
* 鎵归噺鍒犻櫎绯荤粺鐧诲綍鏃ュ織
- *
+ *
* @param infoIds 闇�瑕佸垹闄ょ殑鐧诲綍鏃ュ織ID
* @return
*/
@Override
- public int deleteLogininforByIds(Long[] infoIds)
- {
- return logininforMapper.deleteLogininforByIds(infoIds);
+ public int deleteLogininforByIds(Long[] infoIds) {
+ return baseMapper.deleteBatchIds(Arrays.asList(infoIds));
}
/**
* 娓呯┖绯荤粺鐧诲綍鏃ュ織
*/
@Override
- public void cleanLogininfor()
- {
- logininforMapper.cleanLogininfor();
+ public void cleanLogininfor() {
+ remove(new LambdaQueryWrapper<>());
}
}
--
Gitblit v1.9.3