diff --git a/xtools-app-standalone/src/main/resources/application-app-sys.yaml b/xtools-app-standalone/src/main/resources/application-app-sys.yaml index deca5b2..8730f9f 100644 --- a/xtools-app-standalone/src/main/resources/application-app-sys.yaml +++ b/xtools-app-standalone/src/main/resources/application-app-sys.yaml @@ -12,5 +12,16 @@ sys: max-days: 2 # 忽略操作日志 ignore-opt-log: - - /sys/dict-item/get-by-code/* + # 通用 - /**/page + - /**/tree-table + - /**/trees + # sys + - /sys/dict-item/get-by-code/* + - /sys/base/get* + - /sys/base/is-ignore-mask + - /sys/jar/get-all + - /sys/role/all + - /sys/monitor/** + - /sys/risk/get-ip/* + - /sys/risk/get-uri/* diff --git a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysOptLogServiceImpl.java b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysOptLogServiceImpl.java index d261049..d6252cc 100644 --- a/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysOptLogServiceImpl.java +++ b/xtools-app-sys/xtools-app-sys-biz/src/main/java/xtools/app/sys/service/impl/SysOptLogServiceImpl.java @@ -26,7 +26,10 @@ import xtools.core.StringUtils; import xtools.extend.dto.IpAddrDto; import java.util.List; +import java.util.Map; import java.util.Objects; +import java.util.function.Function; +import java.util.stream.Collectors; /** *

Title : SysOptLogServiceImpl

@@ -59,6 +62,12 @@ public class SysOptLogServiceImpl implements SysOptLogService { public Result> page(PageReq pageReq) { // 分页查询 Page page = getPageData(pageReq.getCurrentPage(), pageReq.getPageSize(), pageReq.getQuery()); + // 根据返回的ID查询完整数据 + if (!page.getRecords().isEmpty()) { + List ids = page.getRecords().stream().map(SysOptLog::getId).toList(); + Map recordMap = sysOptLogBaseService.listByIds(ids).stream().collect(Collectors.toMap(SysOptLog::getId, Function.identity())); + page.setRecords(ids.stream().map(recordMap::get).filter(Objects::nonNull).toList()); + } // 分装结果 PageResp pageResp = new PageResp<>(pageReq, page.getTotal(), sysOptLogConvert.entityToRespList(page.getRecords())); return Result.ok(pageResp); @@ -142,16 +151,16 @@ public class SysOptLogServiceImpl implements SysOptLogService { // 查询字段 query.select( SysOptLog::getId - , SysOptLog::getTraceId - , SysOptLog::getTitle - , SysOptLog::getAccountId - , SysOptLog::getAccount - , SysOptLog::getIp - , SysOptLog::getAddr - , SysOptLog::getAddrCode - , SysOptLog::getUri - , SysOptLog::getMemo - , SysOptLog::getGmtCreate +// , SysOptLog::getTraceId +// , SysOptLog::getTitle +// , SysOptLog::getAccountId +// , SysOptLog::getAccount +// , SysOptLog::getIp +// , SysOptLog::getAddr +// , SysOptLog::getAddrCode +// , SysOptLog::getUri +// , SysOptLog::getMemo +// , SysOptLog::getGmtCreate ); // 设置查询条件 setQueryWrapper(query, req);