diff --git a/rpc/water/pb/water.pb.go b/rpc/water/pb/water.pb.go index 08680db..93ea87f 100644 --- a/rpc/water/pb/water.pb.go +++ b/rpc/water/pb/water.pb.go @@ -158,7 +158,7 @@ type LogItemsRequest struct { state protoimpl.MessageState `protogen:"open.v1"` Page int32 `protobuf:"varint,1,opt,name=page,proto3" json:"page,omitempty"` Size int32 `protobuf:"varint,2,opt,name=size,proto3" json:"size,omitempty"` - Time string `protobuf:"bytes,3,opt,name=time,proto3" json:"time,omitempty"` + Time []string `protobuf:"bytes,3,rep,name=time,proto3" json:"time,omitempty"` HostCode string `protobuf:"bytes,4,opt,name=host_code,json=hostCode,proto3" json:"host_code,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache @@ -208,11 +208,11 @@ func (x *LogItemsRequest) GetSize() int32 { return 0 } -func (x *LogItemsRequest) GetTime() string { +func (x *LogItemsRequest) GetTime() []string { if x != nil { return x.Time } - return "" + return nil } func (x *LogItemsRequest) GetHostCode() string { @@ -476,7 +476,7 @@ const file_water_water_proto_rawDesc = "" + "\x0fLogItemsRequest\x12\x12\n" + "\x04page\x18\x01 \x01(\x05R\x04page\x12\x12\n" + "\x04size\x18\x02 \x01(\x05R\x04size\x12\x12\n" + - "\x04time\x18\x03 \x01(\tR\x04time\x12\x1b\n" + + "\x04time\x18\x03 \x03(\tR\x04time\x12\x1b\n" + "\thost_code\x18\x04 \x01(\tR\bhostCode\"T\n" + "\rAddLogRequest\x12\x1b\n" + "\thost_code\x18\x01 \x01(\tR\bhostCode\x12\x12\n" + diff --git a/rpc/water/water.pb b/rpc/water/water.pb index f0d4ae4..24ae2eb 100644 Binary files a/rpc/water/water.pb and b/rpc/water/water.pb differ diff --git a/rpc/water/water.proto b/rpc/water/water.proto index c27615c..87ff0c3 100644 --- a/rpc/water/water.proto +++ b/rpc/water/water.proto @@ -19,7 +19,7 @@ message HostCodeRequest { message LogItemsRequest { int32 page = 1; int32 size = 2; - string time = 3; + repeated string time = 3; string host_code = 4; } diff --git a/services/water/internal/logic/logItemsLogic.go b/services/water/internal/logic/logItemsLogic.go index 36eaa8d..0cdbfd4 100644 --- a/services/water/internal/logic/logItemsLogic.go +++ b/services/water/internal/logic/logItemsLogic.go @@ -4,13 +4,11 @@ import ( "context" "lone-services/pkg/modelbase" "lone-services/pkg/utils" + "lone-services/rpc/water/pb" "lone-services/services/water/dao" + "lone-services/services/water/internal/svc" "lone-services/services/water/model" "lone-services/services/water/validator" - "strings" - - "lone-services/rpc/water/pb" - "lone-services/services/water/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) @@ -45,9 +43,9 @@ func (l *LogItemsLogic) LogItems(in *water.LogItemsRequest) (*water.Response, er Page: int(in.Page), Size: int(in.Size), Eq: map[string]string{"host_code": in.HostCode}} - times := strings.Split(in.Time, utils.CentralHorizontalLine) - if len(times) == utils.NumberTwo { - w.Between = map[string][2]string{"create_time": {in.Time, in.Time}} + if len(in.Time) == utils.NumberTwo { + w.Between = map[string][2]string{ + "create_time": {in.Time[utils.NumberZero], in.Time[utils.NumberOne]}} } var info []dao.LogInfo items, err := model.LogModel{}.Init().Page(w, &info)