public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-23 13:58:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 日志导出增加条件

Browse Source
This commit is contained in:
fit2cloud-chenyw
2022-05-26 22:41:46 +08:00
parent 04fe29a96c
commit bab9634d2e
7 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/dataease/controller/sys/SysLogController.java
View File

@@ -17,7 +17,6 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@RestController
@@ -51,7 +50,8 @@ public class SysLogController {
@ApiOperation("导出操作日志")
@PostMapping("/export")
public void export(HttpServletResponse response) throws Exception{
logService.exportExcel(response);
@ApiImplicitParam(name = "request", value = "查询条件", required = true)
public void export(@RequestBody BaseGridRequest request) throws Exception{
logService.exportExcel(request);
}
}

22
backend/src/main/java/io/dataease/service/sys/log/LogService.java
View File

@@ -11,6 +11,7 @@ import io.dataease.commons.constants.SysLogConstants;
import io.dataease.commons.utils.AuthUtils;
import io.dataease.commons.utils.BeanUtils;
import io.dataease.commons.utils.CustomCellWriteUtil;
import io.dataease.commons.utils.ServletUtils;
import io.dataease.controller.sys.base.BaseGridRequest;
import io.dataease.controller.sys.base.ConditionEntity;
import io.dataease.dto.SysLogDTO;
@@ -76,6 +77,15 @@ public class LogService {
public List<SysLogGridDTO> query(BaseGridRequest request) {
request = detailRequest(request);
GridExample gridExample = request.convertExample();
List<SysLogWithBLOBs> voLogs = extSysLogMapper.query(gridExample);
List<SysLogGridDTO> dtos = voLogs.stream().map(this::convertDTO).collect(Collectors.toList());
return dtos;
}
private BaseGridRequest detailRequest(BaseGridRequest request) {
List<ConditionEntity> conditions = request.getConditions();
if (CollectionUtils.isNotEmpty(conditions)) {
ConditionEntity optypeCondition = null;
@@ -107,11 +117,7 @@ public class LogService {
if (ObjectUtils.isNotEmpty(sourceCondition))conditions.add(sourceCondition);
}
}
GridExample gridExample = request.convertExample();
List<SysLogWithBLOBs> voLogs = extSysLogMapper.query(gridExample);
List<SysLogGridDTO> dtos = voLogs.stream().map(this::convertDTO).collect(Collectors.toList());
return dtos;
return request;
}
@@ -206,8 +212,10 @@ public class LogService {
sysLogMapper.insert(sysLogWithBLOBs);
}
public void exportExcel(HttpServletResponse response) throws Exception{
BaseGridRequest request = new BaseGridRequest();
public void exportExcel(BaseGridRequest request) throws Exception{
request = detailRequest(request);
HttpServletResponse response = ServletUtils.response();
GridExample gridExample = request.convertExample();
List<SysLogWithBLOBs> lists = extSysLogMapper.query(gridExample);
List<LogExcel> excels = lists.stream().map(item -> {