Skip to content

A
amos-boot-biz
Commit 84868d78 authored by caotao's avatar caotao
Browse files
Options

健康等级划分-变量、风机子系统、风机设备、场站、片区、全域等x轴数据动态展示。

parent d1adc5e3
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizFanHealthIndexController.java
View file @ 84868d78
...@@ -779,7 +779,7 @@ public class IdxBizFanHealthIndexController extends BaseController { ...@@ -779,7 +779,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
}else { }else {
seriesData.add(obj.getAnomaly() > 7.5?7.5:dfSS.format(obj.getAnomaly())); seriesData.add(obj.getAnomaly() > 7.5?7.5:dfSS.format(obj.getAnomaly()));
} }
axisData.add(obj.getAnalysisTime()); axisData.add(obj.getRecDate());
} }
result.put("seriesData",seriesData); result.put("seriesData",seriesData);
result.put("axisData",axisData); result.put("axisData",axisData);
...@@ -800,9 +800,9 @@ public class IdxBizFanHealthIndexController extends BaseController { ...@@ -800,9 +800,9 @@ public class IdxBizFanHealthIndexController extends BaseController {
}else { }else {
seriesData.add(obj.getAnomaly() > 7.5 ? 7.5 : dfSS.format(obj.getAnomaly())); seriesData.add(obj.getAnomaly() > 7.5 ? 7.5 : dfSS.format(obj.getAnomaly()));
} }
Date dateTime = DateUtil.parseDateTime(obj.getAnalysisTime()); // Date dateTime = DateUtil.parseDateTime(obj.getAnalysisTime());
String format = DateUtil.format(dateTime, "yyyy-MM-dd HH:00"); // String format = DateUtil.format(dateTime, "yyyy-MM-dd HH:00");
axisData.add(format); axisData.add(obj.getRecDate());
} }
result.put("seriesData",seriesData); result.put("seriesData",seriesData);
result.put("axisData",axisData); result.put("axisData",axisData);
...@@ -824,9 +824,9 @@ public class IdxBizFanHealthIndexController extends BaseController { ...@@ -824,9 +824,9 @@ public class IdxBizFanHealthIndexController extends BaseController {
}else { }else {
seriesData.add(obj.getAnomaly() > 7.5 ? 7.5 : dfSS.format(obj.getAnomaly())); seriesData.add(obj.getAnomaly() > 7.5 ? 7.5 : dfSS.format(obj.getAnomaly()));
} }
Date dateTime = DateUtil.parseDateTime(obj.getAnalysisTime()); // Date dateTime = DateUtil.parseDateTime(obj.getAnalysisTime());
String format = DateUtil.format(dateTime, DatePattern.NORM_DATETIME_MINUTE_PATTERN); // String format = DateUtil.format(dateTime, DatePattern.NORM_DATETIME_MINUTE_PATTERN);
axisData.add(format); axisData.add(obj.getRecDate());
} }
result.put("seriesData",seriesData); result.put("seriesData",seriesData);
result.put("axisData",axisData); result.put("axisData",axisData);
......
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizPvHealthIndexController.java
View file @ 84868d78
...@@ -440,7 +440,7 @@ public class IdxBizPvHealthIndexController extends BaseController { ...@@ -440,7 +440,7 @@ public class IdxBizPvHealthIndexController extends BaseController {
}else { }else {
seriesData.add(obj.getAnomaly() > 7.5?7.5:dfSS.format(obj.getAnomaly())); seriesData.add(obj.getAnomaly() > 7.5?7.5:dfSS.format(obj.getAnomaly()));
} }
axisData.add(obj.getAnalysisTime()); axisData.add(obj.getRecDate());
} }
result.put("seriesData",seriesData); result.put("seriesData",seriesData);
result.put("axisData",axisData); result.put("axisData",axisData);
...@@ -461,9 +461,9 @@ public class IdxBizPvHealthIndexController extends BaseController { ...@@ -461,9 +461,9 @@ public class IdxBizPvHealthIndexController extends BaseController {
}else { }else {
seriesData.add(obj.getAnomaly() > 7.5?7.5:dfSS.format(obj.getAnomaly())); seriesData.add(obj.getAnomaly() > 7.5?7.5:dfSS.format(obj.getAnomaly()));
} }
Date dateTime = DateUtil.parseDateTime(obj.getAnalysisTime()); // Date dateTime = DateUtil.parseDateTime(obj.getAnalysisTime());
String format = DateUtil.format(dateTime, "yyyy-MM-dd HH:00"); // String format = DateUtil.format(dateTime, "yyyy-MM-dd HH:00");
axisData.add(format); axisData.add(obj.getRecDate());
} }
result.put("seriesData",seriesData); result.put("seriesData",seriesData);
result.put("axisData",axisData); result.put("axisData",axisData);
...@@ -488,9 +488,9 @@ public class IdxBizPvHealthIndexController extends BaseController { ...@@ -488,9 +488,9 @@ public class IdxBizPvHealthIndexController extends BaseController {
}else { }else {
seriesData.add(obj.getAnomaly() > 7.5?7.5:dfSS.format(obj.getAnomaly())); seriesData.add(obj.getAnomaly() > 7.5?7.5:dfSS.format(obj.getAnomaly()));
} }
Date dateTime = DateUtil.parseDateTime(obj.getAnalysisTime()); // Date dateTime = DateUtil.parseDateTime(obj.getAnalysisTime());
String format = DateUtil.format(dateTime, DatePattern.NORM_DATETIME_MINUTE_PATTERN); // String format = DateUtil.format(dateTime, DatePattern.NORM_DATETIME_MINUTE_PATTERN);
axisData.add(format); axisData.add(obj.getRecDate());
} }
result.put("seriesData",seriesData); result.put("seriesData",seriesData);
result.put("axisData",axisData); result.put("axisData",axisData);
......
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