Merge remote-tracking branch 'origin/master'

This commit is contained in:
2021-04-27 14:19:21 +08:00
3 changed files with 15 additions and 2 deletions

View File

@@ -38,5 +38,10 @@ public class LogController {
public ResultVO<PageInfo<Map<String,Object>>> getLogList(String data, WebPageInfo webPageInfo) {
return logService.getLogList(data, webPageInfo);
}
@GetMapping("/loginlog")
@ApiOperation(value = "登录日志查询模块")
public ResultVO<PageInfo<Map<String,Object>>> getLoginLogList(String data, WebPageInfo webPageInfo) {
return logService.getLoginLogList(data, webPageInfo);
}
}

View File

@@ -8,4 +8,6 @@ import com.hcframe.base.common.WebPageInfo;
public interface LogService {
ResultVO<PageInfo<Map<String, Object>>> getLogList(String data, WebPageInfo webPageInfo);
ResultVO<PageInfo<Map<String, Object>>> getLoginLogList(String data, WebPageInfo webPageInfo);
}

View File

@@ -24,6 +24,8 @@ public class LogServiceImpl implements LogService{
private static final String OS_SYS_TITLE = "GB_LOGS";
private static final OsSysTable TABLE_INFO = OsSysTable.builder().tableName(OS_SYS_TITLE).tablePk(LOG_ID).build();
private static final OsSysTable TABLE_INFO_LOGIN = OsSysTable.builder().tableName("GB_LOGIN_LOGS").tablePk("LOGIN_LOG_ID").build();
final BaseMapper baseMapper;
final TableService tableService;
@@ -33,13 +35,17 @@ public class LogServiceImpl implements LogService{
this.baseMapper = baseMapper;
this.tableService = tableService;
}
@Override
public ResultVO<PageInfo<Map<String, Object>>> getLogList(String data, WebPageInfo webPageInfo) {
PageInfo<Map<String,Object>> pageInfo = tableService.searchSingleTables(data, TABLE_INFO, webPageInfo);
return ResultVO.getSuccess(pageInfo);
}
@Override
public ResultVO<PageInfo<Map<String, Object>>> getLoginLogList(String data, WebPageInfo webPageInfo) {
PageInfo<Map<String,Object>> pageInfo = tableService.searchSingleTables(data, TABLE_INFO_LOGIN, webPageInfo);
return ResultVO.getSuccess(pageInfo);
}
}