|
@@ -82,18 +82,14 @@ public class RiskOtherController extends BaseController {
|
|
|
map.put("title", config.getViewName());
|
|
|
List<Map<String, Object>> dataList = new ArrayList<>();
|
|
|
for (BizModelDetail md : mdList) {
|
|
|
- Map<String, Object> dataMap = new HashMap<>(16);
|
|
|
- dataMap.put("objName", md.getBizObj().getObjName());
|
|
|
- if ("2".equals(config.getRankingBased())) {
|
|
|
- dataMap.put("alarms", new Random().nextInt(50));
|
|
|
- }
|
|
|
BizObjMetrics bom = new BizObjMetrics();
|
|
|
bom.setObjId(md.getObjId());
|
|
|
bom.setMetricsId(config.getMetricsId());
|
|
|
List<BizObjMetrics> oms = omService.selectBizObjMetricsList(bom);
|
|
|
- if (oms.size() > 0) {
|
|
|
- BizObjMetrics om = oms.get(0);
|
|
|
+ for (BizObjMetrics om : oms) {
|
|
|
+ Map<String, Object> dataMap = new HashMap<>(16);
|
|
|
dataMap.put("id", om.getObjMetricsId());
|
|
|
+ dataMap.put("objName", md.getBizObj().getObjName() + "/" + om.getMetricsName());
|
|
|
dataMap.put("value", om.getDValue().floatValue());
|
|
|
if ("2".equals(config.getRankingBased())) {
|
|
|
String sql = "SELECT COUNT(*) num,sum(TIMESTAMPDIFF(MINUTE, alarm_time, ifnull(end_time,SYSDATE()))) times FROM alarm_record WHERE alarm_time BETWEEN ? AND ? and obj_metrics_id=?";
|
|
@@ -106,6 +102,10 @@ public class RiskOtherController extends BaseController {
|
|
|
}
|
|
|
dataList.add(dataMap);
|
|
|
}
|
|
|
+// if (oms.size() > 0) {
|
|
|
+//
|
|
|
+// BizObjMetrics om = oms.get(0);
|
|
|
+// }
|
|
|
}
|
|
|
if ("2".equals(config.getRankingBased())) {
|
|
|
dataList = dataList.stream().sorted(
|
|
@@ -156,16 +156,14 @@ public class RiskOtherController extends BaseController {
|
|
|
public AjaxResult network(@PathVariable("modelId") Long modelId, @PathVariable("metricsId") Long metricsId) {
|
|
|
List<Map<String, Object>> result = new ArrayList<>();
|
|
|
modelDetailService.selectBizModelDetailList4ModelId(modelId).forEach(md -> {
|
|
|
- Map<String, Object> objectMap = new HashMap<>(16);
|
|
|
- objectMap.put("name", md.getBizObj().getObjName());
|
|
|
BizObjMetrics bom = new BizObjMetrics();
|
|
|
bom.setObjId(md.getObjId());
|
|
|
bom.setMetricsId(metricsId);
|
|
|
List<BizObjMetrics> oms = omService.selectBizObjMetricsList(bom);
|
|
|
- if (oms.size() > 0) {
|
|
|
- BizObjMetrics om = oms.get(0);
|
|
|
+ for (BizObjMetrics om : oms) {
|
|
|
List<Map<String, Object>> trendList = new ArrayList<>();
|
|
|
-
|
|
|
+ Map<String, Object> objectMap = new HashMap<>(16);
|
|
|
+ objectMap.put("name", md.getBizObj().getObjName() + "/" + om.getMetricsName());
|
|
|
LocalDateTime endTime = LocalDateTime.now();
|
|
|
LocalDateTime beginTime = endTime.minusDays(7);
|
|
|
Map<String, Object> params = new HashMap<>(16);
|