From a87c754d5d1d382c51aa754cdc19739c18b03a5e Mon Sep 17 00:00:00 2001
From: pengtao <pengtao@kingsome.cn>
Date: Tue, 15 Oct 2019 14:45:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A02001=20b=5FN=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ops/ss_virtual_create.py | 75 +++++++++++++++++++++++++---------------
 1 file changed, 48 insertions(+), 27 deletions(-)

diff --git a/ops/ss_virtual_create.py b/ops/ss_virtual_create.py
index 978a224..528f45a 100644
--- a/ops/ss_virtual_create.py
+++ b/ops/ss_virtual_create.py
@@ -17,22 +17,13 @@ class SS_Virtual_command:
     def __init__(self):
         self.ss_virtual_url = "http://10.10.3.14:8993/v1/ta/meta/prop/virtual/dict/create"
         self.method = "post"
+        self.loginName = "root"
+        self.password = "kingsome2016"
 
-
-    def upload_gameid(self, filename):
-
-        projectId = int(19)
-        createParam = {"commonHeader": {"projectId": 19},
-            "mainColumn": {"property": {"columnName": "gameid", "tableType": 0}},
-            "columns": [{"property": {"columnName": "gameid", "columnDesc": "主键ID", "selectType": "number"}},
-                {"property": {"columnName": "gameid_china", "columnDesc": "china映射", "selectType": "string"}}]}
-        loginName = "root"
-        password = "kingsome2016"
-        body = {"projectId": projectId, "createParam": createParam, "loginName": loginName, "password": password}
-        quote_body = my_quote(body)
-
-        cmd = f"curl --header 'Accept: application/json' --form 'file=@{filename}' '{self.ss_virtual_url}?{quote_body}'"
-        print(cmd)
+    def run_cmd(cmd):
+        import subprocess
+        msg = "Starting run: %s " % cmd
+        print("run_cmd {0}".format(msg))
         cmdref = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
         output, error_info = cmdref.communicate()
         if cmdref.returncode != 0:
@@ -45,22 +36,52 @@ class SS_Virtual_command:
             print(f"Run Success,output was {output}")
             return True
 
-        # r = requests.post(url=self.ss_virtual_url, header="Accept: application/json", files=filename, data=quote_body)
-        # if r.status_code == requests.codes.ok:
-        #     print(f"upload success,return={r.content}")
-        #     return True
-        # else:
-        #     print(f"upload failed,return={r.content}")
-        #     return False
+
+    def upload_gameid(self):
+        filename = "/data/git/ops_interface/ops/csv/gameid.csv"
+        projectId = int(19)
+        createParam = {"commonHeader": {"projectId": 19},
+            "mainColumn": {"property": {"columnName": "gameid", "tableType": 0}},
+            "columns": [{"property": {"columnName": "gameid", "columnDesc": "主键ID", "selectType": "number"}},
+                {"property": {"columnName": "gameid_china", "columnDesc": "china映射", "selectType": "string"}}]}
+
+        body = {"projectId": projectId, "createParam": createParam, "loginName": self.loginName,
+            "password": self.password}
+        quote_body = my_quote(body)
+
+        cmd = f"curl --header 'Accept: application/json' --form 'file=@{filename}' '{self.ss_virtual_url}?{quote_body}'"
+        print(cmd)
+        if self.run_cmd(cmd):
+            return True
+        else:
+            return False
+
+
+    def upload_2001_b_n(self):
+        filename = "/data/git/ops_interface/ops/csv/2001_b_n.csv"
+        projectId = int(21)
+        createParam = {"commonHeader": {"projectId": 21},
+            "mainColumn": {"property": {"columnName": "#vp@b_n", "tableType": 0, "subTableType": "vprop_sql"}},
+            "columns": [{"property": {"columnName": "b_n", "columnDesc": "跳转appid", "selectType": "string"}},
+                {"property": {"columnName": "b_n_china", "columnDesc": "跳转中文名", "selectType": "string"}}]}
+
+        body = {"projectId": projectId, "createParam": createParam, "loginName": self.loginName,
+            "password": self.password}
+        quote_body = my_quote(body)
+
+        cmd = f"curl --header 'Accept: application/json' --form 'file=@{filename}' '{self.ss_virtual_url}?{quote_body}'"
+        print(cmd)
+        if self.run_cmd(cmd):
+            return True
+        else:
+            return False
+
 
 
 def main():
-    if len(sys.argv) != 2:
-        raise Exception("PLS input filename which need upload!")
-
-    filename = sys.argv[1]
     ss = SS_Virtual_command()
-    ss.upload_gameid(filename)
+    # ss.upload_gameid()
+    ss.upload_2001_b_n()
 
 
 if __name__ == "__main__":