Browse Source

监测指标记录vo类修改

lixing 3 years ago
parent
commit
9e6226ee62

+ 4 - 17
src/main/java/com/persagy/apm/alarmservice/dependency/eqdiagnose/model/MonitorIndicatorRecordListItemVO.java

@@ -15,8 +15,8 @@ import java.util.Date;
 @ApiModel(value = "监测指标历史记录列表返回结果参数")
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class MonitorIndicatorRecordListItemVO {
-    @ApiModelProperty("主键")
-    private String id;
+    @ApiModelProperty("项目id")
+    private String project;
     
     @ApiModelProperty("对象id")
     private String objId;
@@ -25,21 +25,8 @@ public class MonitorIndicatorRecordListItemVO {
     private String monitorIndicatorId;
     
     @ApiModelProperty("时间")
-    private Date date;
+    private Date dataTime;
     
     @ApiModelProperty("值")
-    private String value;
-    
-    @ApiModelProperty("创建人")
-    private String creator;
-    
-    @ApiModelProperty("创建时间")
-    private Date creationTime;
-    
-    @ApiModelProperty("修改人")
-    private String modifier;
-    
-    @ApiModelProperty("修改时间")
-    private Date modifiedTime;
-    
+    private String dataValue;
 }

+ 3 - 3
src/main/java/com/persagy/apm/alarmservice/dependency/eqdiagnose/service/EqDiagnoseServiceImpl.java

@@ -52,10 +52,10 @@ public class EqDiagnoseServiceImpl {
         if (CollectionUtils.isEmpty(records)) {
             return new HashMap<>(0);
         }
-        return records.stream().filter(record -> record.getDate() != null).collect(
+        return records.stream().filter(record -> record.getDataTime() != null).collect(
                 Collectors.toMap(
-                        MonitorIndicatorRecordListItemVO::getDate,
-                        MonitorIndicatorRecordListItemVO::getValue
+                        MonitorIndicatorRecordListItemVO::getDataTime,
+                        MonitorIndicatorRecordListItemVO::getDataValue
                 )
         );
 

+ 10 - 7
src/main/java/com/persagy/apm/alarmservice/group/monitorindicator/service/impl/MonitorIndicatorServiceImpl.java

@@ -311,14 +311,17 @@ public class MonitorIndicatorServiceImpl extends ServiceImpl<MonitorIndicatorMap
             String formula = monitorIndicatorFormulaItem.getFormula();
             List<GraphItemVO> referenceValueList = new ArrayList<>();
             Map<Date, String> indicatorRecordMap = monitorValuesMap.get(monitorIndicator.getId());
-            for (Date date : indicatorRecordMap.keySet()) {
-                HashMap<String, Object> paramMap = getParamMap(monitorValuesMap, date);
-                Double formulaResult = calculateFormula(formula, paramMap);
-                GraphItemVO graphItemVO = new GraphItemVO(
-                        String.valueOf(date.getTime()), formulaResult,
-                        AttrValueTypeEnum.number_2, monitorIndicator.getUnit());
-                referenceValueList.add(graphItemVO);
+            if (!CollectionUtils.isEmpty(indicatorRecordMap)) {
+                for (Date date : indicatorRecordMap.keySet()) {
+                    HashMap<String, Object> paramMap = getParamMap(monitorValuesMap, date);
+                    Double formulaResult = calculateFormula(formula, paramMap);
+                    GraphItemVO graphItemVO = new GraphItemVO(
+                            String.valueOf(date.getTime()), formulaResult,
+                            AttrValueTypeEnum.number_2, monitorIndicator.getUnit());
+                    referenceValueList.add(graphItemVO);
+                }
             }
+
             monitorIndicatorReferenceItem.setValue(referenceValueList);
             reference.add(monitorIndicatorReferenceItem);
         }