From 1ada0fda1532585a774a50bd842e67f9d6747f4e Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 02 三月 2020 17:41:12 +0800
Subject: [PATCH] fix FindByStackId

---
 fileAnalysis.go |   90 ++++++++++++++++++++++++++++++++++++--------
 1 files changed, 73 insertions(+), 17 deletions(-)

diff --git a/fileAnalysis.go b/fileAnalysis.go
index 391c88d..cc74fb6 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){
@@ -65,6 +96,31 @@
 	err = json.Unmarshal(bytes, &files)
 
 	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) {
@@ -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,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false
 	}
 
@@ -162,7 +218,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false
 	}
 
@@ -183,7 +239,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false
 	}
 

--
Gitblit v1.8.0