|
|
@@ -2,29 +2,33 @@ package backend
|
|
|
|
|
|
import (
|
|
|
"bytes"
|
|
|
+ "context"
|
|
|
"encoding/json"
|
|
|
+ "fmt"
|
|
|
"io/ioutil"
|
|
|
+ "kpt-pasture/model"
|
|
|
"net/http"
|
|
|
"time"
|
|
|
|
|
|
+ feedingPb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/cow"
|
|
|
"gitee.com/xuyiping_admin/pkg/logger/zaplog"
|
|
|
"gitee.com/xuyiping_admin/pkg/xerr"
|
|
|
"go.uber.org/zap"
|
|
|
)
|
|
|
|
|
|
-type FeedingService struct {
|
|
|
+type FeedingHttp struct {
|
|
|
authClient *http.Client
|
|
|
}
|
|
|
|
|
|
-func NewFeedingService() *FeedingService {
|
|
|
- return &FeedingService{
|
|
|
+func NewFeedingService() *FeedingHttp {
|
|
|
+ return &FeedingHttp{
|
|
|
authClient: &http.Client{
|
|
|
Timeout: time.Duration(60) * time.Second,
|
|
|
},
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-func (c *FeedingService) doRequest(req *http.Request) ([]byte, error) {
|
|
|
+func (c *FeedingHttp) doRequest(req *http.Request, response interface{}) ([]byte, error) {
|
|
|
resp, err := http.DefaultClient.Do(req)
|
|
|
if err != nil {
|
|
|
zaplog.Error("ClientService", zap.Any("authClient.Do", err))
|
|
|
@@ -42,10 +46,14 @@ func (c *FeedingService) doRequest(req *http.Request) ([]byte, error) {
|
|
|
return nil, xerr.Customf("err:%v", err)
|
|
|
}
|
|
|
}
|
|
|
+ fmt.Println(string(b))
|
|
|
+ if err = json.Unmarshal(b, response); err != nil {
|
|
|
+ return nil, xerr.WithStack(err)
|
|
|
+ }
|
|
|
return b, nil
|
|
|
}
|
|
|
|
|
|
-func (c *FeedingService) DoGet(url string) ([]byte, error) {
|
|
|
+func (c *FeedingHttp) DoGet(url string, response interface{}) ([]byte, error) {
|
|
|
req, err := http.NewRequest(http.MethodGet, url, nil)
|
|
|
if err != nil {
|
|
|
zaplog.Error("ClientService", zap.Any("DoGet", err))
|
|
|
@@ -53,10 +61,10 @@ func (c *FeedingService) DoGet(url string) ([]byte, error) {
|
|
|
}
|
|
|
req.Header.Add("Accept", "application/json")
|
|
|
req.Header.Add("Content-Type", "application/json")
|
|
|
- return c.doRequest(req)
|
|
|
+ return c.doRequest(req, response)
|
|
|
}
|
|
|
|
|
|
-func (c *FeedingService) DoPost(url string, body interface{}) ([]byte, error) {
|
|
|
+func (c *FeedingHttp) DoPost(url string, body interface{}, response *interface{}) ([]byte, error) {
|
|
|
b, err := json.Marshal(body)
|
|
|
if err != nil {
|
|
|
zaplog.Error("ClientService", zap.Any("DoPost-Marshal", err))
|
|
|
@@ -69,5 +77,91 @@ func (c *FeedingService) DoPost(url string, body interface{}) ([]byte, error) {
|
|
|
}
|
|
|
req.Header.Add("Accept", "application/json")
|
|
|
req.Header.Add("Content-Type", "application/json")
|
|
|
- return c.doRequest(req)
|
|
|
+ return c.doRequest(req, response)
|
|
|
+}
|
|
|
+
|
|
|
+func (s *StoreEntry) GetFeedingHomepage(ctx context.Context, req *feedingPb.FeedingHomepageRequest) (*feedingPb.FeedingHomepageResponse, error) {
|
|
|
+ var pasture model.AppPastureList
|
|
|
+ if err := s.DB.Debug().Table(new(model.AppPastureList).TableName()).Where("farm_id = ?", req.FarmId).First(&pasture).Error; err != nil {
|
|
|
+ return nil, xerr.WithStack(err)
|
|
|
+ }
|
|
|
+ if pasture.PastureId == 0 {
|
|
|
+ return nil, xerr.Customf("牧场不存在")
|
|
|
+ }
|
|
|
+
|
|
|
+ url := fmt.Sprintf("%s/feeding/tmrdata", pasture.PastureUrl)
|
|
|
+ fmt.Println(url)
|
|
|
+ client := NewFeedingService()
|
|
|
+
|
|
|
+ response := &model.FeedingHomepageResponse{Data: []*model.FeedingHomepageData{}}
|
|
|
+ _, err := client.DoGet(url, response)
|
|
|
+ if err != nil {
|
|
|
+ return nil, xerr.WithStack(err)
|
|
|
+ }
|
|
|
+ fmt.Println(response)
|
|
|
+ res := &feedingPb.FeedingHomepageResponse{
|
|
|
+ Code: response.Code,
|
|
|
+ Msg: response.Msg,
|
|
|
+ Data: &feedingPb.FeedingHomepageData{},
|
|
|
+ }
|
|
|
+
|
|
|
+ for _, v := range response.Data {
|
|
|
+ res.Data = &feedingPb.FeedingHomepageData{
|
|
|
+ Cost: v.Cost,
|
|
|
+ DoneTimes: v.DoneTimes,
|
|
|
+ DoneWeight: v.DoneWeight,
|
|
|
+ MonRateHL: v.MonRateHL,
|
|
|
+ MonRateSL: v.MonRateSL,
|
|
|
+ MonRateSLR: v.MonRateSLR,
|
|
|
+ Montime: v.Montime,
|
|
|
+ PlanTimes: v.PlanTimes,
|
|
|
+ PlanWeight: v.PlanWeight,
|
|
|
+ Temtime: v.Temtime,
|
|
|
+ TotalCost: v.TotalCost,
|
|
|
+ YesRateHL: v.YesRateHL,
|
|
|
+ YesRateSL: v.YesRateSL,
|
|
|
+ YesRateSLR: v.YesRateSLR,
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return res, nil
|
|
|
+}
|
|
|
+
|
|
|
+func (s *StoreEntry) GetFeedingManagement(ctx context.Context, req *feedingPb.FeedingManagementRequest) (*feedingPb.FeedingManagementResponse, error) {
|
|
|
+ var pasture model.AppPastureList
|
|
|
+ if err := s.DB.Debug().Table(new(model.AppPastureList).TableName()).Where("farm_id = ?", req.FarmId).First(&pasture).Error; err != nil {
|
|
|
+ return nil, xerr.WithStack(err)
|
|
|
+ }
|
|
|
+ if pasture.PastureId == 0 {
|
|
|
+ return nil, xerr.Customf("牧场不存在")
|
|
|
+ }
|
|
|
+
|
|
|
+ url := fmt.Sprintf("%s/feeding/management?typea=%s&startdate=%s&enddate=%s", pasture.PastureUrl, req.Typea, req.Startdate, req.Enddate)
|
|
|
+ fmt.Println(url)
|
|
|
+ client := NewFeedingService()
|
|
|
+
|
|
|
+ response := &model.FeedingManagementResponse{Data: []*model.FeedingManagementData{}}
|
|
|
+ _, err := client.DoGet(url, response)
|
|
|
+ if err != nil {
|
|
|
+ return nil, xerr.WithStack(err)
|
|
|
+ }
|
|
|
+ fmt.Println(response)
|
|
|
+ res := &feedingPb.FeedingManagementResponse{
|
|
|
+ Code: response.Code,
|
|
|
+ Msg: response.Msg,
|
|
|
+ Data: []*feedingPb.FeedingManagementData{},
|
|
|
+ }
|
|
|
+
|
|
|
+ for _, v := range response.Data {
|
|
|
+ res.Data = append(res.Data, &feedingPb.FeedingManagementData{
|
|
|
+ Actualweightminus: v.ActualWeightMinus,
|
|
|
+ Ccount: v.CCount,
|
|
|
+ Cost: v.Cost,
|
|
|
+ Dryweight: v.DryWeight,
|
|
|
+ Totalcost: v.TotalCost,
|
|
|
+ Typea: v.TypeA,
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
+ return res, nil
|
|
|
}
|
