Skip to content

李苗 / Vion-DevOps

Go to a project
Commit 8f122681 by HlQ
Options

[fix] 查询异常指标的 mall 列表 bug 修复

1 parent 259dc872
Inline Side-by-side
Showing 1 changed file with 11 additions and 12 deletions
src/main/java/vion/service/impl/monitor/MallServiceImpl.java
...@@ -105,8 +105,7 @@ public class MallServiceImpl extends MPJBaseServiceImpl<MallMapper, Mall> implem ...@@ -105,8 +105,7 @@ public class MallServiceImpl extends MPJBaseServiceImpl<MallMapper, Mall> implem
var eventRecWrapper = Wrappers.<EventRecord>query() var eventRecWrapper = Wrappers.<EventRecord>query()
.select("DISTINCT on (mall_uid,event_type) *") .select("DISTINCT on (mall_uid,event_type) *")
.in("mall_uid", mallUidList) .in("mall_uid", mallUidList)
.ge("create_time", LocalDateTime.of(LocalDate.now(), LocalTime.MIN)) .ge("create_time", LocalDateTime.of(LocalDate.now(), LocalTime.MIN));
.orderByDesc("mall_uid", "event_type", "create_time");
var eventRecordList = eventRecordService.list(eventRecWrapper); var eventRecordList = eventRecordService.list(eventRecWrapper);
var mallUid2RecMap = eventRecordList.stream().collect(Collectors.groupingBy(EventRecord::getMallUid)); var mallUid2RecMap = eventRecordList.stream().collect(Collectors.groupingBy(EventRecord::getMallUid));
...@@ -152,8 +151,7 @@ public class MallServiceImpl extends MPJBaseServiceImpl<MallMapper, Mall> implem ...@@ -152,8 +151,7 @@ public class MallServiceImpl extends MPJBaseServiceImpl<MallMapper, Mall> implem
var eventRecWrapper = Wrappers.<EventRecord>query() var eventRecWrapper = Wrappers.<EventRecord>query()
.select("DISTINCT on (mall_uid,event_type) *") .select("DISTINCT on (mall_uid,event_type) *")
.in("mall_uid", tmpMallUidList) .in("mall_uid", tmpMallUidList)
.ge("create_time", LocalDateTime.of(LocalDate.now(), LocalTime.MIN)) .ge("create_time", LocalDateTime.of(LocalDate.now(), LocalTime.MIN));
.orderByDesc("mall_uid", "event_type", "create_time");
var eventRecordList = eventRecordService.list(eventRecWrapper); var eventRecordList = eventRecordService.list(eventRecWrapper);
var mallUid2RecMap = eventRecordList.stream().collect(Collectors.groupingBy(EventRecord::getMallUid)); var mallUid2RecMap = eventRecordList.stream().collect(Collectors.groupingBy(EventRecord::getMallUid));
...@@ -179,14 +177,15 @@ public class MallServiceImpl extends MPJBaseServiceImpl<MallMapper, Mall> implem ...@@ -179,14 +177,15 @@ public class MallServiceImpl extends MPJBaseServiceImpl<MallMapper, Mall> implem
@Override @Override
public Page<MallVO> listErrorAttention(MallDTO dto) { public Page<MallVO> listErrorAttention(MallDTO dto) {
var eventRecWrapper = Wrappers.<EventRecord>query() var eventRecWrapper = new MPJLambdaWrapper<>(EventRecord.class)
.select("DISTINCT on (mall_uid,event_type) *") .selectAll()
.ge("create_time", LocalDateTime.of(LocalDate.now(), LocalTime.MIN)) .from(from -> from.select("DISTINCT on (mall_uid,event_type) *")
.eq("agent_type", dto.getAgentType()) .ge(EventRecord::getCreateTime, LocalDateTime.of(LocalDate.now(), LocalTime.MIN))
.eq("status", 0) .eq(EventRecord::getAgentType, dto.getAgentType())
.in(CollUtil.isNotEmpty(dto.getEventUidList()), "event_uid", dto.getEventUidList()) .in(CollUtil.isNotEmpty(dto.getEventUidList()), EventRecord::getEventUid, dto.getEventUidList())
.orderByDesc("mall_uid", "event_type", "create_time"); .orderByAsc(EventRecord::getMallUid))
var eventRecordList = eventRecordService.list(eventRecWrapper); .eq(EventRecord::getStatus, 0);
var eventRecordList = eventRecordService.selectJoinList(EventRecord.class, eventRecWrapper);
var mallUidList = eventRecordList.stream().map(EventRecord::getMallUid).toList(); var mallUidList = eventRecordList.stream().map(EventRecord::getMallUid).toList();
if (CollUtil.isEmpty(mallUidList)) { if (CollUtil.isEmpty(mallUidList)) {
return new Page<>(); return new Page<>();
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!