From 816df6ec0a43ef777e0d4cd0daff61f870626d83 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 05 六月 2025 13:53:12 +0800
Subject: [PATCH] feat(system): 添加节假日管理功能- 新增 SysHolidayController、SysHoliday、SysHolidayMapper、SysHolidayServiceImpl 和 ISysHolidayService 类- 实现节假日信息的增删改查和导出功能 - 添加工作日判断方法 - 新增相关 API 接口
---
zhitan-admin/src/main/java/com/zhitan/web/controller/monitor/SysOperlogController.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/monitor/SysOperlogController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/monitor/SysOperlogController.java
index 247828e..0caaf4e 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/monitor/SysOperlogController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/monitor/SysOperlogController.java
@@ -1,15 +1,6 @@
package com.zhitan.web.controller.monitor;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import javax.annotation.Resource;
-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.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhitan.common.annotation.Log;
import com.zhitan.common.core.controller.BaseController;
import com.zhitan.common.core.domain.AjaxResult;
@@ -18,10 +9,16 @@
import com.zhitan.common.utils.poi.ExcelUtil;
import com.zhitan.system.domain.SysOperLog;
import com.zhitan.system.service.ISysOperLogService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
/**
* 鎿嶄綔鏃ュ織璁板綍
- *
+ *
* @author zhitan
*/
@RestController
@@ -33,10 +30,9 @@
@PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
@GetMapping("/list")
- public TableDataInfo list(SysOperLog operLog)
+ public TableDataInfo list(SysOperLog operLog, Long pageNum, Long pageSize)
{
- startPage();
- List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+ Page<SysOperLog> list = operLogService.selectOperLogPage(operLog,pageNum,pageSize);
return getDataTable(list);
}
--
Gitblit v1.9.3