add: optdevice field

go.mod

@@ -3,7 +3,7 @@ module kpt-tmr-group
 go 1.17
 
 require (
-	gitee.com/xuyiping_admin/go_proto v0.0.0-20231114032315-bbe3e9f68ed5
+    gitee.com/xuyiping_admin/go_proto v0.0.0-20231115083432-5a4d773a736c
 	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
@@ -24,7 +24,6 @@ require (
 	go.uber.org/multierr v1.8.0
 	go.uber.org/zap v1.24.0
 	golang.org/x/sync v0.2.0
-	google.golang.org/protobuf v1.31.0
 	gorm.io/driver/mysql v1.5.1
 	gorm.io/gorm v1.25.2
 )

go.sum

@@ -36,22 +36,7 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20230822100450-307557aa568a h1:77YHuhzd5gGnNNcEahlUWNbA+QheErdLcENBFMbX8eI=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20230822100450-307557aa568a/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20230823052817-08ac6a117982 h1:uUPyJacoMHIui/loBHus6GO2V/WV5I0dxEEYNnPLWpw=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20230823052817-08ac6a117982/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20230823054003-157f033bf025 h1:en1mDyAroXF+oD7zhtjXur+iinoRpOS8+MAP8wS/thQ=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20230823054003-157f033bf025/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20230823054257-de7a8cf59bb4 h1:9HPV7SqlxCgRKVdbF9AXubhLHgx4z93otF3pN5CUljo=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20230823054257-de7a8cf59bb4/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20230823060841-fecf079818d5 h1:5wvuR14mVWu7kEYMwTYwVksjLfoDomYbSfhfLNHIYEo=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20230823060841-fecf079818d5/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20230823061528-20b02d357f02 h1:e4BzweXQdP/RdWBeqk1sshUuxBI/jcLUCNDtv/G1mXg=
-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/go_proto v0.0.0-20231115083432-5a4d773a736c/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=

model/formula_estimate.go

@@ -332,6 +332,7 @@ type GetDataByNameParams struct {
 	StartTime string `json:"startTime"`
 	StopTime  string `json:"stopTime"`
 	Pid       string `json:"pid"`
+	Optdevice string `json:"optdevice"`
 }
 
 type FeedStatisticsResponse struct {

module/backend/statistic_service.go

@@ -715,6 +715,7 @@ func (s *StoreEntry) GetDataByName(ctx context.Context, req *operationPb.GetData
 			StartTime: req.StartTime,
 			StopTime:  req.StartTime,
 			Pid:       req.Pid,
+			Optdevice: req.Optdevice,
 		},
 	}
 	response := &model.PastureCommonResponse{Data: &model.PastureCommonData{}}