|
@@ -4,8 +4,6 @@ import com.alibaba.excel.util.CollectionUtils;
|
|
|
import com.google.gson.Gson;
|
|
|
import com.google.gson.JsonSyntaxException;
|
|
|
import com.persagy.apm.report.common.utils.DataUtils;
|
|
|
-import com.persagy.apm.report.userconfig.function.model.Function;
|
|
|
-import com.persagy.apm.report.userconfig.function.service.IFunctionService;
|
|
|
import com.persagy.apm.report.detail.enums.AttrValueTypeEnum;
|
|
|
import com.persagy.apm.report.detail.model.vo.AttrValueVO;
|
|
|
import com.persagy.apm.report.detail.model.vo.GroupVO;
|
|
@@ -19,6 +17,8 @@ import com.persagy.apm.report.outline.model.ReportOutline;
|
|
|
import com.persagy.apm.report.paragraphs.constants.ItemAttrConstants;
|
|
|
import com.persagy.apm.report.paragraphs.service.impl.ProjectParagraphBuilder;
|
|
|
import com.persagy.apm.report.paragraphs.utils.ParagraphUtils;
|
|
|
+import com.persagy.apm.report.userconfig.function.model.Function;
|
|
|
+import com.persagy.apm.report.userconfig.function.service.IFunctionService;
|
|
|
import org.mockito.internal.util.collections.Sets;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
@@ -73,26 +73,29 @@ public class ProjectEnvBuilder extends ProjectParagraphBuilder {
|
|
|
item -> ParagraphUtils.item2Map(item, attrCodeSet)).collect(Collectors.toList());
|
|
|
|
|
|
// 报警次数最多的指标
|
|
|
- List<Map<String, String>> alarmCountMap = itemMapList.stream().filter(
|
|
|
+ List<Map<String, Object>> alarmCountMap = itemMapList.stream().filter(
|
|
|
map -> map.get(ProjectEnvContentCodes.alarmCount.name()) != null).
|
|
|
- collect(Collectors.toList());
|
|
|
+ map(map -> ParagraphUtils.convertMapMemberType(
|
|
|
+ map, ProjectEnvContentCodes.alarmCount.name(), Integer.class)
|
|
|
+ ).collect(Collectors.toList());
|
|
|
if (!CollectionUtils.isEmpty(alarmCountMap)) {
|
|
|
Map<String, Integer> alarmCountSortMap = new HashMap<>();
|
|
|
alarmCountSortMap.put(ProjectEnvContentCodes.alarmCount.name(), -1);
|
|
|
DataUtils.sort(alarmCountMap, alarmCountSortMap);
|
|
|
- maxAlarmIndicator = alarmCountMap.get(0).get(ItemAttrConstants.NAME);
|
|
|
+ maxAlarmIndicator = (String) alarmCountMap.get(0).get(ItemAttrConstants.NAME);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
// 处理率最低的指标
|
|
|
- List<Map<String, String>> handleProportionMap = itemMapList.stream().filter(
|
|
|
+ List<Map<String, Object>> handleProportionMap = itemMapList.stream().filter(
|
|
|
map -> map.get(ProjectEnvContentCodes.handleProportion.name()) != null).
|
|
|
- collect(Collectors.toList());
|
|
|
+ map(map -> ParagraphUtils.convertMapMemberType(
|
|
|
+ map, ProjectEnvContentCodes.handleProportion.name(), Double.class)
|
|
|
+ ).collect(Collectors.toList());
|
|
|
if (!CollectionUtils.isEmpty(handleProportionMap)) {
|
|
|
Map<String, Integer> handleProportionSortMap = new HashMap<>();
|
|
|
handleProportionSortMap.put(ProjectEnvContentCodes.handleProportion.name(), 1);
|
|
|
DataUtils.sort(handleProportionMap, handleProportionSortMap);
|
|
|
- minHandleProportionIndicator = handleProportionMap.get(0).get(ItemAttrConstants.NAME);
|
|
|
+ minHandleProportionIndicator = (String) handleProportionMap.get(0).get(ItemAttrConstants.NAME);
|
|
|
}
|
|
|
}
|
|
|
|