|
@@ -219,7 +219,8 @@ int CoreAlarmGateway()
|
|
"AND t1.current_online=1 "
|
|
"AND t1.current_online=1 "
|
|
"AND t1.original_relay IS NOT NULL "
|
|
"AND t1.original_relay IS NOT NULL "
|
|
"AND t1.current_electric IS NOT NULL "
|
|
"AND t1.current_electric IS NOT NULL "
|
|
- "AND t1.electric_update_flag=1 ");
|
|
|
|
|
|
+ "AND t1.electric_update_flag=1 "
|
|
|
|
+ "AND t1.alarm_enable=1 ");
|
|
excuteSql(conn,query);
|
|
excuteSql(conn,query);
|
|
res = mysql_store_result(conn);
|
|
res = mysql_store_result(conn);
|
|
if (NULL == res)
|
|
if (NULL == res)
|
|
@@ -415,7 +416,7 @@ int CoreAlarmGateway()
|
|
}
|
|
}
|
|
|
|
|
|
/******************************************************************
|
|
/******************************************************************
|
|
- * Function Name: core_alarm_gateway
|
|
|
|
|
|
+ * Function Name: CoreAlarmNode
|
|
* Arguments:
|
|
* Arguments:
|
|
* Return Value: void
|
|
* Return Value: void
|
|
* Date: 2023-12-8
|
|
* Date: 2023-12-8
|
|
@@ -449,7 +450,8 @@ int CoreAlarmNode()
|
|
"AND t1.current_online=1 "
|
|
"AND t1.current_online=1 "
|
|
"AND t1.original_relay IS NOT NULL "
|
|
"AND t1.original_relay IS NOT NULL "
|
|
"AND t1.current_electric IS NOT NULL "
|
|
"AND t1.current_electric IS NOT NULL "
|
|
- "AND t1.electric_update_flag=1 ");
|
|
|
|
|
|
+ "AND t1.electric_update_flag=1 "
|
|
|
|
+ "AND t1.alarm_enable=1 ");
|
|
excuteSql(conn2,query);
|
|
excuteSql(conn2,query);
|
|
res = mysql_store_result(conn2);
|
|
res = mysql_store_result(conn2);
|
|
if (NULL == res)
|
|
if (NULL == res)
|