jiaojiao7 4 жил өмнө
parent
commit
0da45f6d8b

+ 4 - 2
api/v1/projects.go

@@ -1,6 +1,7 @@
 package v1
 
 import (
+	"sfbase/global"
 	"sfis/service"
 
 	"github.com/gin-gonic/gin"
@@ -33,8 +34,9 @@ func getProjectsList(c *gin.Context) {
 
 //获取项目详情
 func getProjectDetail(c *gin.Context) {
-	id := c.Query("id")
-	data := &map[string]interface{}{}
+	id := c.PostForm("id")
+	global.Logger.Info("id "+ id)
+	data := map[string]interface{}{}
 	if id != "" {
 		data = service.ProjectDetailData(id)
 	}

+ 10 - 2
service/projectDetail.go

@@ -1,11 +1,19 @@
 package service
 
 import (
+	"fmt"
 	"sfbase/global"
+	"sfis/db"
 )
 
-func ProjectDetailData(id string) *map[string]interface{} {
+func ProjectDetailData(id string) map[string]interface{} {
 	global.Logger.Info("id " + id)
-	data := &map[string]interface{}{}
+	data := map[string]interface{}{}
+	query := `{"query":{"bool":{"must":[{"term":{"id":"%s"}}],"must_not":[],"should":[]}}}`
+	querys := fmt.Sprintf(query, id)
+	infos := db.Es.Get(INDEX, TYPE, querys)
+	if infos != nil && len(*infos) > 0 {
+		data = (*infos)[0]
+	}
 	return data
 }

+ 40 - 0
test/api_v1/projects_test.go

@@ -0,0 +1,40 @@
+package api_v1
+
+import (
+	"encoding/json"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"strings"
+	"testing"
+)
+
+func init() {
+	//todo init connection db operation
+}
+func Test_ProjectDetails(t *testing.T) {
+	data := post("http://127.0.0.1:8080/sfis/api/v1/projectDetail", map[string]string{
+		"id": "5f6b4e12499cb0822d39c68f",
+	})
+	res := map[string]interface{}{}
+	s, _ := json.Marshal(data)
+	json.Unmarshal(s, &res)
+	log.Println("数据:", res)
+}
+
+func post(url string, form map[string]string) (data map[string]interface{}) {
+	str := ""
+	for k, v := range form {
+		str += "&" + k + "=" + v
+	}
+	log.Println(str)
+	res, err := http.Post(url, "application/x-www-form-urlencoded", strings.NewReader(str))
+	if err != nil {
+		log.Println("post err:", err.Error())
+	} else if res.Body != nil {
+		defer res.Body.Close()
+		bs, _ := ioutil.ReadAll(res.Body)
+		json.Unmarshal(bs, &data)
+	}
+	return
+}