|
|
@@ -202,10 +202,14 @@ public class AppEventServiceImpl implements AppEventService {
|
|
|
Integer pageNum = pageDomain.getPageNum();
|
|
|
Integer pageSize = pageDomain.getPageSize();
|
|
|
TableDataInfo collectList = remoteEventBaseService.getCollectList(pageNum, pageSize, appEventCollect.getUserId(), appEventCollect.getEventName(), appEventCollect.getReportTimeRange());
|
|
|
+ Map<String, Object> reportingSource = DictUtils.getDictCacheToMap("reporting_source");
|
|
|
+ Map<String, Object> sysIsurge = DictUtils.getDictCacheToMap("sys_isurge");
|
|
|
+
|
|
|
if(collectList.getCode() == 200){
|
|
|
List<Map<String,Object>> rows = (List<Map<String, Object>>) collectList.getRows();
|
|
|
rows.forEach(row -> {
|
|
|
- row.put("reportSource",DictUtils.getDictDataByValue("reporting_source",row.get("reportSource").toString()));
|
|
|
+ row.put("reportSource",MapUtils.getString(reportingSource, MapUtils.getString(row,"reportSource")));
|
|
|
+ row.put("isUrged",MapUtils.getString(sysIsurge, MapUtils.getString(row,"isUrged")));
|
|
|
});
|
|
|
return AjaxResult.success(rows);
|
|
|
}else{
|
