瀏覽代碼

运行状态判断 修改为0/1

miaolijing 3 年之前
父節點
當前提交
3a8e504375

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

@@ -64,11 +64,11 @@ public class ProjectDataRecordServiceImpl implements IProjectDataRecordService {
     @Value(value = "${energy.eq.run.system.code}")
     private String systemCode;
 
-    //测试环境  运行状态 上下限值
-    @Value(value = "${energy.eq.run.state.up.limit}")
-    private Double runStateUpLimit;
-    @Value(value = "${energy.eq.run.state.down.limit}")
-    private Double runStateDownLimit;
+//    //测试环境  运行状态 上下限值
+//    @Value(value = "${energy.eq.run.state.up.limit}")
+//    private Double runStateUpLimit;
+//    @Value(value = "${energy.eq.run.state.down.limit}")
+//    private Double runStateDownLimit;
 
     //报警分类
     public final static String alarmSplit = "_";
@@ -814,13 +814,13 @@ public class ProjectDataRecordServiceImpl implements IProjectDataRecordService {
                         String time = dto.getTime();
                         Date getDate = com.persagy.apm.diagnose.utils.DateUtils.str2Date(time, com.persagy.apm.diagnose.utils.DateUtils.SDFSECOND);
                         if (getDate.compareTo(twoHourDate) > 0) {
-                            //                            if (Objects.equals(EnumRunStatusType.Open.getCode(), dto.getData())) {
-                            //                                dateList.add(getDate);
-                            //                            }
-                            //TODO 测试 运行状态
-                            if (dto.getData() > runStateDownLimit && dto.getData() < runStateUpLimit) {
+                            if (Objects.equals(EnumRunStatusType.Open.getCode(), dto.getData())) {
                                 dateList.add(getDate);
                             }
+                            //测试 运行状态
+//                            if (dto.getData() > runStateDownLimit && dto.getData() < runStateUpLimit) {
+//                                dateList.add(getDate);
+//                            }
                         }
                     }
                     dateRunDataMap.put(dayDate, dateList);
@@ -892,12 +892,13 @@ public class ProjectDataRecordServiceImpl implements IProjectDataRecordService {
                             continue;
                         }
                         Date getDate = com.persagy.apm.diagnose.utils.DateUtils.str2Date(dto.getTime(), com.persagy.apm.diagnose.utils.DateUtils.SDFSECOND);
-                        //                        if (Objects.equals(EnumRunStatusType.Open.getCode(), dto.getData())) {
-                        //                            dateList.add(getDate);
-                        //                        }
-                        if (dto.getData() > runStateDownLimit && dto.getData() < runStateUpLimit) {
+                        if (Objects.equals(EnumRunStatusType.Open.getCode(), dto.getData())) {
                             dateList.add(getDate);
                         }
+                        //测试 运行状态
+//                        if (dto.getData() > runStateDownLimit && dto.getData() < runStateUpLimit) {
+//                            dateList.add(getDate);
+//                        }
                     }
                     Set<Date> dateSet = new HashSet<>(dateList);
                     dateList.clear();
@@ -923,13 +924,13 @@ public class ProjectDataRecordServiceImpl implements IProjectDataRecordService {
                     if (null == dto.getData()) {
                         continue;
                     }
-                    //TODO 测试 运行状态
-                    if (dto.getData() < runStateDownLimit || dto.getData() > runStateUpLimit) {
+                    //测试 运行状态
+//                    if (dto.getData() < runStateDownLimit || dto.getData() > runStateUpLimit) {
+//                        return false;
+//                    }
+                    if (Objects.equals(EnumRunStatusType.Close.getCode(), dto.getData())) {
                         return false;
                     }
-                    //                    if (Objects.equals(EnumRunStatusType.Close.getCode(), dto.getData())) {
-                    //                        return false;
-                    //                    }
                 }
             }
         } catch (Exception e) {
@@ -947,12 +948,13 @@ public class ProjectDataRecordServiceImpl implements IProjectDataRecordService {
                 if (null == dto.getData()) {
                     continue;
                 }
-                //                if (Objects.equals(EnumRunStatusType.Open.getCode(), dto.getData())) {
-                //                    return dto.getTime();
-                //                }
-                if (dto.getData() > runStateDownLimit && dto.getData() < runStateUpLimit) {
+                if (Objects.equals(EnumRunStatusType.Open.getCode(), dto.getData())) {
                     return dto.getTime();
                 }
+                //测试 运行状态
+//                if (dto.getData() > runStateDownLimit && dto.getData() < runStateUpLimit) {
+//                    return dto.getTime();
+//                }
             }
         } catch (Exception e) {
             e.printStackTrace();