From 06f455915bb9d11caa8829942f9007809ee9ae3d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 28 十一月 2024 16:37:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLoginLogController.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLoginLogController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLoginLogController.java
index 474c7f6..a1ae307 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLoginLogController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLoginLogController.java
@@ -1,20 +1,58 @@
package com.ruoyi.system.controller;
+import com.ruoyi.common.core.domain.R;
+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.service.ISysLoginLogService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
/**
- * <p>
- * 前端控制器
- * </p>
- *
- * @author luodangjia
- * @since 2024-11-21
+ * @author zhibing.pu
+ * @Date 2024/8/12 15:48
*/
@RestController
-@RequestMapping("/sys-login-log")
+@RequestMapping("/sysLoginLog")
public class SysLoginLogController {
-
+
+
+ @Resource
+ private ISysLoginLogService sysLoginLogService;
+
+
+
+
+ @GetMapping("/pageList")
+ @ApiOperation(value = "获取登录日志列表", tags = {"管理后台-登录日志"})
+ public AjaxResult<PageInfo<SysLoginLog>> pageList(String name, BasePage basePage){
+ PageInfo<SysLoginLog> pageInfo = sysLoginLogService.pageList(name, basePage);
+ return AjaxResult.success(pageInfo);
+ }
+
+
+ @PostMapping("/addLoginLog")
+ @ApiOperation(value = "添加登录日志", tags = {"管理后台-登录日志"})
+ public AjaxResult addLoginLog(@RequestBody SysLoginLog loginLog){
+ return sysLoginLogService.addLoginLog(loginLog);
+ }
+
+
+ /**
+ * 添加登陆日志
+ * @param loginLog
+ * @return
+ */
+ @PostMapping("/saveLoginLog")
+ public R saveLoginLog(@RequestBody SysLoginLog loginLog){
+ loginLog.setCreateTime(LocalDateTime.now());
+ loginLog.setDelFlag(0);
+ sysLoginLogService.save(loginLog);
+ return R.ok();
+ }
+
}
-
--
Gitblit v1.7.1