From b64bb2dd19cba5c16774fc52c943743d9f136b94 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 01 二月 2021 11:14:21 +0800
Subject: [PATCH] GetAllCamerasByServer添加cameraId参数
---
fileAnalysis.go | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 161 insertions(+), 19 deletions(-)
diff --git a/fileAnalysis.go b/fileAnalysis.go
index 391c88d..aa61266 100644
--- a/fileAnalysis.go
+++ b/fileAnalysis.go
@@ -3,7 +3,6 @@
import (
"basic.com/pubsub/protomsg.git"
"encoding/json"
- "fmt"
"strconv"
)
@@ -25,26 +24,58 @@
return "http://"+api.Ip+":"+strconv.Itoa(api.Port)
}
-func (api FileAnalysisApi) FindAllFile(fileName string) (files []protomsg.FileAnalysis,err error){
- url := api.getBasicUrl() + DATA_URL_PREFIX + "/fileAnalysis/findAllFile"
+func (api FileAnalysisApi) Save(paramBody map[string]interface{}) bool {
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/fileAnalysis/save"
client := NewClient()
- paramQuery := map[string]string {
- "fileName": fileName,
- }
- body, err := client.DoGetRequest(url, paramQuery, nil)
+ body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
if err != nil {
- return files, err
+ return false
}
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- return files,err
+ return false
}
- bytes, _ := json.Marshal(res.Data)
- err = json.Unmarshal(bytes, &files)
+ return res.Success
+}
- return files, err
+func (api FileAnalysisApi) Show(id string) (bool,interface{}) {
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/fileAnalysis/show/"+id
+ client := NewClient()
+ body, err := client.DoGetRequest(url, nil, nil)
+ if err != nil {
+ return false, nil
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ return false, nil
+ }
+
+ return res.Success, res.Data
+}
+
+func (api FileAnalysisApi) FindAllFile(fileName string,fType int, page int, size int) (bool,interface{}){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/fileAnalysis/findAllFile"
+ client := NewClient()
+ paramQuery := map[string]string {
+ "fileName": fileName,
+ "type": strconv.Itoa(fType),
+ "page": strconv.Itoa(page),
+ "size": strconv.Itoa(size),
+ }
+ body, err := client.DoGetRequest(url, paramQuery, nil)
+ if err != nil {
+ return false, nil
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ return false, nil
+ }
+
+ return res.Success, res.Data
}
func (api FileAnalysisApi) GetAnalysisFiles() (files []protomsg.FileAnalysis,err error){
@@ -67,6 +98,31 @@
return files, err
}
+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 false,nil
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ logPrint("unmarshal res err:",err)
+ return false,nil
+ }
+
+ return res.Success,res.Data
+}
+
func (api FileAnalysisApi) GetFileAnalysisSet() (set protomsg.FileAnalysisSetting,err error) {
url := api.getBasicUrl() + DATA_URL_PREFIX + "/fileSetting/show"
client := NewClient()
@@ -87,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)
@@ -101,7 +157,7 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
return false
}
@@ -121,7 +177,7 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
return false
}
@@ -142,7 +198,30 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
+ return false
+ }
+
+ return res.Success
+}
+
+func (api FileAnalysisApi) BatchStatus(stackId string, isAll bool, idArr []string, status int) bool {
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/fileAnalysis/batchStatus"
+ client := NewClient()
+ paramBody := map[string]interface{} {
+ "stackId": stackId,
+ "isAll": isAll,
+ "ids":idArr,
+ "status": status,
+ }
+ 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
}
@@ -162,7 +241,7 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
return false
}
@@ -183,7 +262,70 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
+ return false
+ }
+
+ 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
}
--
Gitblit v1.8.0