Procházet zdrojové kódy

去除自测状态区间

miaolijing před 2 roky
rodič
revize
83537db9bf

+ 1 - 1
pom.xml

@@ -203,7 +203,7 @@
         <dependency>
             <groupId>com.persagy</groupId>
             <artifactId>mybatis-tenant-datasource-db-starter</artifactId>
-            <version>1.1.4</version>
+            <version>1.1.7</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>

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

@@ -66,10 +66,10 @@ public class ProjectDataRecordServiceImpl implements IProjectDataRecordService {
 //    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 = "_";
@@ -1229,24 +1229,24 @@ public class ProjectDataRecordServiceImpl implements IProjectDataRecordService {
         //获取运行状态时间
         if (openOrClose){
             //正式环境  运行状态采用0/1 进行判断
-//            if (Objects.equals(EnumRunStatusType.Open.getCode(), data)) {
-//                return true;
-//            }
-            //测试环境 无法造出0/1 故采用区间数据来判断 运行状态
-            if (data > runStateDownLimit && data < runStateUpLimit) {
+            if (Objects.equals(EnumRunStatusType.Open.getCode(), data)) {
                 return true;
             }
+            //测试环境 无法造出0/1 故采用区间数据来判断 运行状态
+//            if (data > runStateDownLimit && data < runStateUpLimit) {
+//                return true;
+//            }
             return false;
         }
         //获取是否在关闭状态
         if (!openOrClose){
 //            测试 运行状态
-            if (data < runStateDownLimit || data > runStateUpLimit) {
-                return false;
-            }
-//            if (Objects.equals(EnumRunStatusType.Close.getCode(), data)) {
+//            if (data < runStateDownLimit || data > runStateUpLimit) {
 //                return false;
 //            }
+            if (Objects.equals(EnumRunStatusType.Close.getCode(), data)) {
+                return false;
+            }
             return true;
         }
         return false;