Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

8 天以前 c93fc713fedb68cc96f6f29e0442d949b44b7caa

 src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java

@@ -1,38 +1,36 @@
package com.ruoyi.project.monitor.controller;



import java.util.List;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.security.access.prepost.PreAuthorize;

import org.springframework.web.bind.annotation.DeleteMapping;

import org.springframework.web.bind.annotation.GetMapping;

import org.springframework.web.bind.annotation.PathVariable;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import com.ruoyi.common.utils.poi.ExcelUtil;

import com.ruoyi.framework.aspectj.lang.annotation.Log;

import com.ruoyi.framework.aspectj.lang.enums.BusinessType;

import com.ruoyi.framework.security.service.SysPasswordService;

import com.ruoyi.framework.web.controller.BaseController;

import com.ruoyi.framework.web.domain.AjaxResult;

import com.ruoyi.framework.web.page.TableDataInfo;

import com.ruoyi.project.monitor.domain.SysLogininfor;

import com.ruoyi.project.monitor.service.ISysLogininforService;

import jakarta.servlet.http.HttpServletResponse;

import lombok.AllArgsConstructor;

import org.springframework.security.access.prepost.PreAuthorize;

import org.springframework.web.bind.annotation.*;



import java.util.List;



/**

 * 系统访问记录

 * 
 *

 * @author ruoyi

 */

@RestController

@RequestMapping("/monitor/logininfor")

public class SysLogininforController extends BaseController

{

    @Autowired

@AllArgsConstructor

public class SysLogininforController extends BaseController {

    private ISysLogininforService logininforService;

    private SysPasswordService passwordService;



    @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")

    @GetMapping("/list")

    public TableDataInfo list(SysLogininfor logininfor)

    {

    public TableDataInfo list(SysLogininfor logininfor) {

        startPage();

        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);

        return getDataTable(list);

@@ -40,28 +38,33 @@


    @Log(title = "登录日志", businessType = BusinessType.EXPORT)

    @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")

    @GetMapping("/export")

    public AjaxResult export(SysLogininfor logininfor)

    {

    @PostMapping("/export")

    public void export(HttpServletResponse response, SysLogininfor logininfor) {

        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);

        ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);

        return util.exportExcel(list, "登录日志");

        util.exportExcel(response, list, "登录日志");

    }



    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")

    @Log(title = "登录日志", businessType = BusinessType.DELETE)

    @DeleteMapping("/{infoIds}")

    public AjaxResult remove(@PathVariable Long[] infoIds)

    {

    public AjaxResult remove(@PathVariable Long[] infoIds) {

        return toAjax(logininforService.deleteLogininforByIds(infoIds));

    }



    @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")

    @Log(title = "登录日志", businessType = BusinessType.CLEAN)

    @DeleteMapping("/clean")

    public AjaxResult clean()

    {

    public AjaxResult clean() {

        logininforService.cleanLogininfor();

        return AjaxResult.success();

        return success();

    }



    @PreAuthorize("@ss.hasPermi('monitor:logininfor:unlock')")

    @Log(title = "账户解锁", businessType = BusinessType.OTHER)

    @GetMapping("/unlock/{userName}")

    public AjaxResult unlock(@PathVariable("userName") String userName) {

        passwordService.clearLoginRecordCache(userName);

        return success();

    }

}