From da4c92f310f5e856fc7a37056616990ceac2e098 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 23 六月 2020 15:13:59 +0800
Subject: [PATCH] rm task,cameraTask,cameraTaskArgs add cameraRule
---
fileAnalysis.go | 85 ++++++++++++++++++++++++++++++++++++------
1 files changed, 72 insertions(+), 13 deletions(-)
diff --git a/fileAnalysis.go b/fileAnalysis.go
index 9e4c0b0..e145bb1 100644
--- a/fileAnalysis.go
+++ b/fileAnalysis.go
@@ -98,33 +98,29 @@
return files, err
}
-func (api FileAnalysisApi) FindByStackId(stackId string, typ int) (list []protomsg.FileAnalysis,err error) {
+func (api FileAnalysisApi) FindByStackId(stackId string, typ int,name string, page int, size int) (bool,interface{}) {
url := api.getBasicUrl() + DATA_URL_PREFIX + "/fileAnalysis/findByStackId"
client := NewClient()
paramBody := map[string]string {
"stackId": stackId,
"type": strconv.Itoa(typ),
+ "name": name,
+ "page": strconv.Itoa(page),
+ "size": strconv.Itoa(size),
}
body, err := client.DoGetRequest(url, paramBody, nil)
if err != nil {
logPrint("err:",err)
- return nil,err
+ return false,nil
}
var res Result
if err = json.Unmarshal(body, &res); err != nil {
logPrint("unmarshal res err:",err)
- return nil,err
+ return false,nil
}
- bytes, _ := json.Marshal(res.Data)
- err = json.Unmarshal(bytes, &list)
- if err != nil {
- logPrint("unmarshal m err:",err)
- return nil,err
- }
-
- return list,nil
+ return res.Success,res.Data
}
func (api FileAnalysisApi) GetFileAnalysisSet() (set protomsg.FileAnalysisSetting,err error) {
@@ -147,11 +143,11 @@
return set, err
}
-func (api FileAnalysisApi) UpdateProgress(id string, progress int) bool {
+func (api FileAnalysisApi) UpdateProgress(ids []string, progress int) bool {
url := api.getBasicUrl() + DATA_URL_PREFIX + "/fileAnalysis/updateProgress"
client := NewClient()
paramBody := map[string]interface{} {
- "id":id,
+ "ids":ids,
"progress": progress,
}
body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
@@ -248,4 +244,67 @@
}
return res.Success
+}
+
+func (api FileAnalysisApi) Rename(id string,name string) bool {
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/fileAnalysis/rename"
+ client := NewClient()
+ paramBody := map[string]interface{} {
+ "id": id,
+ "name": name,
+ }
+ body,err := client.DoPostRequest(url,CONTENT_TYPE_FORM, paramBody,nil,nil)
+ if err != nil {
+ return false
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ logPrint(err)
+ return false
+ }
+
+ return res.Success
+}
+
+func (api FileAnalysisApi) Move(id string,stackId string) bool {
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/fileAnalysis/move"
+ client := NewClient()
+ paramBody := map[string]interface{} {
+ "id": id,
+ "stackId": stackId,
+ }
+ body,err := client.DoPostRequest(url,CONTENT_TYPE_FORM, paramBody,nil,nil)
+ if err != nil {
+ return false
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ logPrint(err)
+ return false
+ }
+
+ return res.Success
+}
+
+func (api FileAnalysisApi) Copy(id string,stackIds []string) bool {
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/fileAnalysis/copy"
+ client := NewClient()
+ paramBody := map[string]interface{} {
+ "id": id,
+ "stackIds": stackIds,
+ }
+ body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
+ if err != nil {
+ return false
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ logPrint(err)
+ return false
+ }
+
+ return res.Success
}
\ No newline at end of file
--
Gitblit v1.8.0