Browse Source

修改监测指标查询条件

lixing 3 years ago
parent
commit
05b99448a8

+ 2 - 2
src/main/java/com/persagy/apm/alarmservice/dependency/eqdiagnose/model/QueryMonitorIndicatorRecordDTO.java

@@ -24,10 +24,10 @@ public class QueryMonitorIndicatorRecordDTO extends FeignBaseDTO {
     private String monitorIndicatorId;
 
     @ApiModelProperty(value = "开始时间", required = true)
-    private Long timeFrom;
+    private Date timeFrom;
 
     @ApiModelProperty(value = "结束时间", required = true)
-    private Long timeTo;
+    private Date timeTo;
 
     public QueryMonitorIndicatorRecordDTO() {
         super.setDefaultValue();

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

@@ -464,8 +464,8 @@ public class MonitorIndicatorServiceImpl extends ServiceImpl<MonitorIndicatorMap
             queryMonitorIndicatorRecordDTO.setObjId(objId);
             queryMonitorIndicatorRecordDTO.setProjectId(PoemsContext.getContext().getProjectId());
             queryMonitorIndicatorRecordDTO.setMonitorIndicatorId(indicatorId);
-            queryMonitorIndicatorRecordDTO.setTimeFrom(startTime == null ? null : startTime.getTime());
-            queryMonitorIndicatorRecordDTO.setTimeTo(endTime == null ? null : endTime.getTime());
+            queryMonitorIndicatorRecordDTO.setTimeFrom(startTime);
+            queryMonitorIndicatorRecordDTO.setTimeTo(endTime);
             Map<Date, String> indicatorRecordMap = eqDiagnoseService.
                     queryMonitorIndicatorRecord(queryMonitorIndicatorRecordDTO);
             monitorValuesMap.put(indicatorId, indicatorRecordMap);