Commit 1fd5e42e authored by zhangsen's avatar zhangsen

分析需求 API开发,bug修改

parent 4cc9b2d9
...@@ -737,8 +737,8 @@ public class BigScreenAnalyseController extends BaseController { ...@@ -737,8 +737,8 @@ public class BigScreenAnalyseController extends BaseController {
FullViewRecallInfoDTO allMapDto = new FullViewRecallInfoDTO(); FullViewRecallInfoDTO allMapDto = new FullViewRecallInfoDTO();
allMapDto.setKey("0"); allMapDto.setKey("0");
allMapDto.setName("全域设备健康状态指数"); allMapDto.setName("全域设备健康状态指数");
allMapDto.setLoc(null); allMapDto.setLoc("");
allMapDto.setScoreRange(null); allMapDto.setScoreRange("");
allMapDto.setStatus(idxBizFanHealthLevel.getHealthLevel()); allMapDto.setStatus(idxBizFanHealthLevel.getHealthLevel());
allMapDto.setScore(healthScoreInfo); allMapDto.setScore(healthScoreInfo);
allMapDto.setIsRoot(true); allMapDto.setIsRoot(true);
...@@ -761,7 +761,7 @@ public class BigScreenAnalyseController extends BaseController { ...@@ -761,7 +761,7 @@ public class BigScreenAnalyseController extends BaseController {
FullViewRecallInfoDTO areaMapDto = new FullViewRecallInfoDTO(); FullViewRecallInfoDTO areaMapDto = new FullViewRecallInfoDTO();
areaMapDto.setKey("0-" + areaInt); areaMapDto.setKey("0-" + areaInt);
areaMapDto.setName(areaMap.getKey()); areaMapDto.setName(areaMap.getKey());
areaMapDto.setLoc(null); areaMapDto.setLoc("");
areaMapDto.setStatus(areaIdxBizFanHealthLevel.getHealthLevel()); areaMapDto.setStatus(areaIdxBizFanHealthLevel.getHealthLevel());
areaMapDto.setScore(areaHealthScoreInfo); areaMapDto.setScore(areaHealthScoreInfo);
HashMap<String, String> areaMapFromTo = new HashMap<>(); HashMap<String, String> areaMapFromTo = new HashMap<>();
...@@ -787,9 +787,9 @@ public class BigScreenAnalyseController extends BaseController { ...@@ -787,9 +787,9 @@ public class BigScreenAnalyseController extends BaseController {
FullViewRecallInfoDTO stationDto = new FullViewRecallInfoDTO(); FullViewRecallInfoDTO stationDto = new FullViewRecallInfoDTO();
stationDto.setKey(areaMapDto.getKey() + "-" + stationInt); stationDto.setKey(areaMapDto.getKey() + "-" + stationInt);
stationDto.setName(stationMap.getKey()); stationDto.setName(stationMap.getKey());
stationDto.setLoc(null); stationDto.setLoc("");
stationDto.setStatus(null); stationDto.setStatus("");
stationDto.setScore(stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0)); stationDto.setScore(stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0));
LambdaQueryWrapper<IdxBizFanHealthLevel> stationQuery = new LambdaQueryWrapper<>(); LambdaQueryWrapper<IdxBizFanHealthLevel> stationQuery = new LambdaQueryWrapper<>();
stationQuery.like(IdxBizFanHealthLevel::getStatus, stationMap.getKey()); stationQuery.like(IdxBizFanHealthLevel::getStatus, stationMap.getKey());
...@@ -835,8 +835,8 @@ public class BigScreenAnalyseController extends BaseController { ...@@ -835,8 +835,8 @@ public class BigScreenAnalyseController extends BaseController {
FullViewRecallInfoDTO equipmentMapDto = new FullViewRecallInfoDTO(); FullViewRecallInfoDTO equipmentMapDto = new FullViewRecallInfoDTO();
equipmentMapDto.setKey(stationDto.getKey() + "-" + equipmentInt); equipmentMapDto.setKey(stationDto.getKey() + "-" + equipmentInt);
equipmentMapDto.setName(equipmentMap.getKey()); equipmentMapDto.setName(equipmentMap.getKey());
equipmentMapDto.setLoc(null); equipmentMapDto.setLoc("");
equipmentMapDto.setScoreRange(null); equipmentMapDto.setScoreRange("");
IdxBizFanHealthLevel levelInfo = getHealthLevelByScore(healthLevelInfoList, stationMap.getKey(), "设备", equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0)); IdxBizFanHealthLevel levelInfo = getHealthLevelByScore(healthLevelInfoList, stationMap.getKey(), "设备", equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0));
equipmentMapDto.setStatus(levelInfo.getHealthLevel()); equipmentMapDto.setStatus(levelInfo.getHealthLevel());
...@@ -851,8 +851,8 @@ public class BigScreenAnalyseController extends BaseController { ...@@ -851,8 +851,8 @@ public class BigScreenAnalyseController extends BaseController {
FullViewRecallInfoDTO subSystemMapDto = new FullViewRecallInfoDTO(); FullViewRecallInfoDTO subSystemMapDto = new FullViewRecallInfoDTO();
subSystemMapDto.setKey(equipmentMapDto.getKey() + "-" + subSystemInt); subSystemMapDto.setKey(equipmentMapDto.getKey() + "-" + subSystemInt);
subSystemMapDto.setName(subSystemMap.getKey()); subSystemMapDto.setName(subSystemMap.getKey());
subSystemMapDto.setLoc(null); subSystemMapDto.setLoc("");
subSystemMapDto.setScoreRange(null); subSystemMapDto.setScoreRange("");
// subSystemMapDto.setStatus(null); // subSystemMapDto.setStatus(null);
IdxBizFanHealthLevel levelInfoZxt = getHealthLevelByScore(healthLevelInfoList, stationMap.getKey(), "子系统", subSystemIndexInfoMap.getOrDefault(subSystemMap.getKey(), 100.0)); IdxBizFanHealthLevel levelInfoZxt = getHealthLevelByScore(healthLevelInfoList, stationMap.getKey(), "子系统", subSystemIndexInfoMap.getOrDefault(subSystemMap.getKey(), 100.0));
...@@ -872,13 +872,12 @@ public class BigScreenAnalyseController extends BaseController { ...@@ -872,13 +872,12 @@ public class BigScreenAnalyseController extends BaseController {
FullViewRecallDataDTO fullViewRecallDataDTO = pointNameMap.getValue().get(0); FullViewRecallDataDTO fullViewRecallDataDTO = pointNameMap.getValue().get(0);
pointNameMapDto.setLoc(null); pointNameMapDto.setLoc("");
pointNameMapDto.setScoreRange(null); pointNameMapDto.setScoreRange("");
IdxBizFanHealthLevel levelInfoBL = getHealthLevelByScore(healthLevelInfoList, stationMap.getKey(), "测点", pointNameIndexInfoMap.getOrDefault(fullViewRecallDataDTO.getStation() + "_" + fullViewRecallDataDTO.getIndexAddress(), 100.0)); IdxBizFanHealthLevel levelInfoBL = getHealthLevelByScore(healthLevelInfoList, stationMap.getKey(), "测点", pointNameIndexInfoMap.getOrDefault(fullViewRecallDataDTO.getStation() + "_" + fullViewRecallDataDTO.getIndexAddress(), 100.0));
pointNameMapDto.setStatus(levelInfoBL.getHealthLevel()); pointNameMapDto.setStatus(levelInfoBL.getHealthLevel());
pointNameMapDto.setScore(pointNameIndexInfoMap.getOrDefault(fullViewRecallDataDTO.getStation() + "_" + fullViewRecallDataDTO.getIndexAddress(), 100.0)); pointNameMapDto.setScore(pointNameIndexInfoMap.getOrDefault(fullViewRecallDataDTO.getStation() + "_" + fullViewRecallDataDTO.getIndexAddress(), 100.0));
fullViewRecallList.add(pointNameMapDto); fullViewRecallList.add(pointNameMapDto);
HashMap<String, String> pointNameMapFromTo = new HashMap<>(); HashMap<String, String> pointNameMapFromTo = new HashMap<>();
......
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