Browse Source

data_by_name: add pid field

Yi 1 year ago
parent
commit
c2ad6bccb8
4 changed files with 5 additions and 1 deletions
  1. 1 1
      go.mod
  2. 2 0
      go.sum
  3. 1 0
      model/formula_estimate.go
  4. 1 0
      module/backend/statistic_service.go

+ 1 - 1
go.mod

@@ -3,7 +3,7 @@ module kpt-tmr-group
 go 1.17
 
 require (
-	gitee.com/xuyiping_admin/go_proto v0.0.0-20231114030613-89ef68ca6bfa
+	gitee.com/xuyiping_admin/go_proto v0.0.0-20231114032315-bbe3e9f68ed5
 	gitee.com/xuyiping_admin/pkg v0.0.0-20230822102440-0e489dd5d75a
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/getsentry/sentry-go v0.23.0

+ 2 - 0
go.sum

@@ -50,6 +50,8 @@ gitee.com/xuyiping_admin/go_proto v0.0.0-20230823061528-20b02d357f02 h1:e4BzweXQ
 gitee.com/xuyiping_admin/go_proto v0.0.0-20230823061528-20b02d357f02/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20231114030613-89ef68ca6bfa h1:fSUSfuSn6BQB3Yqo52MnT2GPntd5NGXkBVsT0RmQAlo=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20231114030613-89ef68ca6bfa/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20231114032315-bbe3e9f68ed5 h1:pAhV/sBj5ow99wUUUa6HLwGUhEKL6TlCa6PYn1TRuxY=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20231114032315-bbe3e9f68ed5/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
 gitee.com/xuyiping_admin/pkg v0.0.0-20230822102440-0e489dd5d75a h1:+SSGto+q5BKy6r9FLFQXooTNqZs4tALceFpoo2jef8w=
 gitee.com/xuyiping_admin/pkg v0.0.0-20230822102440-0e489dd5d75a/go.mod h1:vK5K2LnhWZnvZlEY9gmT6GFdq/5Y0mtxuKLNJHFJkE4=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=

+ 1 - 0
model/formula_estimate.go

@@ -331,6 +331,7 @@ type GetDataByNameParams struct {
 	PastureId string `json:"pastureid"`
 	StartTime string `json:"startTime"`
 	StopTime  string `json:"stopTime"`
+	Pid       string `json:"pid"`
 }
 
 type FeedStatisticsResponse struct {

+ 1 - 0
module/backend/statistic_service.go

@@ -714,6 +714,7 @@ func (s *StoreEntry) GetDataByName(ctx context.Context, req *operationPb.GetData
 			PastureId: fmt.Sprintf("%d", pastureId),
 			StartTime: req.StartTime,
 			StopTime:  req.StartTime,
+			Pid:       req.Pid,
 		},
 	}
 	response := &model.PastureCommonResponse{Data: &model.PastureCommonData{}}