Browse Source

方便自测 状态采用区间

miaolijing 2 years ago
parent
commit
ff6ead78c4

+ 8 - 1
src/main/java/com/persagy/apm/diagnose/indicatorrecord/controller/MonitorIndicatorRecordController.java

@@ -8,6 +8,7 @@ import com.persagy.apm.diagnose.indicatorrecord.model.dto.*;
 import com.persagy.apm.diagnose.indicatorrecord.model.vo.MonitorIndicatorRecordListItemVO;
 import com.persagy.apm.diagnose.indicatorrecord.service.IMonitorIndicatorRecordService;
 import com.persagy.apm.diagnose.service.EnergyAlarmServiceImpl;
+import com.persagy.apm.diagnose.service.vo.GroupVO;
 import com.persagy.framework.ems.data.pojo.hbase.MonitorIndicatorRecord;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -19,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -62,7 +65,11 @@ public class MonitorIndicatorRecordController {
 
     @PostMapping("/test")
     public void test() throws Exception {
-        String methodId = energyAlarmService.queryObjIndicatorMethodId("Pj1101060001", "Eq1101060001297dc3087a254b0abf1e0e49748f368b", "ACATFU_RunStatus");
+        ConfigItemDataSendTimeDTO sendTimeDTO = ConfigItemDataSendTimeDTO.builder().lastSendTime(new Date()).build();;
+        List<ConfigItemDataSendTimeDTO> dtoList = new ArrayList<>();
+        dtoList.add(sendTimeDTO);
+//        String methodId = energyAlarmService.queryObjIndicatorMethodId("Pj1101060001", "Eq1101060001297dc3087a254b0abf1e0e49748f368b", "ACATFU_RunStatus");
+        ResultHelper.multi(dtoList);
     }
 }
 

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

@@ -65,11 +65,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 = "_";
@@ -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;