From c17ee7624b28485794e956a17631ce2d41a623ff Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 27 十一月 2024 09:05:22 +0800
Subject: [PATCH] 合并代码
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLoginLogServiceImpl.java | 67 ++++++++++++++++++++++++++++-----
1 files changed, 56 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLoginLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLoginLogServiceImpl.java
index e5ef1e5..afe491d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLoginLogServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLoginLogServiceImpl.java
@@ -1,20 +1,65 @@
package com.ruoyi.system.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.mapper.SysLoginLogMapper;
-import com.ruoyi.system.api.model.SysLoginLog;
-import com.ruoyi.account.service.SysLoginLogService;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.BasePage;
+import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.system.api.domain.SysLoginLog;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.mapper.SysLoginLogMapper;
+import com.ruoyi.system.service.ISysLoginLogService;
+import com.ruoyi.system.service.ISysUserService;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.List;
+
/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
+ * @author zhibing.pu
+ * @Date 2024/8/12 15:47
*/
@Service
-public class SysLoginLogServiceImpl extends ServiceImpl<SysLoginLogMapper, SysLoginLog> implements SysLoginLogService {
-
+public class SysLoginLogServiceImpl extends ServiceImpl<SysLoginLogMapper, SysLoginLog> implements ISysLoginLogService {
+
+ @Resource
+ private ISysUserService sysUserService;
+
+
+
+
+
+ /**
+ * 获取列表数据
+ * @param name
+ * @param basePage
+ * @return
+ */
+ @Override
+ public PageInfo<SysLoginLog> pageList(String name, BasePage basePage) {
+ PageInfo<SysLoginLog> pageInfo = new PageInfo<>(basePage.getPageCurr(), basePage.getPageSize());
+ List<SysLoginLog> list = this.baseMapper.pageList(pageInfo, name);
+ return pageInfo.setRecords(list);
+ }
+
+
+ /**
+ * 添加登录日志
+ * @param loginLog
+ * @return
+ */
+ @Override
+ public AjaxResult addLoginLog(SysLoginLog loginLog) {
+ String username = loginLog.getUsername();
+ SysUser sysUser = sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, username).eq(SysUser::getDelFlag, 0));
+ if(null == sysUser){
+ return AjaxResult.error("用户账号无效");
+ }
+ loginLog.setUserId(sysUser.getUserId().intValue());
+ loginLog.setCreateTime(LocalDateTime.now());
+ loginLog.setDelFlag(0);
+ this.save(loginLog);
+ return AjaxResult.success();
+ }
}
--
Gitblit v1.7.1