|
@@ -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;
|