From 69173cb7a169c5c9674fa7ba37822cc2e5b55fb2 Mon Sep 17 00:00:00 2001
From: Yu Sun <suny226@mail2.sysu.edu.cn>
Date: Fri, 19 Aug 2022 17:05:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E4=B8=8D=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E5=9C=A8=E7=9B=91=E6=8E=A7=E9=A1=B5=E9=9D=A2=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=9F=A5=E8=AF=A2=E6=9C=8D=E5=8A=A1=E5=92=8C?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=85=B3=E7=B3=BB=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 EdgeManager.php                        |  6 ------
 EdgeManager/EController/EConfigure.php | 24 ------------------------
 2 files changed, 30 deletions(-)

diff --git a/EdgeManager.php b/EdgeManager.php
index f71f385..465a932 100644
--- a/EdgeManager.php
+++ b/EdgeManager.php
@@ -323,12 +323,6 @@ $worker -> onMessage = function(TcpConnection $connection, Request $request) {
                     'code'  => 0,
                     'data'  => $devices
                 )));
-        } else if ($get['query'] === 'all_devices') {
-            $all_devices = EConfigure::get_all_devices($dbconn);
-            $connection -> send(json_encode(array(
-                'code'  => 0,
-                'data'  => $all_devices
-            )));
         } else {
             $connection -> send(json_encode(array(
                 'code'  => 1,
diff --git a/EdgeManager/EController/EConfigure.php b/EdgeManager/EController/EConfigure.php
index 7bedbcd..02b367c 100644
--- a/EdgeManager/EController/EConfigure.php
+++ b/EdgeManager/EController/EConfigure.php
@@ -162,28 +162,4 @@ class EConfigure {
         ));
         return pg_fetch_all($res);
     }
-
-    static function get_all_devices() {
-        $res = pg_query(
-            "SELECT server_id,
-            server.name AS server_name,
-            url, port,
-            device.name AS device_name,
-            conf -> '@DeviceType' AS device_type
-            FROM hf_mes_scada_edgeserver_controller_server server,
-            hf_mes_scada_edgeserver_controller_device device
-            WHERE (conf -> '@DeviceType') IS NOT NULL
-            AND server.id = server_id;"
-        );
-        $server_devices = pg_fetch_all($res);
-
-        $all_devices = [];
-        foreach ($server_devices as $device) {
-            if (!isset($all_devices[$device['server_id']]))
-                $all_devices[$device['server_id']] = array_slice($device, 0, 4);
-            $all_devices[$device['server_id']]['devices'][] = array_slice($device, -2);
-        }
-        
-        return $all_devices;
-    }
 }