Skip to content

A
amos-boot-biz
Commit 5dcd7d47 authored by zhangsen's avatar zhangsen
Browse files
Options

分析需求 API开发，bug修改

parent 1fd5e42e
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/BigScreenAnalyseController.java
View file @ 5dcd7d47
......@@ -737,7 +737,7 @@ public class BigScreenAnalyseController extends BaseController {
FullViewRecallInfoDTO allMapDto = new FullViewRecallInfoDTO();
allMapDto.setKey("0");
allMapDto.setName("全域设备健康状态指数");
allMapDto.setLoc("");
allMapDto.setLoc("0 2000");
allMapDto.setScoreRange("");
allMapDto.setStatus(idxBizFanHealthLevel.getHealthLevel());
allMapDto.setScore(healthScoreInfo);
......@@ -761,7 +761,7 @@ public class BigScreenAnalyseController extends BaseController {
FullViewRecallInfoDTO areaMapDto = new FullViewRecallInfoDTO();
areaMapDto.setKey("0-" + areaInt);
areaMapDto.setName(areaMap.getKey());
areaMapDto.setLoc("");
areaMapDto.setLoc(350 + " " + (1410 + areaInt * 20));
areaMapDto.setStatus(areaIdxBizFanHealthLevel.getHealthLevel());
areaMapDto.setScore(areaHealthScoreInfo);
HashMap<String, String> areaMapFromTo = new HashMap<>();
......@@ -787,7 +787,7 @@ public class BigScreenAnalyseController extends BaseController {
FullViewRecallInfoDTO stationDto = new FullViewRecallInfoDTO();
stationDto.setKey(areaMapDto.getKey() + "-" + stationInt);
stationDto.setName(stationMap.getKey());
stationDto.setLoc("");
stationDto.setLoc(680 + " " + (1000 + 900 * (stationInt - 1)));
stationDto.setStatus("");
stationDto.setScore(stationHealthIndexMap.getOrDefault(stationMap.getKey(), 100.0));
......@@ -835,7 +835,7 @@ public class BigScreenAnalyseController extends BaseController {
FullViewRecallInfoDTO equipmentMapDto = new FullViewRecallInfoDTO();
equipmentMapDto.setKey(stationDto.getKey() + "-" + equipmentInt);
equipmentMapDto.setName(equipmentMap.getKey());
equipmentMapDto.setLoc("");
equipmentMapDto.setLoc(1000 + " " + (400 + 200 * (equipmentInt - 1)));
equipmentMapDto.setScoreRange("");
IdxBizFanHealthLevel levelInfo = getHealthLevelByScore(healthLevelInfoList, stationMap.getKey(), "设备", equipmentIndexInfoMap.getOrDefault(equipmentMap.getKey(), 100.0));
......@@ -851,7 +851,7 @@ public class BigScreenAnalyseController extends BaseController {
FullViewRecallInfoDTO subSystemMapDto = new FullViewRecallInfoDTO();
subSystemMapDto.setKey(equipmentMapDto.getKey() + "-" + subSystemInt);
subSystemMapDto.setName(subSystemMap.getKey());
subSystemMapDto.setLoc("");
subSystemMapDto.setLoc(2000 + " " + (300 + 90 * (subSystemInt - 1)));
subSystemMapDto.setScoreRange("");
// subSystemMapDto.setStatus(null);
......@@ -872,7 +872,7 @@ public class BigScreenAnalyseController extends BaseController {
FullViewRecallDataDTO fullViewRecallDataDTO = pointNameMap.getValue().get(0);
pointNameMapDto.setLoc("");
pointNameMapDto.setLoc(3800 + " " + (250 + 80 * (pointNameInt - 1)));
pointNameMapDto.setScoreRange("");
IdxBizFanHealthLevel levelInfoBL = getHealthLevelByScore(healthLevelInfoList, stationMap.getKey(), "测点", pointNameIndexInfoMap.getOrDefault(fullViewRecallDataDTO.getStation() + "_" + fullViewRecallDataDTO.getIndexAddress(), 100.0));
......
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/FullViewRecallInfoDTO.java
View file @ 5dcd7d47
......@@ -8,8 +8,8 @@ public class FullViewRecallInfoDTO {
private String loc;
private String name;
private Double score;
private String scoreRange;
private String status;
private String scoreRange = "";
private String status = "";
private Boolean isRoot = false;
private String category;
private String category = "";
}
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