From 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 06 十二月 2023 08:41:32 +0800 Subject: [PATCH] bug --- server/src/main/java/doumeemes/api/system/SystemLoginLogController.java | 27 +++++++++++++++++++++++++++ 1 files changed, 27 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..c170747 100644 --- a/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java +++ b/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java @@ -2,13 +2,20 @@ 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; +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.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 +36,9 @@ @Autowired private SystemLoginLogService systemLoginLogService; + @Autowired + private SystemUserService systemUserService; + @PostMapping("/page") @ApiOperation("鍒嗛〉鏌ヨ") @RequiresPermissions("system:loginLog:query") @@ -42,4 +52,21 @@ 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); } + + + @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