Commit 06bbd582 authored by caotao's avatar caotao

分析模块需求变更

parent 401310f8
...@@ -608,6 +608,7 @@ public class TDBigScreenAnalyseController extends BaseController { ...@@ -608,6 +608,7 @@ public class TDBigScreenAnalyseController extends BaseController {
Double equipmentHealthScore = equipmentHealthIndexMap.getOrDefault(item.get("pointName"), 100.0); Double equipmentHealthScore = equipmentHealthIndexMap.getOrDefault(item.get("pointName"), 100.0);
if (100.0 == equipmentHealthScore) { if (100.0 == equipmentHealthScore) {
item.put("warningName", "安全"); item.put("warningName", "安全");
item.put("status", "安全");
} else { } else {
LambdaQueryWrapper<IdxBizFanHealthLevel> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<IdxBizFanHealthLevel> query = new LambdaQueryWrapper<>();
query.eq(IdxBizFanHealthLevel::getAnalysisObjType, "设备"); query.eq(IdxBizFanHealthLevel::getAnalysisObjType, "设备");
...@@ -617,12 +618,25 @@ public class TDBigScreenAnalyseController extends BaseController { ...@@ -617,12 +618,25 @@ public class TDBigScreenAnalyseController extends BaseController {
IdxBizFanHealthLevel idxBizFanHealthLevel = idxBizFanHealthLevelMapper.selectOne(query); IdxBizFanHealthLevel idxBizFanHealthLevel = idxBizFanHealthLevelMapper.selectOne(query);
if (ObjectUtils.isNotEmpty(idxBizFanHealthLevel)) { if (ObjectUtils.isNotEmpty(idxBizFanHealthLevel)) {
item.put("warningName", idxBizFanHealthLevel.getHealthLevel()); item.put("warningName", idxBizFanHealthLevel.getHealthLevel());
item.put("status", idxBizFanHealthLevel.getHealthLevel());
} else { } else {
item.put("warningName", "安全"); item.put("warningName", "安全");
item.put("status", "安全");
} }
} }
int sort = 4;
if ("注意".equals(item.get("warningName"))) {
sort = 3;
} else if ("警告".equals(item.get("warningName"))) {
sort = 2;
} else if ("危险".equals(item.get("warningName"))) {
sort = 1;
}
item.put("sort", sort);
item.put("healthIndex", equipmentHealthScore); item.put("healthIndex", equipmentHealthScore);
}); });
pointNameList.sort(Comparator.comparing(o -> o.get("sort").toString()));
Page<Map<String, Object>> mapPage = new Page<>(); Page<Map<String, Object>> mapPage = new Page<>();
mapPage.setSize(pointNameList.size()); mapPage.setSize(pointNameList.size());
mapPage.setTotal(pointNameList.size()); mapPage.setTotal(pointNameList.size());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment