From 91b31055fa6213ccb99b43edaf759af9875fd259 Mon Sep 17 00:00:00 2001 From: wubin Date: Thu, 9 Jul 2020 13:49:28 +0800 Subject: [PATCH] update --- .../BaseClassController.go | 6 +- .../BaseClassService/BaseClassProtoService.go | 4 +- dsBaseWeb/docs/docs.go | 368 +++++++++--------- dsBaseWeb/docs/swagger.json | 368 +++++++++--------- dsBaseWeb/docs/swagger.yaml | 4 + 5 files changed, 384 insertions(+), 366 deletions(-) diff --git a/dsBaseWeb/Business/BaseClass/BaseClassController/BaseClassController.go b/dsBaseWeb/Business/BaseClass/BaseClassController/BaseClassController.go index 10b88dbc..816920d0 100644 --- a/dsBaseWeb/Business/BaseClass/BaseClassController/BaseClassController.go +++ b/dsBaseWeb/Business/BaseClass/BaseClassController/BaseClassController.go @@ -38,7 +38,7 @@ func Routers(r *gin.RouterGroup) { // @Success 200 {object} Model.Res // @Router /base/class/PageClassInfo [get] // @X-EmptyLimit ["page","limit","orgId","stageId","rxnf"] -// @X-LengthLimit [{"orgId":"36,36"}] +// @X-LengthLimit [{"orgId":"36,36"},{"removeClassId":"36,36"}] // @X-IntRangeLimit [{"page":"1,1000"},{"limit":"1,1000"},{"rxnf":"1990,2100"}] // @X-LengthLimit [{"stageId":"1,1"}] // @X-RoleLimit ["1","2","3","4","6","7"] @@ -58,6 +58,8 @@ func PageClassInfo(c *gin.Context) { stageId := c.Query("stageId") //入学年份 rxnf := CommonUtil.ConvertStringToInt32(c.Query("rxnf")) + //需要滤掉的班级ID + removeClassId := c.Query("removeClassId") //操作人 actionPersonId, err := c.Cookie("person_id") if err != nil { @@ -69,7 +71,7 @@ func PageClassInfo(c *gin.Context) { } //操作IP actionIpAddress := c.ClientIP() - r, err := BaseClassService.PageClassInfo(page, limit, bureauId, stageId, rxnf, actionPersonId, actionIpAddress) + r, err := BaseClassService.PageClassInfo(page, limit, bureauId, stageId, rxnf, removeClassId, actionPersonId, actionIpAddress) if err != nil { c.JSON(http.StatusOK, Model.Res{ Success: false, diff --git a/dsBaseWeb/Business/BaseClass/BaseClassService/BaseClassProtoService.go b/dsBaseWeb/Business/BaseClass/BaseClassService/BaseClassProtoService.go index 71ec34d1..30c9f7ce 100644 --- a/dsBaseWeb/Business/BaseClass/BaseClassService/BaseClassProtoService.go +++ b/dsBaseWeb/Business/BaseClass/BaseClassService/BaseClassProtoService.go @@ -5,8 +5,8 @@ import ( "strings" ) -func PageClassInfo(page int32, limit int32, bureauId string, stageId string, rxnf int32, actionPersonId string, actionIpAddress string) (*BaseClassProto.Reply, error) { - Reply, err := PageBaseClass(BaseClassProto.QueryArg{Page: page, Limit: limit, BureauId: bureauId, StageId: stageId, Rxnf: rxnf, ActionPersonId: actionPersonId, ActionIpAddress: actionIpAddress}) +func PageClassInfo(page int32, limit int32, bureauId string, stageId string, rxnf int32, removeClassId string, actionPersonId string, actionIpAddress string) (*BaseClassProto.Reply, error) { + Reply, err := PageBaseClass(BaseClassProto.QueryArg{Page: page, Limit: limit, BureauId: bureauId, StageId: stageId, Rxnf: rxnf, RemoveClassId: removeClassId, ActionPersonId: actionPersonId, ActionIpAddress: actionIpAddress}) return Reply, err } diff --git a/dsBaseWeb/docs/docs.go b/dsBaseWeb/docs/docs.go index 9bc5f362..412f1def 100644 --- a/dsBaseWeb/docs/docs.go +++ b/dsBaseWeb/docs/docs.go @@ -1987,26 +1987,26 @@ var doc = `{ "version": "1.0" }, "paths": { - "/base/business/PageBaseBusiness": { - "get": { + "/base/business/UpdateBaseBusiness": { + "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取业务系统信息(列表)", + "description": "修改业务系统信息", "parameters": [ { - "description": "第几页", - "in": "query", - "name": "page", + "description": "业务系统编码", + "in": "formData", + "name": "businessCode", "required": true, - "type": "integer" + "type": "string" }, { - "description": "一页显示多少条", - "in": "query", - "name": "limit", + "description": "业务系统名称", + "in": "formData", + "name": "businessName", "required": true, - "type": "integer" + "type": "string" } ], "produces": [ @@ -2020,33 +2020,37 @@ var doc = `{ } } }, - "summary": "获取业务系统信息(列表)", + "summary": "修改业务系统信息", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "page", - "limit" + "businessCode", + "businessName" ], - "x-intlimit": [ - "page", - "limit" + "x-lengthlimit": [ + { + "businessCode": "6,6" + }, + { + "businessName": "1:50" + } ], "x-rolelimit": [ "1" ] } }, - "/base/business/DeleteBaseBusiness": { - "post": { + "/base/business/GetBaseBusiness": { + "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "删除业务系统信息", + "description": "获取业务系统信息(单条)", "parameters": [ { "description": "业务系统编码", - "in": "formData", + "in": "query", "name": "businessCode", "required": true, "type": "string" @@ -2063,7 +2067,7 @@ var doc = `{ } } }, - "summary": "删除业务系统信息", + "summary": "获取业务系统信息(单条)", "tags": [ "业务系统维护" ], @@ -2080,19 +2084,26 @@ var doc = `{ ] } }, - "/base/business/GetBaseBusiness": { - "get": { + "/base/business/AddBaseBusiness": { + "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取业务系统信息(单条)", + "description": "增加业务系统信息", "parameters": [ { "description": "业务系统编码", - "in": "query", + "in": "formData", "name": "businessCode", "required": true, "type": "string" + }, + { + "description": "业务系统名称", + "in": "formData", + "name": "businessName", + "required": true, + "type": "string" } ], "produces": [ @@ -2106,16 +2117,20 @@ var doc = `{ } } }, - "summary": "获取业务系统信息(单条)", + "summary": "增加业务系统信息", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "businessCode" + "businessCode", + "businessName" ], "x-lengthlimit": [ { - "businessCode": "6,6" + "businessCode": "6:6" + }, + { + "businessName": "1:50" } ], "x-rolelimit": [ @@ -2123,12 +2138,12 @@ var doc = `{ ] } }, - "/base/business/AddBaseBusiness": { + "/base/business/DeleteBaseBusiness": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "增加业务系统信息", + "description": "删除业务系统信息", "parameters": [ { "description": "业务系统编码", @@ -2136,13 +2151,6 @@ var doc = `{ "name": "businessCode", "required": true, "type": "string" - }, - { - "description": "业务系统名称", - "in": "formData", - "name": "businessName", - "required": true, - "type": "string" } ], "produces": [ @@ -2156,20 +2164,16 @@ var doc = `{ } } }, - "summary": "增加业务系统信息", + "summary": "删除业务系统信息", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "businessCode", - "businessName" + "businessCode" ], "x-lengthlimit": [ { - "businessCode": "6:6" - }, - { - "businessName": "1:50" + "businessCode": "6,6" } ], "x-rolelimit": [ @@ -2177,26 +2181,26 @@ var doc = `{ ] } }, - "/base/business/UpdateBaseBusiness": { - "post": { + "/base/business/PageBaseBusiness": { + "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "修改业务系统信息", + "description": "获取业务系统信息(列表)", "parameters": [ { - "description": "业务系统编码", - "in": "formData", - "name": "businessCode", + "description": "第几页", + "in": "query", + "name": "page", "required": true, - "type": "string" + "type": "integer" }, { - "description": "业务系统名称", - "in": "formData", - "name": "businessName", + "description": "一页显示多少条", + "in": "query", + "name": "limit", "required": true, - "type": "string" + "type": "integer" } ], "produces": [ @@ -2210,21 +2214,17 @@ var doc = `{ } } }, - "summary": "修改业务系统信息", + "summary": "获取业务系统信息(列表)", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "businessCode", - "businessName" + "page", + "limit" ], - "x-lengthlimit": [ - { - "businessCode": "6,6" - }, - { - "businessName": "1:50" - } + "x-intlimit": [ + "page", + "limit" ], "x-rolelimit": [ "1" @@ -3554,12 +3554,12 @@ var doc = `{ ] } }, - "/base/student/ExportStudentAccountExcel": { + "/base/student/ExportStudentExcel": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "导出本校学生账号信息到EXCEL", + "description": "导出本校学生信息到EXCEL", "parameters": [ { "description": "学校ID", @@ -3586,7 +3586,7 @@ var doc = `{ } } }, - "summary": "导出本校学生账号信息到EXCEL", + "summary": "导出本校学生信息到EXCEL", "tags": [ "学生信息" ], @@ -3611,12 +3611,12 @@ var doc = `{ ] } }, - "/base/student/ExportStudentExcel": { + "/base/student/ExportStudentAccountExcel": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "导出本校学生信息到EXCEL", + "description": "导出本校学生账号信息到EXCEL", "parameters": [ { "description": "学校ID", @@ -3643,7 +3643,7 @@ var doc = `{ } } }, - "summary": "导出本校学生信息到EXCEL", + "summary": "导出本校学生账号信息到EXCEL", "tags": [ "学生信息" ], @@ -5319,6 +5319,12 @@ var doc = `{ "name": "rxnf", "required": true, "type": "integer" + }, + { + "description": "需要滤掉的班级ID", + "in": "query", + "name": "removeClassId", + "type": "string" } ], "produces": [ @@ -8779,95 +8785,27 @@ var doc = `{ ] } }, - "/base/area/AddGovArea": { - "post": { + "/base/area/PageGovArea": { + "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "增加行政区划信息", + "description": "获取行政区划信息(列表)", "parameters": [ { - "description": "区域代码", - "in": "formData", - "name": "areaCode", - "required": true, - "type": "string" - }, - { - "description": "区域名称", - "in": "formData", - "name": "areaName", - "required": true, - "type": "string" - }, - { - "description": "上级代码", - "in": "formData", - "name": "masterCode", + "description": "第几页", + "in": "query", + "name": "page", "required": true, - "type": "string" + "type": "integer" }, { - "description": "区域类型", - "in": "formData", - "name": "areaTypeId", + "description": "一页显示多少条", + "in": "query", + "name": "limit", "required": true, "type": "integer" - } - ], - "produces": [ - "application/json" - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/Model.Res" - } - } - }, - "summary": "增加行政区划信息", - "tags": [ - "行政区划" - ], - "x-emptylimit": [ - "areaTypeId", - "areaCode", - "areaName", - "masterCode" - ], - "x-intlimit": [ - "areaTypeId" - ], - "x-lengthlimit": [ - { - "areaCode": "6,6" - }, - { - "masterCode": "6,6" }, - { - "areaName": "3,50" - } - ], - "x-rolelimit": [ - "1", - "2", - "3", - "4", - "5", - "6", - "7" - ] - } - }, - "/base/area/GetGovArea": { - "get": { - "consumes": [ - "application/x-www-form-urlencoded" - ], - "description": "获取行政区划信息(单条)", - "parameters": [ { "description": "行政区划码", "in": "query", @@ -8883,18 +8821,22 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/Model.Res" + "$ref": "#/definitions/base.area.PageGovArea" } } }, - "summary": "获取行政区划信息(单条)", + "summary": "获取行政区划信息(列表)", "tags": [ "行政区划" ], "x-emptylimit": [ + "page", + "limit", "areaCode" ], "x-intlimit": [ + "page", + "limit", "areaCode" ], "x-lengthlimit": [ @@ -8910,15 +8852,18 @@ var doc = `{ "5", "6", "7" + ], + "x-tablename": [ + "t_gov_area" ] } }, - "/base/area/UpdateGovArea": { + "/base/area/AddGovArea": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "修改行政区划信息", + "description": "增加行政区划信息", "parameters": [ { "description": "区域代码", @@ -8960,7 +8905,7 @@ var doc = `{ } } }, - "summary": "修改行政区划信息", + "summary": "增加行政区划信息", "tags": [ "行政区划" ], @@ -8981,7 +8926,7 @@ var doc = `{ "masterCode": "6,6" }, { - "areaName": "3:50" + "areaName": "3,50" } ], "x-rolelimit": [ @@ -8995,27 +8940,13 @@ var doc = `{ ] } }, - "/base/area/PageGovArea": { + "/base/area/GetGovArea": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取行政区划信息(列表)", + "description": "获取行政区划信息(单条)", "parameters": [ - { - "description": "第几页", - "in": "query", - "name": "page", - "required": true, - "type": "integer" - }, - { - "description": "一页显示多少条", - "in": "query", - "name": "limit", - "required": true, - "type": "integer" - }, { "description": "行政区划码", "in": "query", @@ -9031,22 +8962,18 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/base.area.PageGovArea" + "$ref": "#/definitions/Model.Res" } } }, - "summary": "获取行政区划信息(列表)", + "summary": "获取行政区划信息(单条)", "tags": [ "行政区划" ], "x-emptylimit": [ - "page", - "limit", "areaCode" ], "x-intlimit": [ - "page", - "limit", "areaCode" ], "x-lengthlimit": [ @@ -9062,9 +8989,6 @@ var doc = `{ "5", "6", "7" - ], - "x-tablename": [ - "t_gov_area" ] } }, @@ -9117,6 +9041,88 @@ var doc = `{ ] } }, + "/base/area/UpdateGovArea": { + "post": { + "consumes": [ + "application/x-www-form-urlencoded" + ], + "description": "修改行政区划信息", + "parameters": [ + { + "description": "区域代码", + "in": "formData", + "name": "areaCode", + "required": true, + "type": "string" + }, + { + "description": "区域名称", + "in": "formData", + "name": "areaName", + "required": true, + "type": "string" + }, + { + "description": "上级代码", + "in": "formData", + "name": "masterCode", + "required": true, + "type": "string" + }, + { + "description": "区域类型", + "in": "formData", + "name": "areaTypeId", + "required": true, + "type": "integer" + } + ], + "produces": [ + "application/json" + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Model.Res" + } + } + }, + "summary": "修改行政区划信息", + "tags": [ + "行政区划" + ], + "x-emptylimit": [ + "areaTypeId", + "areaCode", + "areaName", + "masterCode" + ], + "x-intlimit": [ + "areaTypeId" + ], + "x-lengthlimit": [ + { + "areaCode": "6,6" + }, + { + "masterCode": "6,6" + }, + { + "areaName": "3:50" + } + ], + "x-rolelimit": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7" + ] + } + }, "/base/role/GetManageAreaInfo": { "get": { "consumes": [ diff --git a/dsBaseWeb/docs/swagger.json b/dsBaseWeb/docs/swagger.json index c5e60a93..274851c2 100644 --- a/dsBaseWeb/docs/swagger.json +++ b/dsBaseWeb/docs/swagger.json @@ -1972,26 +1972,26 @@ "version": "1.0" }, "paths": { - "/base/business/PageBaseBusiness": { - "get": { + "/base/business/UpdateBaseBusiness": { + "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取业务系统信息(列表)", + "description": "修改业务系统信息", "parameters": [ { - "description": "第几页", - "in": "query", - "name": "page", + "description": "业务系统编码", + "in": "formData", + "name": "businessCode", "required": true, - "type": "integer" + "type": "string" }, { - "description": "一页显示多少条", - "in": "query", - "name": "limit", + "description": "业务系统名称", + "in": "formData", + "name": "businessName", "required": true, - "type": "integer" + "type": "string" } ], "produces": [ @@ -2005,33 +2005,37 @@ } } }, - "summary": "获取业务系统信息(列表)", + "summary": "修改业务系统信息", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "page", - "limit" + "businessCode", + "businessName" ], - "x-intlimit": [ - "page", - "limit" + "x-lengthlimit": [ + { + "businessCode": "6,6" + }, + { + "businessName": "1:50" + } ], "x-rolelimit": [ "1" ] } }, - "/base/business/DeleteBaseBusiness": { - "post": { + "/base/business/GetBaseBusiness": { + "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "删除业务系统信息", + "description": "获取业务系统信息(单条)", "parameters": [ { "description": "业务系统编码", - "in": "formData", + "in": "query", "name": "businessCode", "required": true, "type": "string" @@ -2048,7 +2052,7 @@ } } }, - "summary": "删除业务系统信息", + "summary": "获取业务系统信息(单条)", "tags": [ "业务系统维护" ], @@ -2065,19 +2069,26 @@ ] } }, - "/base/business/GetBaseBusiness": { - "get": { + "/base/business/AddBaseBusiness": { + "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取业务系统信息(单条)", + "description": "增加业务系统信息", "parameters": [ { "description": "业务系统编码", - "in": "query", + "in": "formData", "name": "businessCode", "required": true, "type": "string" + }, + { + "description": "业务系统名称", + "in": "formData", + "name": "businessName", + "required": true, + "type": "string" } ], "produces": [ @@ -2091,16 +2102,20 @@ } } }, - "summary": "获取业务系统信息(单条)", + "summary": "增加业务系统信息", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "businessCode" + "businessCode", + "businessName" ], "x-lengthlimit": [ { - "businessCode": "6,6" + "businessCode": "6:6" + }, + { + "businessName": "1:50" } ], "x-rolelimit": [ @@ -2108,12 +2123,12 @@ ] } }, - "/base/business/AddBaseBusiness": { + "/base/business/DeleteBaseBusiness": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "增加业务系统信息", + "description": "删除业务系统信息", "parameters": [ { "description": "业务系统编码", @@ -2121,13 +2136,6 @@ "name": "businessCode", "required": true, "type": "string" - }, - { - "description": "业务系统名称", - "in": "formData", - "name": "businessName", - "required": true, - "type": "string" } ], "produces": [ @@ -2141,20 +2149,16 @@ } } }, - "summary": "增加业务系统信息", + "summary": "删除业务系统信息", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "businessCode", - "businessName" + "businessCode" ], "x-lengthlimit": [ { - "businessCode": "6:6" - }, - { - "businessName": "1:50" + "businessCode": "6,6" } ], "x-rolelimit": [ @@ -2162,26 +2166,26 @@ ] } }, - "/base/business/UpdateBaseBusiness": { - "post": { + "/base/business/PageBaseBusiness": { + "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "修改业务系统信息", + "description": "获取业务系统信息(列表)", "parameters": [ { - "description": "业务系统编码", - "in": "formData", - "name": "businessCode", + "description": "第几页", + "in": "query", + "name": "page", "required": true, - "type": "string" + "type": "integer" }, { - "description": "业务系统名称", - "in": "formData", - "name": "businessName", + "description": "一页显示多少条", + "in": "query", + "name": "limit", "required": true, - "type": "string" + "type": "integer" } ], "produces": [ @@ -2195,21 +2199,17 @@ } } }, - "summary": "修改业务系统信息", + "summary": "获取业务系统信息(列表)", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "businessCode", - "businessName" + "page", + "limit" ], - "x-lengthlimit": [ - { - "businessCode": "6,6" - }, - { - "businessName": "1:50" - } + "x-intlimit": [ + "page", + "limit" ], "x-rolelimit": [ "1" @@ -3539,12 +3539,12 @@ ] } }, - "/base/student/ExportStudentAccountExcel": { + "/base/student/ExportStudentExcel": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "导出本校学生账号信息到EXCEL", + "description": "导出本校学生信息到EXCEL", "parameters": [ { "description": "学校ID", @@ -3571,7 +3571,7 @@ } } }, - "summary": "导出本校学生账号信息到EXCEL", + "summary": "导出本校学生信息到EXCEL", "tags": [ "学生信息" ], @@ -3596,12 +3596,12 @@ ] } }, - "/base/student/ExportStudentExcel": { + "/base/student/ExportStudentAccountExcel": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "导出本校学生信息到EXCEL", + "description": "导出本校学生账号信息到EXCEL", "parameters": [ { "description": "学校ID", @@ -3628,7 +3628,7 @@ } } }, - "summary": "导出本校学生信息到EXCEL", + "summary": "导出本校学生账号信息到EXCEL", "tags": [ "学生信息" ], @@ -5304,6 +5304,12 @@ "name": "rxnf", "required": true, "type": "integer" + }, + { + "description": "需要滤掉的班级ID", + "in": "query", + "name": "removeClassId", + "type": "string" } ], "produces": [ @@ -8764,95 +8770,27 @@ ] } }, - "/base/area/AddGovArea": { - "post": { + "/base/area/PageGovArea": { + "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "增加行政区划信息", + "description": "获取行政区划信息(列表)", "parameters": [ { - "description": "区域代码", - "in": "formData", - "name": "areaCode", - "required": true, - "type": "string" - }, - { - "description": "区域名称", - "in": "formData", - "name": "areaName", - "required": true, - "type": "string" - }, - { - "description": "上级代码", - "in": "formData", - "name": "masterCode", + "description": "第几页", + "in": "query", + "name": "page", "required": true, - "type": "string" + "type": "integer" }, { - "description": "区域类型", - "in": "formData", - "name": "areaTypeId", + "description": "一页显示多少条", + "in": "query", + "name": "limit", "required": true, "type": "integer" - } - ], - "produces": [ - "application/json" - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/Model.Res" - } - } - }, - "summary": "增加行政区划信息", - "tags": [ - "行政区划" - ], - "x-emptylimit": [ - "areaTypeId", - "areaCode", - "areaName", - "masterCode" - ], - "x-intlimit": [ - "areaTypeId" - ], - "x-lengthlimit": [ - { - "areaCode": "6,6" - }, - { - "masterCode": "6,6" }, - { - "areaName": "3,50" - } - ], - "x-rolelimit": [ - "1", - "2", - "3", - "4", - "5", - "6", - "7" - ] - } - }, - "/base/area/GetGovArea": { - "get": { - "consumes": [ - "application/x-www-form-urlencoded" - ], - "description": "获取行政区划信息(单条)", - "parameters": [ { "description": "行政区划码", "in": "query", @@ -8868,18 +8806,22 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/Model.Res" + "$ref": "#/definitions/base.area.PageGovArea" } } }, - "summary": "获取行政区划信息(单条)", + "summary": "获取行政区划信息(列表)", "tags": [ "行政区划" ], "x-emptylimit": [ + "page", + "limit", "areaCode" ], "x-intlimit": [ + "page", + "limit", "areaCode" ], "x-lengthlimit": [ @@ -8895,15 +8837,18 @@ "5", "6", "7" + ], + "x-tablename": [ + "t_gov_area" ] } }, - "/base/area/UpdateGovArea": { + "/base/area/AddGovArea": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "修改行政区划信息", + "description": "增加行政区划信息", "parameters": [ { "description": "区域代码", @@ -8945,7 +8890,7 @@ } } }, - "summary": "修改行政区划信息", + "summary": "增加行政区划信息", "tags": [ "行政区划" ], @@ -8966,7 +8911,7 @@ "masterCode": "6,6" }, { - "areaName": "3:50" + "areaName": "3,50" } ], "x-rolelimit": [ @@ -8980,27 +8925,13 @@ ] } }, - "/base/area/PageGovArea": { + "/base/area/GetGovArea": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取行政区划信息(列表)", + "description": "获取行政区划信息(单条)", "parameters": [ - { - "description": "第几页", - "in": "query", - "name": "page", - "required": true, - "type": "integer" - }, - { - "description": "一页显示多少条", - "in": "query", - "name": "limit", - "required": true, - "type": "integer" - }, { "description": "行政区划码", "in": "query", @@ -9016,22 +8947,18 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/base.area.PageGovArea" + "$ref": "#/definitions/Model.Res" } } }, - "summary": "获取行政区划信息(列表)", + "summary": "获取行政区划信息(单条)", "tags": [ "行政区划" ], "x-emptylimit": [ - "page", - "limit", "areaCode" ], "x-intlimit": [ - "page", - "limit", "areaCode" ], "x-lengthlimit": [ @@ -9047,9 +8974,6 @@ "5", "6", "7" - ], - "x-tablename": [ - "t_gov_area" ] } }, @@ -9102,6 +9026,88 @@ ] } }, + "/base/area/UpdateGovArea": { + "post": { + "consumes": [ + "application/x-www-form-urlencoded" + ], + "description": "修改行政区划信息", + "parameters": [ + { + "description": "区域代码", + "in": "formData", + "name": "areaCode", + "required": true, + "type": "string" + }, + { + "description": "区域名称", + "in": "formData", + "name": "areaName", + "required": true, + "type": "string" + }, + { + "description": "上级代码", + "in": "formData", + "name": "masterCode", + "required": true, + "type": "string" + }, + { + "description": "区域类型", + "in": "formData", + "name": "areaTypeId", + "required": true, + "type": "integer" + } + ], + "produces": [ + "application/json" + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Model.Res" + } + } + }, + "summary": "修改行政区划信息", + "tags": [ + "行政区划" + ], + "x-emptylimit": [ + "areaTypeId", + "areaCode", + "areaName", + "masterCode" + ], + "x-intlimit": [ + "areaTypeId" + ], + "x-lengthlimit": [ + { + "areaCode": "6,6" + }, + { + "masterCode": "6,6" + }, + { + "areaName": "3:50" + } + ], + "x-rolelimit": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7" + ] + } + }, "/base/role/GetManageAreaInfo": { "get": { "consumes": [ diff --git a/dsBaseWeb/docs/swagger.yaml b/dsBaseWeb/docs/swagger.yaml index cb867b9c..3e38a9a8 100644 --- a/dsBaseWeb/docs/swagger.yaml +++ b/dsBaseWeb/docs/swagger.yaml @@ -2154,6 +2154,10 @@ paths: name: rxnf required: true type: integer + - description: 需要滤掉的班级ID + in: query + name: removeClassId + type: string produces: - application/json responses: