From 85e514c685f2862cfe641b3eadb4412a09af2062 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 05 九月 2023 18:13:42 +0800
Subject: [PATCH] 111

---
 server/src/main/java/doumeemes/api/system/SystemLoginLogController.java |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java b/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java
index d9054cd..9ce66ab 100644
--- a/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java
+++ b/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java
@@ -5,9 +5,13 @@
 import doumeemes.core.model.ApiResponse;
 import doumeemes.core.model.PageData;
 import doumeemes.core.model.PageWrap;
+import doumeemes.core.utils.DateUtil;
+import doumeemes.dao.ext.dto.CompanyLoginDTO;
+import doumeemes.dao.ext.vo.CompanyLoginStatisticsVO;
 import doumeemes.dao.system.dto.QuerySystemLoginLogDTO;
 import doumeemes.dao.system.model.SystemLoginLog;
 import doumeemes.service.system.SystemLoginLogService;
+import doumeemes.service.system.SystemUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;    
@@ -28,6 +32,9 @@
     @Autowired
     private SystemLoginLogService systemLoginLogService;
 
+    @Autowired
+    private SystemUserService systemUserService;
+
     @PostMapping("/page")
     @ApiOperation("鍒嗛〉鏌ヨ")
     @RequiresPermissions("system:loginLog:query")
@@ -39,6 +46,21 @@
     @ApiOperation("瀵煎嚭Excel")
     @RequiresPermissions("system:loginLog:query")
     public void export (@RequestBody PageWrap<QuerySystemLoginLogDTO> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(SystemLoginLog.class).export(systemLoginLogService.findPage(pageWrap).getRecords(), "鐧诲綍鏃ュ織", response);
+        ExcelExporter.build(SystemLoginLog.class).exportWithFirstAndEnd(systemLoginLogService.findPage(pageWrap).getRecords(), "鐧诲綍鏃ュ織_"+System.currentTimeMillis(),"鐧诲綍鏃ュ織-"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
+    }
+
+
+    @PostMapping("/companyLoginStatisticsPage")
+    @ApiOperation("浼佷笟鐧诲綍缁熻")
+//    @RequiresPermissions("system:loginLog:query")
+    public ApiResponse<PageData<CompanyLoginStatisticsVO>> companyLoginStatisticsPage (@RequestBody PageWrap<CompanyLoginDTO> pageWrap) {
+        return ApiResponse.success(systemUserService.companyLoginStatisticsPage(pageWrap));
+    }
+
+    @PostMapping("/companyLoginStatisticsExport")
+    @ApiOperation("浼佷笟鐧诲綍缁熻瀵煎嚭")
+//    @RequiresPermissions("system:loginLog:query")
+    public void companyLoginStatisticsExport (@RequestBody PageWrap<CompanyLoginDTO> pageWrap, HttpServletResponse response) {
+        ExcelExporter.build(CompanyLoginStatisticsVO.class).exportWithFirstAndEnd(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "浼佷笟鐧诲綍缁熻_"+System.currentTimeMillis(),"浼佷笟鐧诲綍缁熻_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
     }
 }

--
Gitblit v1.9.3