|
@@ -466,7 +466,8 @@ public class RyTask
|
|
|
basic.put("报警值", DecimalUtils.getAbsAndScale(tXinyiWarningRecord.getWarningVal(), INT_2));
|
|
|
basic.put("标准值", DecimalUtils.getAbsAndScale(tXinyiWarningRecord.getDesignVal(), INT_2));
|
|
|
basic.put("管控值", DecimalUtils.getAbsAndScale(tXinyiWarningRecord.getControlVal(), INT_2));
|
|
|
- basic.put("报警次数", count > MAX_COUNT ? MAX_COUNT_STR : count);
|
|
|
+// basic.put("报警次数", count > MAX_COUNT ? MAX_COUNT_STR : count);
|
|
|
+ basic.put("持续时间", count > MAX_COUNT ? MAX_COUNT_STR : count);
|
|
|
if(tXinyiWarningRecord.getType() != 2)
|
|
|
basic.put("状态", status == 0 ? "报警中" : status == 1 ? "用户关闭" : status == 2 ? "系统关闭" : "应急处理中");
|
|
|
else
|