diff --git a/dsBaseWeb/Business/BaseClass/BaseClassProto/BaseClass.pb.go b/dsBaseWeb/Business/BaseClass/BaseClassProto/BaseClass.pb.go index 9f3ca196..c06b7207 100644 --- a/dsBaseWeb/Business/BaseClass/BaseClassProto/BaseClass.pb.go +++ b/dsBaseWeb/Business/BaseClass/BaseClassProto/BaseClass.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.21.0 -// protoc v3.11.4 +// protoc-gen-go v1.25.0 +// protoc v3.14.0 // source: BaseClass.proto //在web层重新生成pb.go的方法 @@ -133,7 +133,7 @@ type ModelArg struct { //学制 SchoolingLength int32 `protobuf:"varint,9,opt,name=SchoolingLength,proto3" json:"SchoolingLength,omitempty"` //所属学段ID - StageId string `protobuf:"bytes,10,opt,name=StageId,proto3" json:"StageId,omitempty"` + StageId int32 `protobuf:"varint,10,opt,name=StageId,proto3" json:"StageId,omitempty"` //班主任ID TeacherId string `protobuf:"bytes,11,opt,name=TeacherId,proto3" json:"TeacherId,omitempty"` //所在部门（除职业和高等外都是0） @@ -259,11 +259,11 @@ func (x *ModelArg) GetSchoolingLength() int32 { return 0 } -func (x *ModelArg) GetStageId() string { +func (x *ModelArg) GetStageId() int32 { if x != nil { return x.StageId } - return "" + return 0 } func (x *ModelArg) GetTeacherId() string { @@ -375,7 +375,7 @@ type QueryArg struct { //学校ID BureauId string `protobuf:"bytes,3,opt,name=BureauId,proto3" json:"BureauId,omitempty"` //学部ID - StageId string `protobuf:"bytes,4,opt,name=stageId,proto3" json:"stageId,omitempty"` + StageId int32 `protobuf:"varint,4,opt,name=stageId,proto3" json:"stageId,omitempty"` //入学年份 Rxnf int32 `protobuf:"varint,5,opt,name=Rxnf,proto3" json:"Rxnf,omitempty"` //需要滤掉的班级ID @@ -439,11 +439,11 @@ func (x *QueryArg) GetBureauId() string { return "" } -func (x *QueryArg) GetStageId() string { +func (x *QueryArg) GetStageId() int32 { if x != nil { return x.StageId } - return "" + return 0 } func (x *QueryArg) GetRxnf() int32 { @@ -644,7 +644,7 @@ var file_BaseClass_proto_rawDesc = []byte{ 0x12, 0x28, 0x0a, 0x0f, 0x53, 0x63, 0x68, 0x6f, 0x6f, 0x6c, 0x69, 0x6e, 0x67, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x53, 0x63, 0x68, 0x6f, 0x6f, 0x6c, 0x69, 0x6e, 0x67, 0x4c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x74, - 0x61, 0x67, 0x65, 0x49, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x74, 0x61, + 0x61, 0x67, 0x65, 0x49, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x53, 0x74, 0x61, 0x67, 0x65, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x54, 0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x49, 0x64, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x54, 0x65, 0x61, 0x63, 0x68, 0x65, 0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x4f, 0x72, 0x67, 0x49, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, @@ -679,7 +679,7 @@ var file_BaseClass_proto_rawDesc = []byte{ 0x69, 0x6d, 0x69, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x42, 0x75, 0x72, 0x65, 0x61, 0x75, 0x49, 0x64, 0x18, 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, + 0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 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, 0x24, 0x0a, 0x0d, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, diff --git a/dsBaseWeb/Business/BaseClass/BaseClassProto/BaseClass.proto b/dsBaseWeb/Business/BaseClass/BaseClassProto/BaseClass.proto index a08b374d..97c1b47a 100644 --- a/dsBaseWeb/Business/BaseClass/BaseClassProto/BaseClass.proto +++ b/dsBaseWeb/Business/BaseClass/BaseClassProto/BaseClass.proto @@ -64,7 +64,7 @@ message ModelArg { //学制 int32 SchoolingLength = 9; //所属学段ID - string StageId = 10; + int32 StageId = 10; //班主任ID string TeacherId = 11; //所在部门（除职业和高等外都是0） @@ -102,7 +102,7 @@ message QueryArg{ //学校ID string BureauId = 3; //学部ID - string stageId = 4; + int32 stageId = 4; //入学年份 int32 Rxnf = 5; //需要滤掉的班级ID diff --git a/dsBaseWeb/Business/BaseMenu/BaseMenuController/BaseMenuController.go b/dsBaseWeb/Business/BaseMenu/BaseMenuController/BaseMenuController.go new file mode 100644 index 00000000..00205371 --- /dev/null +++ b/dsBaseWeb/Business/BaseMenu/BaseMenuController/BaseMenuController.go @@ -0,0 +1,36 @@ +package BaseMenuController + +import "github.com/gin-gonic/gin" + +func Routers(r *gin.RouterGroup) { + rr := r.Group("/menu") + + rr.GET("/PageClassInfo", PageClassInfo) + + return +} + + +// @Summary 根据系统ID和身份ID获取菜单信息 +// @Description 根据系统ID和身份ID获取菜单信息 +// @Tags 班级信息 +// @Accept application/x-www-form-urlencoded +// @Produce json +// @Param appId query string true "系统ID" +// @Param identityId query string true "身份ID" +// @Param rxnf query int true "入学年份" +// @Param removeClassId query string false "需要滤掉的班级ID" +// @Success 200 {object} Model.Res +// @Router /base/menu/PageBaseMenuInfo [get] +// @X-EmptyLimit ["page","limit","orgId","stageId","rxnf"] +// @X-LengthLimit [{"orgId":"36,36"},{"removeClassId":"36,36"}] +// @X-IntRangeLimit [{"page":"1,1000"},{"limit":"1,1000"},{"rxnf":"1990,2100"}] +// @X-RoleLimit ["1","2","3","4","6","7"] +// @X-InterfaceName ["PageBaseClass"] +// @X-ExtendSwaggerField [{"column_name":"student_count","sample_data":"41","column_comment":"学生人数"},{"column_name":"teacher_name","sample_data":"李老师","column_comment":"班主任"}] +// @X-TableName ["t_base_class"] +// @X-RemoveSwaggerField ["id_int","bh","class_code","rxnf","rxjj","schooling_length","stage_id","org_id","bureau_id","b_use","province_code","city_code","district_code","main_school_id","last_updated_time"] +// @X-Sort [1] +func PageBaseMenuInfo(c *gin.Context) { + +} \ No newline at end of file