Compare commits

..

No commits in common. "ce46bafa60a8b6c6b538ffbff10f35a2e8c26ad8" and "045688f12371cdb718afcd01265a6e94db7e4650" have entirely different histories.

3 changed files with 5 additions and 4 deletions

View File

@ -61,7 +61,7 @@ public class SysLogLoginController {
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception { public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<SysLogLoginDTO> list = sysLogLoginService.list(params); List<SysLogLoginDTO> list = sysLogLoginService.list(params);
ExcelUtils.exportExcelToTarget(response, "登入登出日志导出", list, SysLogLoginExcel.class); ExcelUtils.exportExcelToTarget(response, null, list, SysLogLoginExcel.class);
} }
} }

View File

@ -46,6 +46,7 @@ public class SysLogOperationController {
}) })
public Result<PageData<SysLogOperationDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){ public Result<PageData<SysLogOperationDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<SysLogOperationDTO> page = sysLogOperationService.page(params); PageData<SysLogOperationDTO> page = sysLogOperationService.page(params);
return new Result<PageData<SysLogOperationDTO>>().ok(page); return new Result<PageData<SysLogOperationDTO>>().ok(page);
} }
@ -55,7 +56,7 @@ public class SysLogOperationController {
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception { public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<SysLogOperationDTO> list = sysLogOperationService.list(params); List<SysLogOperationDTO> list = sysLogOperationService.list(params);
ExcelUtils.exportExcelToTarget(response, "操作日志导出", list, SysLogOperationExcel.class); ExcelUtils.exportExcelToTarget(response, null, list, SysLogOperationExcel.class);
} }
} }

View File

@ -7,8 +7,8 @@ import java.util.Date;
@Data @Data
public class SysLogLoginExcel { public class SysLogLoginExcel {
@Excel(name = "用户操作", replace = {"登入_0", "登出_1"}) @Excel(name = "用户操作")
private Integer operation; private String operation;
@Excel(name = "状态", replace = {"失败_0", "成功_1", "账号已锁定_1"}) @Excel(name = "状态", replace = {"失败_0", "成功_1", "账号已锁定_1"})
private Integer status; private Integer status;
@Excel(name = "User-Agent") @Excel(name = "User-Agent")