From 64b432916af9c9218ab3f3eca614e26c542142ae Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 十一月 2023 15:47:13 +0800
Subject: [PATCH] bug
---
server/src/main/java/doumeemes/api/system/SystemLoginLogController.java | 26 +-------------------------
1 files changed, 1 insertions(+), 25 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java b/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java
index 396d18f..169c167 100644
--- a/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java
+++ b/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java
@@ -2,18 +2,12 @@
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
-import doumeemes.dao.business.model.Backorder;
-import doumeemes.dao.business.vo.WorkPlansVO;
import doumeemes.dao.ext.dto.CompanyLoginDTO;
-import doumeemes.dao.ext.dto.QueryWorkPlansDTO;
-=======
-import doumeemes.dao.ext.dto.CompanyLoginDTO;
->>>>>>> 1.0.3
import doumeemes.dao.ext.vo.CompanyLoginStatisticsVO;
import doumeemes.dao.system.dto.QuerySystemLoginLogDTO;
import doumeemes.dao.system.model.SystemLoginLog;
@@ -54,8 +48,6 @@
@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
-=======
}
@@ -71,23 +63,7 @@
// @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);
->>>>>>> 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);
- }
}
--
Gitblit v1.9.3