From 90d268dbd544ae876955d8441530f8f768490b7f Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 12 十二月 2019 14:00:52 +0800
Subject: [PATCH] FindAllFile add page and size,should return total
---
fileAnalysis.go | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/fileAnalysis.go b/fileAnalysis.go
index 731efa1..8045bb3 100644
--- a/fileAnalysis.go
+++ b/fileAnalysis.go
@@ -25,24 +25,41 @@
return "http://"+api.Ip+":"+strconv.Itoa(api.Port)
}
-func (api FileAnalysisApi) FindAllFile() (files []protomsg.FileAnalysis,err error){
- url := api.getBasicUrl() + DATA_URL_PREFIX + "/fileAnalysis/findAllFile"
+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 files, err
+ return false, nil
}
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- return files,err
+ return false, nil
}
- bytes, _ := json.Marshal(res.Data)
- err = json.Unmarshal(bytes, &files)
+ return res.Success, res.Data
+}
- return files, err
+func (api FileAnalysisApi) FindAllFile(fileName string, page int, size int) (bool,interface{}){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/fileAnalysis/findAllFile"
+ client := NewClient()
+ paramQuery := map[string]string {
+ "fileName": fileName,
+ "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){
--
Gitblit v1.8.0