diff --git a/dsBaseRpc/RpcService/BaseClass/BaseClassDao/BaseClassDao.go b/dsBaseRpc/RpcService/BaseClass/BaseClassDao/BaseClassDao.go index b3395dea..4f0e731b 100644 --- a/dsBaseRpc/RpcService/BaseClass/BaseClassDao/BaseClassDao.go +++ b/dsBaseRpc/RpcService/BaseClass/BaseClassDao/BaseClassDao.go @@ -87,6 +87,10 @@ func PageBaseClass(in *BaseClassProto.QueryArg) ([]map[string]interface{}, int32 myBuilder.And(builder.Eq{"t1.rxnf": in.Rxnf}) myBuilder.And(builder.Eq{"t1.stage_id": in.StageId}) myBuilder.And(builder.Eq{"t1.bureau_id": in.BureauId}) + //排除某个班级,用在将学生进行调整班级时的需求 + if in.RemoveClassId!=""{ + myBuilder.And(builder.Neq{"t1.class_id": in.RemoveClassId}) + } //获取拼接完成的SQL语句 sql, err := myBuilder.OrderBy("t1.bh asc").Limit(limit, offset).ToBoundSQL() if err != nil { diff --git a/dsBaseRpc/RpcService/BaseClass/BaseClassProto/BaseClass.pb.go b/dsBaseRpc/RpcService/BaseClass/BaseClassProto/BaseClass.pb.go index 27180089..4974c461 100644 --- a/dsBaseRpc/RpcService/BaseClass/BaseClassProto/BaseClass.pb.go +++ b/dsBaseRpc/RpcService/BaseClass/BaseClassProto/BaseClass.pb.go @@ -303,10 +303,12 @@ type QueryArg struct { StageId string `protobuf:"bytes,4,opt,name=stageId,proto3" json:"stageId,omitempty"` //入学年份 Rxnf int32 `protobuf:"varint,5,opt,name=Rxnf,proto3" json:"Rxnf,omitempty"` + //需要滤掉的班级ID + RemoveClassId string `protobuf:"bytes,6,opt,name=RemoveClassId,proto3" json:"RemoveClassId,omitempty"` //操作人 - ActionPersonId string `protobuf:"bytes,6,opt,name=ActionPersonId,proto3" json:"ActionPersonId,omitempty"` + ActionPersonId string `protobuf:"bytes,7,opt,name=ActionPersonId,proto3" json:"ActionPersonId,omitempty"` //操作IP - ActionIpAddress string `protobuf:"bytes,7,opt,name=ActionIpAddress,proto3" json:"ActionIpAddress,omitempty"` + ActionIpAddress string `protobuf:"bytes,8,opt,name=ActionIpAddress,proto3" json:"ActionIpAddress,omitempty"` } func (x *QueryArg) Reset() { @@ -376,6 +378,13 @@ func (x *QueryArg) GetRxnf() int32 { return 0 } +func (x *QueryArg) GetRemoveClassId() string { + if x != nil { + return x.RemoveClassId + } + return "" +} + func (x *QueryArg) GetActionPersonId() string { if x != nil { return x.ActionPersonId @@ -579,7 +588,7 @@ var file_BaseClass_proto_rawDesc = []byte{ 0x28, 0x09, 0x52, 0x0e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x0f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x70, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x41, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x49, 0x70, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0xd0, 0x01, 0x0a, + 0x69, 0x6f, 0x6e, 0x49, 0x70, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0xf6, 0x01, 0x0a, 0x08, 0x51, 0x75, 0x65, 0x72, 0x79, 0x41, 0x72, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x50, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x4c, 0x69, @@ -587,61 +596,63 @@ var file_BaseClass_proto_rawDesc = []byte{ 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x42, 0x75, 0x72, 0x65, 0x61, 0x75, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x52, 0x78, 0x6e, - 0x66, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x52, 0x78, 0x6e, 0x66, 0x12, 0x26, 0x0a, - 0x0e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x64, 0x18, - 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x65, 0x72, - 0x73, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x0f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, - 0x70, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, - 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x70, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, - 0x65, 0x0a, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, - 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, - 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, - 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x43, 0x6f, 0x75, - 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x72, 0x0a, 0x0c, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, - 0x49, 0x64, 0x73, 0x41, 0x72, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x09, 0x52, 0x03, 0x49, 0x64, 0x73, 0x12, 0x26, 0x0a, 0x0e, 0x41, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x64, - 0x12, 0x28, 0x0a, 0x0f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x70, 0x41, 0x64, 0x64, 0x72, - 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x41, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x49, 0x70, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x32, 0xe8, 0x03, 0x0a, 0x0f, 0x42, - 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x12, 0x41, - 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x12, 0x18, - 0x2e, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, - 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x41, 0x72, 0x67, 0x1a, 0x15, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x43, - 0x6c, 0x61, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, - 0x00, 0x12, 0x41, 0x0a, 0x0c, 0x41, 0x64, 0x64, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, - 0x73, 0x12, 0x18, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x2e, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x41, 0x72, 0x67, 0x1a, 0x15, 0x2e, 0x42, 0x61, - 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x52, 0x65, 0x70, - 0x6c, 0x79, 0x22, 0x00, 0x12, 0x48, 0x0a, 0x0f, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x42, 0x61, - 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x12, 0x1c, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, - 0x61, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, - 0x64, 0x73, 0x41, 0x72, 0x67, 0x1a, 0x15, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, - 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x44, - 0x0a, 0x0f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, - 0x73, 0x12, 0x18, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x2e, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x41, 0x72, 0x67, 0x1a, 0x15, 0x2e, 0x42, 0x61, - 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x52, 0x65, 0x70, - 0x6c, 0x79, 0x22, 0x00, 0x12, 0x42, 0x0a, 0x0d, 0x50, 0x61, 0x67, 0x65, 0x42, 0x61, 0x73, 0x65, - 0x43, 0x6c, 0x61, 0x73, 0x73, 0x12, 0x18, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, - 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x41, 0x72, 0x67, 0x1a, - 0x15, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, - 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x3d, 0x0a, 0x08, 0x47, 0x65, 0x74, 0x53, - 0x74, 0x61, 0x67, 0x65, 0x12, 0x18, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, + 0x66, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x52, 0x78, 0x6e, 0x66, 0x12, 0x24, 0x0a, + 0x0d, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x49, 0x64, 0x18, 0x06, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x43, 0x6c, 0x61, 0x73, + 0x73, 0x49, 0x64, 0x12, 0x26, 0x0a, 0x0e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x65, 0x72, + 0x73, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x41, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x0f, 0x41, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x70, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x08, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x70, 0x41, 0x64, + 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x65, 0x0a, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x18, + 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x4d, 0x65, 0x73, 0x73, + 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, + 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x72, 0x0a, 0x0c, + 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x64, 0x73, 0x41, 0x72, 0x67, 0x12, 0x10, 0x0a, 0x03, + 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x49, 0x64, 0x73, 0x12, 0x26, + 0x0a, 0x0e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x64, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x65, + 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x0f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x49, 0x70, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x0f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x70, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, + 0x32, 0xe8, 0x03, 0x0a, 0x0f, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x4d, 0x61, + 0x6e, 0x61, 0x67, 0x65, 0x12, 0x41, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x42, 0x61, 0x73, 0x65, 0x43, + 0x6c, 0x61, 0x73, 0x73, 0x12, 0x18, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x41, 0x72, 0x67, 0x1a, 0x15, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, - 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x3c, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x52, 0x78, - 0x6e, 0x66, 0x12, 0x18, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x2e, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x41, 0x72, 0x67, 0x1a, 0x15, 0x2e, 0x42, - 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x52, 0x65, - 0x70, 0x6c, 0x79, 0x22, 0x00, 0x42, 0x3a, 0x0a, 0x16, 0x63, 0x6f, 0x6d, 0x2e, 0x64, 0x73, 0x69, - 0x64, 0x65, 0x61, 0x6c, 0x2e, 0x64, 0x73, 0x6d, 0x69, 0x6e, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x42, - 0x09, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50, 0x01, 0x5a, 0x10, 0x2e, 0x3b, - 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0xa2, 0x02, - 0x00, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x41, 0x0a, 0x0c, 0x41, 0x64, 0x64, 0x42, 0x61, + 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x12, 0x18, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, + 0x61, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x41, 0x72, + 0x67, 0x1a, 0x15, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x48, 0x0a, 0x0f, 0x44, 0x65, + 0x6c, 0x65, 0x74, 0x65, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x12, 0x1c, 0x2e, + 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x44, + 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x64, 0x73, 0x41, 0x72, 0x67, 0x1a, 0x15, 0x2e, 0x42, 0x61, + 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x52, 0x65, 0x70, + 0x6c, 0x79, 0x22, 0x00, 0x12, 0x44, 0x0a, 0x0f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x61, + 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x12, 0x18, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, + 0x61, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x41, 0x72, + 0x67, 0x1a, 0x15, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x42, 0x0a, 0x0d, 0x50, 0x61, + 0x67, 0x65, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x12, 0x18, 0x2e, 0x42, 0x61, + 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x51, 0x75, 0x65, + 0x72, 0x79, 0x41, 0x72, 0x67, 0x1a, 0x15, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, + 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x3d, + 0x0a, 0x08, 0x47, 0x65, 0x74, 0x53, 0x74, 0x61, 0x67, 0x65, 0x12, 0x18, 0x2e, 0x42, 0x61, 0x73, + 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4d, 0x6f, 0x64, 0x65, + 0x6c, 0x41, 0x72, 0x67, 0x1a, 0x15, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x3c, 0x0a, + 0x07, 0x47, 0x65, 0x74, 0x52, 0x78, 0x6e, 0x66, 0x12, 0x18, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x43, + 0x6c, 0x61, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x41, + 0x72, 0x67, 0x1a, 0x15, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x2e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x42, 0x3a, 0x0a, 0x16, 0x63, + 0x6f, 0x6d, 0x2e, 0x64, 0x73, 0x69, 0x64, 0x65, 0x61, 0x6c, 0x2e, 0x64, 0x73, 0x6d, 0x69, 0x6e, + 0x2e, 0x62, 0x61, 0x73, 0x65, 0x42, 0x09, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, + 0x50, 0x01, 0x5a, 0x10, 0x2e, 0x3b, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0xa2, 0x02, 0x00, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/dsBaseRpc/RpcService/BaseClass/BaseClassProto/BaseClass.proto b/dsBaseRpc/RpcService/BaseClass/BaseClassProto/BaseClass.proto index 494cd353..0000ec88 100644 --- a/dsBaseRpc/RpcService/BaseClass/BaseClassProto/BaseClass.proto +++ b/dsBaseRpc/RpcService/BaseClass/BaseClassProto/BaseClass.proto @@ -1,118 +1,120 @@ -syntax = "proto3"; - -//在web层重新生成pb.go的方法 -/* -protoc -I Business/BaseClass/BaseClassProto/ Business/BaseClass/BaseClassProto/BaseClass.proto --go_out=plugins=grpc:Business/BaseClass/BaseClassProto -*/ -package BaseClassProto; - -option go_package = ".;BaseClassProto"; - -option java_multiple_files = true; -option java_package = "com.dsideal.dsmin.base"; -option java_outer_classname = "BaseClass"; -option objc_class_prefix = ""; - -service BaseClassManage { - //获取单条 - rpc GetBaseClass (ModelArg) returns (Reply) {} - //增加 - rpc AddBaseClass (ModelArg) returns (Reply) {} - //删除 - rpc DeleteBaseClass (DeleteIdsArg) returns (Reply) {} - //修改 - rpc UpdateBaseClass (ModelArg) returns (Reply) {} - //查询(分页) - rpc PageBaseClass (QueryArg) returns (Reply) {} - //根据学校ID获取学部(学段)信息 - rpc GetStage (ModelArg) returns (Reply) {} - //根据学校ID和学部(学段)ID获取入学年份 - rpc GetRxnf (ModelArg) returns (Reply) {} - -} - -message ModelArg { - //班级ID - string ClassId = 1; - //整数ID - int32 IdInt = 2; - //班号 - int32 Bh = 3; - //班级编码 规则:10位学校编码+4位入学年份+1位学段+3位班号 学段:0:幼儿 1:小学 2:初中 3:高中 4:职业 5:高等 - string ClassCode = 4; - //班级名称 - string ClassName = 5; - //班级别名 - string ClassAlias = 6; - //入学年份 - int32 Rxnf = 7; - //入学季节 - int32 Rxjj = 8; - //学制 - int32 SchoolingLength = 9; - //所属学段ID - string StageId = 10; - //班主任ID - string TeacherId = 11; - //所在部门(除职业和高等外都是0) - string OrgId = 12; - //所在学校ID - string BureauId = 13; - //是否启用 0:未启用 1:启用 - int32 BUse = 14; - //所在省行政区划码 - string ProvinceCode = 15; - //所在市行政区划码 - string CityCode = 16; - //所在区行政区划码 - string DistrictCode = 17; - //主校ID - string MainSchoolId = 18; - //最后修改时间 - string LastUpdatedTime = 19; - //开始班号 - int32 StartBh = 20; - //结束班号 - int32 EndBh = 21; - //需要强制更新的列 - repeated string ForceUpdateFields = 22; - //操作人 - string ActionPersonId = 23; - //操作IP - string ActionIpAddress = 24; -} - -// 查询参数 -message QueryArg{ - int32 Page = 1; - int32 Limit = 2; - //学校ID - string BureauId = 3; - //学部ID - string stageId = 4; - //入学年份 - int32 Rxnf = 5; - //操作人 - string ActionPersonId = 6; - //操作IP - string ActionIpAddress = 7; - -} - -// 查询请求响应 -message Reply{ - bool Success = 1; - string Message = 2; - int32 Count = 3; - string List = 4; -} - -//删除参数 -message DeleteIdsArg { - //一个或多个ID - repeated string Ids = 1; - //操作人 - string ActionPersonId = 2; - //操作IP - string ActionIpAddress = 3; +syntax = "proto3"; + +//在web层重新生成pb.go的方法 +/* +protoc -I Business/BaseClass/BaseClassProto/ Business/BaseClass/BaseClassProto/BaseClass.proto --go_out=plugins=grpc:Business/BaseClass/BaseClassProto +*/ +package BaseClassProto; + +option go_package = ".;BaseClassProto"; + +option java_multiple_files = true; +option java_package = "com.dsideal.dsmin.base"; +option java_outer_classname = "BaseClass"; +option objc_class_prefix = ""; + +service BaseClassManage { + //获取单条 + rpc GetBaseClass (ModelArg) returns (Reply) {} + //增加 + rpc AddBaseClass (ModelArg) returns (Reply) {} + //删除 + rpc DeleteBaseClass (DeleteIdsArg) returns (Reply) {} + //修改 + rpc UpdateBaseClass (ModelArg) returns (Reply) {} + //查询(分页) + rpc PageBaseClass (QueryArg) returns (Reply) {} + //根据学校ID获取学部(学段)信息 + rpc GetStage (ModelArg) returns (Reply) {} + //根据学校ID和学部(学段)ID获取入学年份 + rpc GetRxnf (ModelArg) returns (Reply) {} + +} + +message ModelArg { + //班级ID + string ClassId = 1; + //整数ID + int32 IdInt = 2; + //班号 + int32 Bh = 3; + //班级编码 规则:10位学校编码+4位入学年份+1位学段+3位班号 学段:0:幼儿 1:小学 2:初中 3:高中 4:职业 5:高等 + string ClassCode = 4; + //班级名称 + string ClassName = 5; + //班级别名 + string ClassAlias = 6; + //入学年份 + int32 Rxnf = 7; + //入学季节 + int32 Rxjj = 8; + //学制 + int32 SchoolingLength = 9; + //所属学段ID + string StageId = 10; + //班主任ID + string TeacherId = 11; + //所在部门(除职业和高等外都是0) + string OrgId = 12; + //所在学校ID + string BureauId = 13; + //是否启用 0:未启用 1:启用 + int32 BUse = 14; + //所在省行政区划码 + string ProvinceCode = 15; + //所在市行政区划码 + string CityCode = 16; + //所在区行政区划码 + string DistrictCode = 17; + //主校ID + string MainSchoolId = 18; + //最后修改时间 + string LastUpdatedTime = 19; + //开始班号 + int32 StartBh = 20; + //结束班号 + int32 EndBh = 21; + //需要强制更新的列 + repeated string ForceUpdateFields = 22; + //操作人 + string ActionPersonId = 23; + //操作IP + string ActionIpAddress = 24; +} + +// 查询参数 +message QueryArg{ + int32 Page = 1; + int32 Limit = 2; + //学校ID + string BureauId = 3; + //学部ID + string stageId = 4; + //入学年份 + int32 Rxnf = 5; + //需要滤掉的班级ID + string RemoveClassId = 6; + //操作人 + string ActionPersonId = 7; + //操作IP + string ActionIpAddress = 8; + +} + +// 查询请求响应 +message Reply{ + bool Success = 1; + string Message = 2; + int32 Count = 3; + string List = 4; +} + +//删除参数 +message DeleteIdsArg { + //一个或多个ID + repeated string Ids = 1; + //操作人 + string ActionPersonId = 2; + //操作IP + string ActionIpAddress = 3; } \ No newline at end of file