From 519b464e4ed3d07bd5aa23a4067e5869058de2e5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十月 2023 13:36:51 +0800
Subject: [PATCH] 添加统计日志

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

diff --git a/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java b/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java
index de8b960..b1e950a 100644
--- a/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java
+++ b/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java
@@ -2,13 +2,30 @@
 
 import doumeemes.api.BaseController;
 import doumeemes.core.annotation.excel.ExcelExporter;
+import doumeemes.core.annotation.trace.Trace;
 import doumeemes.core.model.ApiResponse;
 import doumeemes.core.model.PageData;
 import doumeemes.core.model.PageWrap;
 import doumeemes.core.utils.DateUtil;
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> dev
+import doumeemes.dao.business.model.Backorder;
+import doumeemes.dao.business.vo.WorkPlansVO;
+import doumeemes.dao.ext.dto.CompanyLoginDTO;
+import doumeemes.dao.ext.dto.QueryWorkPlansDTO;
+<<<<<<< HEAD
+=======
+import doumeemes.dao.ext.dto.CompanyLoginDTO;
+>>>>>>> 1.0.3
+=======
+>>>>>>> dev
+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;    
@@ -29,6 +46,9 @@
     @Autowired
     private SystemLoginLogService systemLoginLogService;
 
+    @Autowired
+    private SystemUserService systemUserService;
+
     @PostMapping("/page")
     @ApiOperation("鍒嗛〉鏌ヨ")
     @RequiresPermissions("system:loginLog:query")
@@ -41,5 +61,47 @@
     @RequiresPermissions("system:loginLog:query")
     public void export (@RequestBody PageWrap<QuerySystemLoginLogDTO> pageWrap, HttpServletResponse response) {
         ExcelExporter.build(SystemLoginLog.class).exportWithFirstAndEnd(systemLoginLogService.findPage(pageWrap).getRecords(), "鐧诲綍鏃ュ織_"+System.currentTimeMillis(),"鐧诲綍鏃ュ織-"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
+<<<<<<< HEAD
+=======
     }
+
+
+    @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) {
+<<<<<<< HEAD
+        ExcelExporter.build(CompanyLoginStatisticsVO.class).exportWithFirstAndEnd(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "浼佷笟鐧诲綍缁熻_"+System.currentTimeMillis(),"浼佷笟鐧诲綍缁熻_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
+>>>>>>> 1.0.3
+    }
+
+
+    @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(),"浼佷笟鐧诲綍缁熻",null, response);
+        ExcelExporter.build(CompanyLoginStatisticsVO.class).export(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "浼佷笟鐧诲綍缁熻_"+System.currentTimeMillis(), response);
+    }
+
+=======
+        //ExcelExporter.build(CompanyLoginStatisticsVO.class).exportWithFirstAndEnd(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "浼佷笟鐧诲綍缁熻_"+System.currentTimeMillis(),"浼佷笟鐧诲綍缁熻",null, response);
+        ExcelExporter.build(CompanyLoginStatisticsVO.class).export(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "浼佷笟鐧诲綍缁熻_"+System.currentTimeMillis(), response);
+    }
+
+>>>>>>> dev
 }

--
Gitblit v1.9.3