Commit d15c18f3 authored by wzp's avatar wzp

修改日志返回格式

parent 7740ade9
...@@ -96,7 +96,7 @@ public class SysLogController extends BaseController { ...@@ -96,7 +96,7 @@ public class SysLogController extends BaseController {
}) })
@GetMapping(value = "/querySysLogList") @GetMapping(value = "/querySysLogList")
@RequiresPermissions("/sysLog/querySysLogList") @RequiresPermissions("/sysLog/querySysLogList")
public ResponseEntity<Page<SysLog>> querySysLogList(GenericPageParam genericPageParam) { public Map<String, Object> querySysLogList(GenericPageParam genericPageParam) {
try { try {
LambdaQueryWrapper<SysLog> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysLog> queryWrapper = new LambdaQueryWrapper<>();
// 对名称或编码模糊查询 // 对名称或编码模糊查询
...@@ -117,11 +117,11 @@ public class SysLogController extends BaseController { ...@@ -117,11 +117,11 @@ public class SysLogController extends BaseController {
// 设置排序规则 // 设置排序规则
queryWrapper.orderByDesc(SysLog::getOperationTime); queryWrapper.orderByDesc(SysLog::getOperationTime);
Page<SysLog> page = sysLogService.page(getPage(), queryWrapper); Page<SysLog> page = sysLogService.page(getPage(), queryWrapper);
return ResponseEntity.ok(page); return getResult(page);
} catch (Exception e) { } catch (Exception e) {
logger.error("查询系统日志列表出错!", e); logger.error("查询系统日志列表出错!", e);
} }
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); return getFailResult();
} }
/** /**
...@@ -158,14 +158,14 @@ public class SysLogController extends BaseController { ...@@ -158,14 +158,14 @@ public class SysLogController extends BaseController {
}) })
@GetMapping(value = "/OperationLog") @GetMapping(value = "/OperationLog")
@RequiresPermissions("/sysLog/OperationLog") @RequiresPermissions("/sysLog/OperationLog")
public ResponseEntity<Page<TOperationLog>> OperationLog(TOperationLog operationLog) { public Map<String, Object> OperationLog(TOperationLog operationLog) {
try { try {
Page<TOperationLog> page = operationLogService.pageList(getPage(), operationLog); Page<TOperationLog> page = operationLogService.pageList(getPage(), operationLog);
return ResponseEntity.ok(page); return getResult(page);
} catch (Exception e) { } catch (Exception e) {
logger.error("查询系统日志列表出错!", e); logger.error("查询系统日志列表出错!", e);
} }
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); return getFailResult();
} }
/** /**
...@@ -181,14 +181,14 @@ public class SysLogController extends BaseController { ...@@ -181,14 +181,14 @@ public class SysLogController extends BaseController {
}) })
@GetMapping(value = "/runLogList") @GetMapping(value = "/runLogList")
@RequiresPermissions("/sysLog/runLogList") @RequiresPermissions("/sysLog/runLogList")
public ResponseEntity<Page<RunLog>> runLogList(RunLog runLog) { public Map<String, Object> runLogList(RunLog runLog) {
try { try {
Page<RunLog> page = runLogService.pageList(getPage(), runLog); Page<RunLog> page = runLogService.pageList(getPage(), runLog);
return ResponseEntity.ok(page); return getResult(page);
} catch (Exception e) { } catch (Exception e) {
logger.error("查询系统日志列表出错!", e); logger.error("查询系统日志列表出错!", e);
} }
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); return getFailResult();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment