From f2cf47ba9fdf075b374ddb9deebdd9ee4436f17e Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 06 三月 2020 14:22:55 +0800
Subject: [PATCH] Esinfo add carNo
---
fileAnalysis.go | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/fileAnalysis.go b/fileAnalysis.go
index 9e4c0b0..35b3411 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)
--
Gitblit v1.8.0