Merge branch 'master' of ssh://118.195.187.246:10022/ysun/EdgeManager

EdgeManager/EDataCapture/EDataCapture.php

@@ -13,14 +13,20 @@ class EDataCapture {
         protected $data = [],
     ) {
         if (!is_null($this -> post)) {
-            if (!in_array(
-                $this -> post -> param -> working_subclass,
-                ENodeConfigure::get_working_subclasses($this -> dbconn)
-            )) {
-                $this -> check_res = 'WRONG_WORKING_SUBCLASS';
-                return;
-            } else {
-                $this -> working_subclass =  $this -> post -> param -> working_subclass;
+            if(isset($this -> post -> param -> working_subclass)){
+                if (!in_array(
+                    $this -> post -> param -> working_subclass,
+                    ENodeConfigure::get_working_subclasses($this -> dbconn)
+                )) {
+                    $this -> check_res = 'WRONG_WORKING_SUBCLASS';
+                    return;
+                } else {
+                    $this -> working_subclass =  $this -> post -> param -> working_subclass;
+                }
+            }else{
+                //根据code查询working_subclasses
+                $working_subclass = ENodeConfigure::get_working_subclasses_by_codes($this -> dbconn, $this -> post -> param -> data[0] -> code);
+                $this -> working_subclass = $working_subclass[0];
             }
     
             if ($this -> no_dup_code) {
@@ -33,7 +39,7 @@ class EDataCapture {
                     "SELECT code, type
                     FROM hf_mes_scada_data_capture_node_configure
                     WHERE working_subclass = '%s'",
-                    $this -> post -> param -> working_subclass
+                    $this -> working_subclass
                 )));
             }
 

EdgeManager/EDataCapture/ENodeConfigure.php

@@ -111,7 +111,7 @@ class ENodeConfigure {
             $this -> dbconn,
             'hf_mes_scada_data_capture_node_configure',
             (array) $this -> post,
-            ['code' => $this -> post -> code]
+            ['id' => $this -> post -> id]
         );
     }
 
@@ -125,6 +125,16 @@ class ENodeConfigure {
         return pg_fetch_all_columns($res, 0);
     }
 
+    static function get_working_subclasses_by_codes($dbconn, $code) {
+        $res = pg_query($dbconn, sprintf(
+            "SELECT working_subclass
+            FROM hf_mes_scada_data_capture_node_configure
+            WHERE code = '%s'",
+            $code
+        ));
+        return pg_fetch_all_columns($res, 0);
+    }
+
     function get_codes_by_working_subclasses() {
         $res = pg_query($this -> dbconn, sprintf(
             "SELECT code