Commit 963ffa17 authored by caotao's avatar caotao

预警回溯时间坐标显示错误问题处理

parent 41e21754
...@@ -211,10 +211,10 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService { ...@@ -211,10 +211,10 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
for (int i = idxBizFanHealthIndexListSize - 1; i >= 0; i--) { for (int i = idxBizFanHealthIndexListSize - 1; i >= 0; i--) {
HashMap<String, String> alarmAbnormalityItem = new HashMap<>(); HashMap<String, String> alarmAbnormalityItem = new HashMap<>();
FanHealthIndex idxBizFanHealthIndex = idxBizFanHealthIndexList.get(i); FanHealthIndex idxBizFanHealthIndex = idxBizFanHealthIndexList.get(i);
xDatas.add(idxBizFanHealthIndex.getAnalysisTime()); xDatas.add(idxBizFanHealthIndex.getRecDate());
yDatas.add(Double.valueOf(keepOneKeepDecimalPlace(idxBizFanHealthIndex.getHealthIndex()))); yDatas.add(Double.valueOf(keepOneKeepDecimalPlace(idxBizFanHealthIndex.getHealthIndex())));
alarmAbnormalityItem.put("sort", String.valueOf(i)); alarmAbnormalityItem.put("sort", String.valueOf(i));
alarmAbnormalityItem.put("time", idxBizFanHealthIndex.getAnalysisTime()); alarmAbnormalityItem.put("time", idxBizFanHealthIndex.getRecDate());
alarmAbnormalityItem.put("abnormal", keepOneKeepDecimalPlace(idxBizFanHealthIndex.getAnomaly())); alarmAbnormalityItem.put("abnormal", keepOneKeepDecimalPlace(idxBizFanHealthIndex.getAnomaly()));
alarmAbnormalityItem.put("healthValue", keepOneKeepDecimalPlace(idxBizFanHealthIndex.getHealthIndex())); alarmAbnormalityItem.put("healthValue", keepOneKeepDecimalPlace(idxBizFanHealthIndex.getHealthIndex()));
alarmAbnormalityList.add(alarmAbnormalityItem); alarmAbnormalityList.add(alarmAbnormalityItem);
...@@ -264,32 +264,32 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService { ...@@ -264,32 +264,32 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
for (int i = idxBizPvHealthIndexList.size() - 1; i >= 0; i--) { for (int i = idxBizPvHealthIndexList.size() - 1; i >= 0; i--) {
HashMap<String, String> alarmAbnormalityItem = new HashMap<>(); HashMap<String, String> alarmAbnormalityItem = new HashMap<>();
PvHealthIndex idxBizPvHealthIndex = idxBizPvHealthIndexList.get(i); PvHealthIndex idxBizPvHealthIndex = idxBizPvHealthIndexList.get(i);
xDatas.add(idxBizPvHealthIndex.getAnalysisTime()); xDatas.add(idxBizPvHealthIndex.getRecDate());
yDatas.add(Double.valueOf(keepOneKeepDecimalPlace(idxBizPvHealthIndex.getHealthIndex()))); yDatas.add(Double.valueOf(keepOneKeepDecimalPlace(idxBizPvHealthIndex.getHealthIndex())));
alarmAbnormalityItem.put("sort", String.valueOf(i)); alarmAbnormalityItem.put("sort", String.valueOf(i));
alarmAbnormalityItem.put("time", idxBizPvHealthIndex.getAnalysisTime()); alarmAbnormalityItem.put("time", idxBizPvHealthIndex.getRecDate());
alarmAbnormalityItem.put("abnormal", keepOneKeepDecimalPlace(idxBizPvHealthIndex.getAnomaly())); alarmAbnormalityItem.put("abnormal", keepOneKeepDecimalPlace(idxBizPvHealthIndex.getAnomaly()));
alarmAbnormalityItem.put("healthValue", keepOneKeepDecimalPlace(idxBizPvHealthIndex.getHealthIndex())); alarmAbnormalityItem.put("healthValue", keepOneKeepDecimalPlace(idxBizPvHealthIndex.getHealthIndex()));
if (idxBizPvHealthIndexListSize >= 3) { if (idxBizPvHealthIndexListSize >= 3) {
if (i == 0) { if (i == 0) {
endTime = handlerDateStr(idxBizPvHealthIndex.getAnalysisTime(), -8, 5); endTime = handlerDateStr(idxBizPvHealthIndex.getRecDate(), -8, 5);
} }
if (i == 2) { if (i == 2) {
startTime = handlerDateStr(idxBizPvHealthIndex.getAnalysisTime(), -8, -5); startTime = handlerDateStr(idxBizPvHealthIndex.getRecDate(), -8, -5);
} }
} }
if (idxBizPvHealthIndexListSize == 2) { if (idxBizPvHealthIndexListSize == 2) {
if (i == 0) { if (i == 0) {
endTime = handlerDateStr(idxBizPvHealthIndex.getAnalysisTime(), -8, 5); endTime = handlerDateStr(idxBizPvHealthIndex.getRecDate(), -8, 5);
} }
if (i == 1) { if (i == 1) {
startTime = handlerDateStr(idxBizPvHealthIndex.getAnalysisTime(), -8, -5); startTime = handlerDateStr(idxBizPvHealthIndex.getRecDate(), -8, -5);
} }
} }
if (idxBizPvHealthIndexListSize == 1) { if (idxBizPvHealthIndexListSize == 1) {
if (i == 0) { if (i == 0) {
endTime = handlerDateStr(idxBizPvHealthIndex.getAnalysisTime(), -8, 5); endTime = handlerDateStr(idxBizPvHealthIndex.getRecDate(), -8, 5);
startTime = handlerDateStr(idxBizPvHealthIndex.getAnalysisTime(), -8, -5); startTime = handlerDateStr(idxBizPvHealthIndex.getRecDate(), -8, -5);
} }
} }
alarmAbnormalityList.add(alarmAbnormalityItem); alarmAbnormalityList.add(alarmAbnormalityItem);
......
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