vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 09:36:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🔌OMADA work #708

Browse Source
This commit is contained in:
jokob-sk
2024-06-26 11:46:45 +10:00
parent 6e78788a36
commit f065b830e9
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
front/plugins/__template/rename_me.py
View File

@@ -34,7 +34,7 @@ def main():
# Retrieve configuration settings # Retrieve configuration settings
some_setting = get_setting_value('SYNC_plugins') some_setting = get_setting_value('SYNC_plugins')
mylog('verbose', [f'[{pluginName}] some_setting calue {some_setting}']) mylog('verbose', [f'[{pluginName}] some_setting value {some_setting}'])
# retrieve data # retrieve data
device_data = get_device_data(some_setting) device_data = get_device_data(some_setting)

14
server/device.py
View File

@@ -275,7 +275,7 @@ def update_devices_data_from_scan (db):
WHERE dev_MAC = cur_MAC WHERE dev_MAC = cur_MAC
) )
WHERE WHERE
(dev_Vendor = "" OR dev_Vendor IS NULL) (dev_Vendor IS NULL OR dev_Vendor IN ("", "null"))
AND EXISTS ( AND EXISTS (
SELECT 1 SELECT 1
FROM CurrentScan FROM CurrentScan
@@ -291,7 +291,7 @@ def update_devices_data_from_scan (db):
WHERE dev_MAC = cur_MAC WHERE dev_MAC = cur_MAC
) )
WHERE WHERE
(dev_Network_Node_port = "" OR dev_Network_Node_port IS NULL) (dev_Network_Node_port IS NULL OR dev_Network_Node_port IN ("", "null"))
AND EXISTS ( AND EXISTS (
SELECT 1 SELECT 1
FROM CurrentScan FROM CurrentScan
@@ -307,14 +307,14 @@ def update_devices_data_from_scan (db):
WHERE dev_MAC = cur_MAC WHERE dev_MAC = cur_MAC
) )
WHERE WHERE
(dev_Network_Node_MAC_ADDR = "" OR dev_Network_Node_MAC_ADDR IS NULL) (dev_Network_Node_MAC_ADDR IS NULL OR dev_Network_Node_MAC_ADDR IN ("", "null"))
AND EXISTS ( AND EXISTS (
SELECT 1 SELECT 1
FROM CurrentScan FROM CurrentScan
WHERE dev_MAC = cur_MAC WHERE dev_MAC = cur_MAC
)""") )""")
# Update only devices with empty or NULL dev_Network_Node_MAC_ADDR # Update only devices with empty or NULL dev_NetworkSite
mylog('debug', '[Update Devices] - 3 cur_NetworkSite -> dev_NetworkSite') mylog('debug', '[Update Devices] - 3 cur_NetworkSite -> dev_NetworkSite')
sql.execute("""UPDATE Devices sql.execute("""UPDATE Devices
SET dev_NetworkSite = ( SET dev_NetworkSite = (
@@ -323,7 +323,7 @@ def update_devices_data_from_scan (db):
WHERE dev_MAC = cur_MAC WHERE dev_MAC = cur_MAC
) )
WHERE WHERE
(dev_NetworkSite = "" OR dev_NetworkSite IS NULL) (dev_NetworkSite IS NULL OR dev_NetworkSite IN ("", "null"))
AND EXISTS ( AND EXISTS (
SELECT 1 SELECT 1
FROM CurrentScan FROM CurrentScan
@@ -339,7 +339,7 @@ def update_devices_data_from_scan (db):
WHERE dev_MAC = cur_MAC WHERE dev_MAC = cur_MAC
) )
WHERE WHERE
(dev_SSID = "" OR dev_SSID IS NULL) (dev_SSID IS NULL OR dev_SSID IN ("", "null"))
AND EXISTS ( AND EXISTS (
SELECT 1 SELECT 1
FROM CurrentScan FROM CurrentScan
@@ -355,7 +355,7 @@ def update_devices_data_from_scan (db):
WHERE dev_MAC = cur_MAC WHERE dev_MAC = cur_MAC
) )
WHERE WHERE
(dev_DeviceType = "" OR dev_DeviceType IS NULL) (dev_DeviceType IS NULL OR dev_DeviceType IN ("", "null"))
AND EXISTS ( AND EXISTS (
SELECT 1 SELECT 1
FROM CurrentScan FROM CurrentScan