caipin 4 年之前
父节点
当前提交
51cc85352c
共有 5 个文件被更改,包括 42 次插入9 次删除
  1. 1 0
      dao/project_message_dao.go
  2. 36 4
      lib/cld.go
  3. 2 2
      services/backstage_service.go
  4. 2 2
      web/backstage/project_bs.go
  5. 1 1
      web/routes/routes.go

+ 1 - 0
dao/project_message_dao.go

@@ -30,6 +30,7 @@ func (d *ProjectMessageDao) GetAll(projectId int, accountId int) []models.CmProj
 	_ = d.engine.
 		Where("project_id=? and account_id=? ",
 			projectId, accountId).
+		Desc("id").
 		Find(&datalist)
 	return datalist
 }

+ 36 - 4
lib/cld.go

@@ -9,6 +9,7 @@ package lib
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -18,8 +19,9 @@ import (
 )
 
 type Cld struct {
-	AuthUrl string
-	Token   string
+	AuthUrl     string
+	CategoryUrl string
+	Token       string
 }
 
 type Result struct {
@@ -32,7 +34,8 @@ type Result struct {
 //创建项目用户service
 func NewCld() *Cld {
 	return &Cld{
-		AuthUrl: "http://cld.smartcost.com.cn/cm/auth",
+		AuthUrl:     "http://cld.smartcost.com.cn/cm/auth",
+		CategoryUrl: "http://cld.com/cm/category",
 		// AuthUrl: "http://cld.com/cm/auth",
 		Token: "sc@ConS!tru@ct*88",
 	}
@@ -75,6 +78,35 @@ func (c *Cld) LoginValid(loginData viewmodels.StaffCld) (*Result, error) {
 }
 
 // 获得cld办事处和员工 列表
-func (c *Cld) GetList(lcategoryId int) {
+func (c *Cld) GetList(categoryId int) {
 
+	data := url.Values{}
+	parameter := strings.NewReader(data.Encode())
+
+	url := fmt.Sprintf("%s?categoryId=%d", c.CategoryUrl, categoryId)
+	fmt.Println(url)
+	c.cldRequest("GET", url, parameter)
+}
+
+func (c *Cld) cldRequest(Method string, url string, parameter *strings.Reader) (*Result, error) {
+
+	client := &http.Client{}
+	fmt.Println("====================")
+
+	reqest, err := http.NewRequest(Method, url, parameter)
+	if err != nil {
+		return nil, errors.New("CLD网络出现问题")
+	}
+	reqest.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+	// 发送请求
+	response, err := client.Do(reqest)
+	if err != nil {
+		return nil, errors.New("CLD网络出现问题")
+	}
+	if response.StatusCode != 200 {
+		return nil, errors.New("请求CLD发送错误")
+	}
+	body, _ := ioutil.ReadAll(response.Body)
+	fmt.Println(string(body))
+	return nil, nil
 }

+ 2 - 2
services/backstage_service.go

@@ -25,7 +25,7 @@ type BackstageService interface {
 	ValidCldStaff(loginData viewmodels.StaffCld, writer http.ResponseWriter) (*viewmodels.ResultCld, error)
 	ValidRuleProject(ctx iris.Context) (viewmodels.Project, error)
 	ValidRuleProjectAdd(ctx iris.Context) (viewmodels.Project, error)
-	GetCld(categoryId int)
+	GetCldByCategoryId(categoryId int)
 	Out(ctx iris.Context) error
 }
 
@@ -151,7 +151,7 @@ func (s *backstageService) Out(ctx iris.Context) error {
 }
 
 // 获得cld办事处和员工 列表
-func (s *backstageService) GetCld(categoryId int) {
+func (s *backstageService) GetCldByCategoryId(categoryId int) {
 	cld := lib.NewCld()
 	cld.GetList(categoryId)
 	// result, err := cld.GetList(categoryId)

+ 2 - 2
web/backstage/project_bs.go

@@ -116,7 +116,7 @@ func (c *ProjectBs) Get() {
 // @Param   categoryId     body    int     true        "办事处ID"
 // @Success 200 {object} viewmodels.ProjectAccount "{code:0成功,data:viewmodels.ProjectAccount,msg:}"
 // @Failure 400 {string} string	"{code:-1参数类错误,msg:错误信息}"
-// @Router /backstage/cld [get]
+// @Router /backstage/project/cld [get]
 func (c *ProjectBs) GetCld() {
 
 	cldData := viewmodels.StaffCld{}
@@ -138,7 +138,7 @@ func (c *ProjectBs) GetCld() {
 
 	// 获得项目信息
 	ProjectData := ""
-	c.ServiceBackstage.GetCld(categoryId)
+	c.ServiceBackstage.GetCldByCategoryId(categoryId)
 	// ProjectData, err := c.ServiceBackstage.GetCld(categoryId)
 	if err != nil {
 		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})

+ 1 - 1
web/routes/routes.go

@@ -202,6 +202,6 @@ func Configure(b *bootstrap.Bootstrapper) {
 
 	backstageProjectCM := mvc.New(b.Party("/backstage/project"))
 	backstageProjectCM.Register(ProjectService)
-	backstageCM.Register(backstageService)
+	backstageProjectCM.Register(backstageService)
 	backstageProjectCM.Handle(new(backstage.ProjectBs))
 }