Kaynağa Gözat

Merge branch 'v2.1.1' of http://39.106.8.246:3003/apm/energy-eq-run-diagnose into v2.1.1

lixing 3 yıl önce
ebeveyn
işleme
1f7161be6d

+ 1 - 1
src/main/java/com/persagy/apm/diagnose/indicatorrecord/service/impl/MonitorIndicatorRecordServiceImpl.java

@@ -103,7 +103,7 @@ public class MonitorIndicatorRecordServiceImpl implements IMonitorIndicatorRecor
         query.setMonitorIndicatorId(queryMonitorIndicatorRecordDTO.getMonitorIndicatorId());
         query.setProject(queryMonitorIndicatorRecordDTO.getProjectId());
         query.setObjId(queryMonitorIndicatorRecordDTO.getObjId());
-        query.setSpecialOperation("dataTime", SpecialOperator.$gte, queryMonitorIndicatorRecordDTO.getTimeFrom());
+        query.setSpecialOperation("dataTime", SpecialOperator.$gt, queryMonitorIndicatorRecordDTO.getTimeFrom());
         query.setSpecialOperation("dataTime", SpecialOperator.$lte, queryMonitorIndicatorRecordDTO.getTimeTo());
         return coredao.query(query);
     }

+ 1 - 1
src/main/java/com/persagy/apm/diagnose/maintenance/service/impl/ProjectDataRecordServiceImpl.java

@@ -575,7 +575,7 @@ public class ProjectDataRecordServiceImpl implements IProjectDataRecordService {
         queryMonitorIndicatorRecordDTO.setProjectId(projectId);
         queryMonitorIndicatorRecordDTO.setObjId(objId);
         queryMonitorIndicatorRecordDTO.setMonitorIndicatorId(indicatorId);
-        queryMonitorIndicatorRecordDTO.setTimeFrom(checkStartDate); // >=
+        queryMonitorIndicatorRecordDTO.setTimeFrom(checkStartDate); // >
         queryMonitorIndicatorRecordDTO.setTimeTo(alarmDate);  // <=
         List<MonitorIndicatorRecord> recordList = monitorIndicatorRecordService.queryMonitorIndicatorRecordList(queryMonitorIndicatorRecordDTO);
         if (!CollectionUtils.isEmpty(recordList) && recordList.size() > 0) {