|
|
@ -416,10 +416,11 @@ public class DataProcessServiceImpl extends CommanHandleService implements IData
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
if(alarmRule.getTriggerTimeFrame() != null && alarmRule.getTriggerTimeFrame() > 0){
|
|
|
|
if(alarmRule.getTriggerTimeFrame() != null && alarmRule.getTriggerTimeFrame() > 0){
|
|
|
|
double difValue = FilterDeviceValue(deviceId, fieldName, alarmRule.getTriggerTimeFrame());
|
|
|
|
double difValue = FilterDeviceValue(deviceId, fieldName, alarmRule.getTriggerTimeFrame());
|
|
|
|
if(difValue > 0){
|
|
|
|
// if(difValue > 0){
|
|
|
|
|
|
|
|
// filedValue = difValue;
|
|
|
|
|
|
|
|
// }
|
|
|
|
filedValue = difValue;
|
|
|
|
filedValue = difValue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/** End **/
|
|
|
|
/** End **/
|
|
|
|
|
|
|
|
|
|
|
|
triggerExpression = triggerExpression.replaceAll("\\{" + fieldName + "\\}", String.valueOf(filedValue));
|
|
|
|
triggerExpression = triggerExpression.replaceAll("\\{" + fieldName + "\\}", String.valueOf(filedValue));
|
|
|
|