增加gettasklist接口参数

gaoyuan7 · gaoyuan7 · commit 29e73611815a · 2017-10-30T16:03:22.000+08:00
diff --git a/examples/kvs.py b/examples/kvs.py
@@ -14,7 +14,7 @@
 client = getKvsClient("kvs", "cn-beijing-6",use_ssl=False)
 
 #创建模板接口调用示例 : preset  
-presetname = 'testpreset'
+presetname = 'xxxx'
 description = 'just a demo'
 presetType = 'avop'
 
@@ -26,16 +26,10 @@
     "Param": {
         "f": "mp4",
         "AUDIO": {
-            "acodec": "aac",
-            "ar":"44100",
-            "ab":"64k"
+            "acodec": "aac"
         },
         "VIDEO": {
-            "vr": 25,
-            "vb": "500k",
-            "vcodec": "h264",
-            "width": 640,
-            "height": 360
+            "vcodec": "h264"
         }
     }
 }
@@ -54,7 +48,7 @@
 # WithDetail:是否查询模板详情，1-是 0-否
 # PresetType:模板类型，多种模板类型以逗号隔开
 # Presets:模板名称，多个模板名称以逗号隔开
-res = client.GetPresetList(WithDetail=1,PresetType="avop")
+res = client.GetPresetList(WithDetail=1,PresetType="xxxx")
 print json.dumps(res)
 
 #获取模板信息接口调用示例 : GetPresetDetail
@@ -89,19 +83,19 @@
 #具体参数请参考官方文档
 task = {
     "DstDir": "",
-    "DstObjectKey": "4.mp4",
-    "DstBucket": "autotestoffline",
+    "DstObjectKey": "xxxx",
+    "DstBucket": "xxxx",
     "DstAcl": "public-read",
     "Preset": presetname,
     "SrcInfo": [
         {
-            "path": "/autotestoffline/11.mp4",
+            "path": "/xxxxx/xxxxx",
             "type": "video",
             "index": 0
         }
     ],
     "CbMethod": "POST",
-    "CbUrl": "http://10.4.2.38:19090/"
+    "CbUrl": "xxxxx"
 }
 
 #该接口需要输入json格式数据
@@ -113,7 +107,7 @@
 print json.dumps(res)
 
 #查看任务状态接口调用示例 : GetTaskByTaskID
-taskid = "40d309d3b2bf373cd3f08e5b5e1bddf720160816"
+taskid = "xxxxxx"
 # TaskID:任务ID
 res = client.GetTaskByTaskID(TaskID = taskid)
 print json.dumps(res)
@@ -124,6 +118,10 @@
 # EndDate:截止时间，默认为开始时间加30天；若大于当前时间，则默认为当前时间；格式：20160930
 # Marker:请求起始游标，默认为0    
 # Limit:单次请求的记录数，默认为100，最大值为100
+# StartTime:起始时间戳
+# EndTime:结束时间戳
+# 错误码:ErrorCode
+# 任务状态:TaskStatus
 res = client.GetTaskList(StartDate=20170100,EndDate=20170112,Marker=0,Limit=50)
 print json.dumps(res)
 
diff --git a/kscore/data/kvs/2017-01-01/service-2.yaml b/kscore/data/kvs/2017-01-01/service-2.yaml
@@ -173,6 +173,14 @@ shapes:
     type: integer
   ProcessTaskId:
     type: string
+  ErrorCode:
+    type: string
+  TaskStatus:
+    type: string
+  StartTime:
+    type: integer
+  EndTime:
+    type: integer
   PresetInstance:
     type: structure
     members:
@@ -203,6 +211,14 @@ shapes:
         shape: Marker
       Limit:
         shape: Limit
+      ErrorCode:
+        shape: ErrorCode
+      TaskStatus:
+        shape: TaskStatus
+      StartTime:
+        shape: StartTime
+      EndTime:
+        shape: EndTime  
   GetTaskByTaskIDInstance:
     type: structure
     members:
diff --git a/kscore/kvs.py b/kscore/kvs.py
@@ -37,13 +37,13 @@ def FetchObjectMediaProcess(self,task):
 	def GetTaskByTaskID(self,TaskID=''):
 		return self.client.get_task_by_task_id(TaskID=TaskID)
 
-	def GetTaskList(self,StartDate=0,EndDate=0,Marker=0,Limit=100):
+	def GetTaskList(self,StartDate=0,EndDate=0,Marker=0,Limit=100,StartTime=0,EndTime=0,ErrorCode='',TaskStatus=''):
 		if StartDate == 0:
 			StartDate = int(time.strftime('%Y%m',time.localtime(time.time()))+"01")
 		if EndDate == 0:
-			return self.client.get_task_list(StartDate=StartDate,Marker=Marker,Limit=Limit)
+			return self.client.get_task_list(StartDate=StartDate,Marker=Marker,Limit=Limit,StartTime=StartTime,EndTime=EndTime,ErrorCode=ErrorCode,TaskStatus=TaskStatus)
 		else:
-			return self.client.get_task_list(StartDate=StartDate,EndDate=EndDate,Marker=Marker,Limit=Limit)
+			return self.client.get_task_list(StartDate=StartDate,EndDate=EndDate,Marker=Marker,Limit=Limit,StartTime=StartTime,EndTime=EndTime,ErrorCode=ErrorCode,TaskStatus=TaskStatus)
 
 	def DelTaskByTaskID(self,TaskID = ''):
 		return self.client.del_task_by_task_id(TaskID = TaskID)
