miaolijing hace 3 años
padre
commit
e42c616119

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

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

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

@@ -134,11 +134,8 @@ public class ProjectDataRecordServiceImpl implements IProjectDataRecordService {
                 // 获取不到锁,略过
                 return new AsyncResult<>("【监测维保数据推送线程】:项目:" + projectId + "被占用");
             }
-
-            getConfigItemSendTimeDTO("Pj1101060001","Eq11010600010b63c95c53e342c193d280357f491d9e_Eqdx002");
-
             long start = System.currentTimeMillis();
-//            sendProjectMaintenanceData(todayDate, projectId);
+            sendProjectMaintenanceData(todayDate, projectId);
             long end = System.currentTimeMillis();
             return new AsyncResult<>("【监测维保数据推送线程】推送项目维保数据用时:" + projectId + ";" + (end - start));
         } finally {
@@ -576,13 +573,14 @@ public class ProjectDataRecordServiceImpl implements IProjectDataRecordService {
      */
     public Date getStartAlarmDate(Date alarmDate, String projectId, String objId, String indicatorId, String operator, String tempFormula) throws Exception {
         // 再次确认检查该日报警  持续天数
+        Date checkEndDate =  DateUtils.addDays(alarmDate, 1);
         Date checkStartDate = DateUtils.addDays(alarmDate, -5);
         QueryMonitorIndicatorRecordDTO queryMonitorIndicatorRecordDTO = new QueryMonitorIndicatorRecordDTO();
         queryMonitorIndicatorRecordDTO.setProjectId(projectId);
         queryMonitorIndicatorRecordDTO.setObjId(objId);
         queryMonitorIndicatorRecordDTO.setMonitorIndicatorId(indicatorId);
-        queryMonitorIndicatorRecordDTO.setTimeFrom(checkStartDate); // >
-        queryMonitorIndicatorRecordDTO.setTimeTo(alarmDate);  // <=
+        queryMonitorIndicatorRecordDTO.setTimeFrom(checkStartDate); // >=
+        queryMonitorIndicatorRecordDTO.setTimeTo(checkEndDate);  // <
         List<MonitorIndicatorRecord> recordList = monitorIndicatorRecordService.queryMonitorIndicatorRecordList(queryMonitorIndicatorRecordDTO);
         if (!CollectionUtils.isEmpty(recordList) && recordList.size() > 0) {
             //倒序排
@@ -596,7 +594,6 @@ public class ProjectDataRecordServiceImpl implements IProjectDataRecordService {
                 checkDate = record.getDataTime();
             }
             //继续往前找报警开始日期
-            checkDate = com.persagy.apm.diagnose.utils.DateUtils.addDays(checkDate,-1);
             return getStartAlarmDate(checkDate, projectId, objId, indicatorId, operator, tempFormula);
         }
         return alarmDate;