wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REQ-2135: simplify code

Browse Source
This commit is contained in:
yanglin 2024-04-02 17:09:12 +08:00
parent a2c2983d0e
commit 1f3ad31b63
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoRangeQueryService.java
View File

@ -103,9 +103,9 @@ public class TodoRangeQueryService {
.eq(request.getBizFinalState() != null, TodoBusiness::getBizFinalState, request.getBizFinalState());
PageQuerySort.TODO_BUSINESS.appendSortExpr(request, query);
return queryAndAnalysis(getAnalyzeBusiness(request), () -> {
IPage<TodoBusiness> pageData = todoBusinessMapper.selectPage(request.toPage(), query);
List<PendingRecordAdapter> messages = todoRespBuilder.buildBusinessAdapters(pageData.getRecords());
return createAnalysisResult(request.getAnalysisToken(), pageData, messages);
IPage<TodoBusiness> page = todoBusinessMapper.selectPage(request.toPage(), query);
List<PendingRecordAdapter> messages = todoRespBuilder.buildBusinessAdapters(page.getRecords());
return createAnalysisResult(request.getAnalysisToken(), page, messages);
});
}
@ -152,9 +152,9 @@ public class TodoRangeQueryService {
.in(Todo::getTemplateCode, templateCodes);
PageQuerySort.TODO.appendSortExpr(request, query);
return queryAndAnalysis(getAnalyzeTodo(request), () -> {
IPage<Todo> pageData = todoDao.page(request.toPage(), query);
List<PendingRecordAdapter> messages = todoRespBuilder.buildTodoAdapters(pageData.getRecords());
return createAnalysisResult(request.getAnalysisToken(), pageData, messages);
IPage<Todo> page = todoDao.page(request.toPage(), query);
List<PendingRecordAdapter> messages = todoRespBuilder.buildTodoAdapters(page.getRecords());
return createAnalysisResult(request.getAnalysisToken(), page, messages);
});
}
@ -164,17 +164,17 @@ public class TodoRangeQueryService {
SQLCollectInterceptor.enableCollectSQL();
try {
Ref<String> execSQL = Ref.create();
AnalysisPage<PendingRecordAdapter> pageResult = pageQuery.get();
AnalysisPage<PendingRecordAdapter> result = pageQuery.get();
execSQL.set(SQLCollectInterceptor.getSQL().orElse(null));
// !! analysis
pageResult.addAnalysis("analyzeItem", analyzeItem);
pageResult.addAnalysis("query", execSQL::get);
pageResult.addAnalysis("eval", () -> {
result.addAnalysis("analyzeItem", analyzeItem);
result.addAnalysis("query", execSQL::get);
result.addAnalysis("eval", () -> {
String sql = execSQL.get();
if (sql == null || analyzeItem == null) return null;
return new SimpleAnalyzer().analyze(sql, analyzeItem);
});
return pageResult;
return result;
} finally {
SQLCollectInterceptor.disableCollectSQL();
}