diff --git a/dsBaseWeb/Business/BasePosition/BasePositionController/BasePositionController.go b/dsBaseWeb/Business/BasePosition/BasePositionController/BasePositionController.go index 633f59b5..3f26048e 100644 --- a/dsBaseWeb/Business/BasePosition/BasePositionController/BasePositionController.go +++ b/dsBaseWeb/Business/BasePosition/BasePositionController/BasePositionController.go @@ -204,7 +204,7 @@ func TreePositionInfo(c *gin.Context) { // @Router /base/position/ListPositionByBureauId [get] // @X-EmptyLimit ["bureauId"] // @X-LengthLimit [{"bureauId":"36,36"}] -// @X-RoleLimit ["1"] +// @X-RoleLimit ["1","3","4"] // @X-Sort [6] func ListPositionByBureauId(c *gin.Context) { //职务ID diff --git a/dsBaseWeb/docs/docs.go b/dsBaseWeb/docs/docs.go index df767b8c..23e49160 100644 --- a/dsBaseWeb/docs/docs.go +++ b/dsBaseWeb/docs/docs.go @@ -2074,16 +2074,16 @@ var doc = `{ "version": "1.0" }, "paths": { - "/base/business/GetBaseBusiness": { - "get": { + "/base/business/DeleteBaseBusiness": { + "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取业务系统信息(单条)", + "description": "删除业务系统信息", "parameters": [ { "description": "业务系统编码", - "in": "query", + "in": "formData", "name": "businessCode", "required": true, "type": "string" @@ -2100,7 +2100,7 @@ var doc = `{ } } }, - "summary": "获取业务系统信息(单条)", + "summary": "删除业务系统信息", "tags": [ "业务系统维护" ], @@ -2167,16 +2167,16 @@ var doc = `{ ] } }, - "/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" @@ -2193,7 +2193,7 @@ var doc = `{ } } }, - "summary": "删除业务系统信息", + "summary": "获取业务系统信息(单条)", "tags": [ "业务系统维护" ], @@ -2210,12 +2210,12 @@ var doc = `{ ] } }, - "/base/business/UpdateBaseBusiness": { + "/base/business/AddBaseBusiness": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "修改业务系统信息", + "description": "增加业务系统信息", "parameters": [ { "description": "业务系统编码", @@ -2243,7 +2243,7 @@ var doc = `{ } } }, - "summary": "修改业务系统信息", + "summary": "增加业务系统信息", "tags": [ "业务系统维护" ], @@ -2253,7 +2253,7 @@ var doc = `{ ], "x-lengthlimit": [ { - "businessCode": "6,6" + "businessCode": "6:6" }, { "businessName": "1:50" @@ -2264,12 +2264,12 @@ var doc = `{ ] } }, - "/base/business/AddBaseBusiness": { + "/base/business/UpdateBaseBusiness": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "增加业务系统信息", + "description": "修改业务系统信息", "parameters": [ { "description": "业务系统编码", @@ -2297,7 +2297,7 @@ var doc = `{ } } }, - "summary": "增加业务系统信息", + "summary": "修改业务系统信息", "tags": [ "业务系统维护" ], @@ -2307,7 +2307,7 @@ var doc = `{ ], "x-lengthlimit": [ { - "businessCode": "6:6" + "businessCode": "6,6" }, { "businessName": "1:50" @@ -3686,12 +3686,12 @@ var doc = `{ ] } }, - "/base/student/ExportStudentExcel": { + "/base/student/ExportStudentAccountExcel": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "导出本校学生信息到EXCEL", + "description": "导出本校学生账号信息到EXCEL", "parameters": [ { "description": "学校ID", @@ -3718,7 +3718,7 @@ var doc = `{ } } }, - "summary": "导出本校学生信息到EXCEL", + "summary": "导出本校学生账号信息到EXCEL", "tags": [ "学生信息" ], @@ -3743,12 +3743,12 @@ var doc = `{ ] } }, - "/base/student/ExportStudentAccountExcel": { + "/base/student/ExportStudentExcel": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "导出本校学生账号信息到EXCEL", + "description": "导出本校学生信息到EXCEL", "parameters": [ { "description": "学校ID", @@ -3775,7 +3775,7 @@ var doc = `{ } } }, - "summary": "导出本校学生账号信息到EXCEL", + "summary": "导出本校学生信息到EXCEL", "tags": [ "学生信息" ], @@ -8117,12 +8117,12 @@ var doc = `{ ] } }, - "/base/organization/PageMainSchoolInfo": { + "/base/organization/PageSchoolInfo": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取主校列表", + "description": "获取学校列表", "parameters": [ { "description": "第几页", @@ -8146,9 +8146,16 @@ var doc = `{ "type": "string" }, { - "description": "学校ID，增加学校时无需传，修改学校时需要传被修改学校的ID", + "description": "学校办学类型 -1：全部", "in": "query", - "name": "orgId", + "name": "xxbxlxm", + "required": true, + "type": "string" + }, + { + "description": "学校名称", + "in": "query", + "name": "orgName", "type": "string" } ], @@ -8159,11 +8166,11 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/base.organization.PageMainSchoolInfo" + "$ref": "#/definitions/base.organization.PageSchoolInfo" } } }, - "summary": "获取主校列表", + "summary": "获取学校列表", "tags": [ "组织机构" ], @@ -8193,6 +8200,9 @@ var doc = `{ "x-lengthlimit": [ { "areaCode": "6,6" + }, + { + "orgName": "1,30" } ], "x-removeswaggerfield": [ @@ -8235,12 +8245,12 @@ var doc = `{ ] } }, - "/base/organization/PageSchoolInfo": { + "/base/organization/PageMainSchoolInfo": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取学校列表", + "description": "获取主校列表", "parameters": [ { "description": "第几页", @@ -8264,16 +8274,9 @@ var doc = `{ "type": "string" }, { - "description": "学校办学类型 -1：全部", - "in": "query", - "name": "xxbxlxm", - "required": true, - "type": "string" - }, - { - "description": "学校名称", + "description": "学校ID，增加学校时无需传，修改学校时需要传被修改学校的ID", "in": "query", - "name": "orgName", + "name": "orgId", "type": "string" } ], @@ -8284,11 +8287,11 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/base.organization.PageSchoolInfo" + "$ref": "#/definitions/base.organization.PageMainSchoolInfo" } } }, - "summary": "获取学校列表", + "summary": "获取主校列表", "tags": [ "组织机构" ], @@ -8318,9 +8321,6 @@ var doc = `{ "x-lengthlimit": [ { "areaCode": "6,6" - }, - { - "orgName": "1,30" } ], "x-removeswaggerfield": [ @@ -9821,7 +9821,9 @@ var doc = `{ } ], "x-rolelimit": [ - "1" + "1", + "3", + "4" ], "x-sort": [ 6 @@ -9910,30 +9912,16 @@ var doc = `{ ] } }, - "/base/area/PageGovArea": { - "get": { + "/base/area/DeleteGovArea": { + "post": { "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", + "description": "区域代码", + "in": "formData", "name": "areaCode", "required": true, "type": "string" @@ -9946,22 +9934,15 @@ 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": [ @@ -9977,9 +9958,6 @@ var doc = `{ "5", "6", "7" - ], - "x-tablename": [ - "t_gov_area" ] } }, @@ -10035,40 +10013,33 @@ var doc = `{ ] } }, - "/base/area/AddGovArea": { - "post": { + "/base/area/PageGovArea": { + "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "增加行政区划信息", + "description": "获取行政区划信息(列表)", "parameters": [ { - "description": "区域代码", - "in": "formData", - "name": "areaCode", + "description": "第几页", + "in": "query", + "name": "page", "required": true, - "type": "string" + "type": "integer" }, { - "description": "区域名称", - "in": "formData", - "name": "areaName", + "description": "一页显示多少条", + "in": "query", + "name": "limit", "required": true, - "type": "string" + "type": "integer" }, { - "description": "上级代码", - "in": "formData", - "name": "masterCode", + "description": "行政区划码", + "in": "query", + "name": "areaCode", "required": true, "type": "string" - }, - { - "description": "区域类型", - "in": "formData", - "name": "areaTypeId", - "required": true, - "type": "integer" } ], "produces": [ @@ -10078,32 +10049,27 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/Model.Res" + "$ref": "#/definitions/base.area.PageGovArea" } } }, - "summary": "增加行政区划信息", + "summary": "获取行政区划信息(列表)", "tags": [ "行政区划" ], "x-emptylimit": [ - "areaTypeId", - "areaCode", - "areaName", - "masterCode" + "page", + "limit", + "areaCode" ], "x-intlimit": [ - "areaTypeId" + "page", + "limit", + "areaCode" ], "x-lengthlimit": [ { "areaCode": "6,6" - }, - { - "masterCode": "6,6" - }, - { - "areaName": "3,50" } ], "x-rolelimit": [ @@ -10114,15 +10080,18 @@ var doc = `{ "5", "6", "7" + ], + "x-tablename": [ + "t_gov_area" ] } }, - "/base/area/DeleteGovArea": { + "/base/area/AddGovArea": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "删除行政区划信息", + "description": "增加行政区划信息", "parameters": [ { "description": "区域代码", @@ -10130,6 +10099,27 @@ var doc = `{ "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": [ @@ -10143,16 +10133,28 @@ var doc = `{ } } }, - "summary": "删除行政区划信息", + "summary": "增加行政区划信息", "tags": [ "行政区划" ], "x-emptylimit": [ - "areaCode" + "areaTypeId", + "areaCode", + "areaName", + "masterCode" + ], + "x-intlimit": [ + "areaTypeId" ], "x-lengthlimit": [ { "areaCode": "6,6" + }, + { + "masterCode": "6,6" + }, + { + "areaName": "3,50" } ], "x-rolelimit": [ diff --git a/dsBaseWeb/docs/swagger.json b/dsBaseWeb/docs/swagger.json index 1619c5bd..9fde49a5 100644 --- a/dsBaseWeb/docs/swagger.json +++ b/dsBaseWeb/docs/swagger.json @@ -2059,16 +2059,16 @@ "version": "1.0" }, "paths": { - "/base/business/GetBaseBusiness": { - "get": { + "/base/business/DeleteBaseBusiness": { + "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取业务系统信息(单条)", + "description": "删除业务系统信息", "parameters": [ { "description": "业务系统编码", - "in": "query", + "in": "formData", "name": "businessCode", "required": true, "type": "string" @@ -2085,7 +2085,7 @@ } } }, - "summary": "获取业务系统信息(单条)", + "summary": "删除业务系统信息", "tags": [ "业务系统维护" ], @@ -2152,16 +2152,16 @@ ] } }, - "/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" @@ -2178,7 +2178,7 @@ } } }, - "summary": "删除业务系统信息", + "summary": "获取业务系统信息(单条)", "tags": [ "业务系统维护" ], @@ -2195,12 +2195,12 @@ ] } }, - "/base/business/UpdateBaseBusiness": { + "/base/business/AddBaseBusiness": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "修改业务系统信息", + "description": "增加业务系统信息", "parameters": [ { "description": "业务系统编码", @@ -2228,7 +2228,7 @@ } } }, - "summary": "修改业务系统信息", + "summary": "增加业务系统信息", "tags": [ "业务系统维护" ], @@ -2238,7 +2238,7 @@ ], "x-lengthlimit": [ { - "businessCode": "6,6" + "businessCode": "6:6" }, { "businessName": "1:50" @@ -2249,12 +2249,12 @@ ] } }, - "/base/business/AddBaseBusiness": { + "/base/business/UpdateBaseBusiness": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "增加业务系统信息", + "description": "修改业务系统信息", "parameters": [ { "description": "业务系统编码", @@ -2282,7 +2282,7 @@ } } }, - "summary": "增加业务系统信息", + "summary": "修改业务系统信息", "tags": [ "业务系统维护" ], @@ -2292,7 +2292,7 @@ ], "x-lengthlimit": [ { - "businessCode": "6:6" + "businessCode": "6,6" }, { "businessName": "1:50" @@ -3671,12 +3671,12 @@ ] } }, - "/base/student/ExportStudentExcel": { + "/base/student/ExportStudentAccountExcel": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "导出本校学生信息到EXCEL", + "description": "导出本校学生账号信息到EXCEL", "parameters": [ { "description": "学校ID", @@ -3703,7 +3703,7 @@ } } }, - "summary": "导出本校学生信息到EXCEL", + "summary": "导出本校学生账号信息到EXCEL", "tags": [ "学生信息" ], @@ -3728,12 +3728,12 @@ ] } }, - "/base/student/ExportStudentAccountExcel": { + "/base/student/ExportStudentExcel": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "导出本校学生账号信息到EXCEL", + "description": "导出本校学生信息到EXCEL", "parameters": [ { "description": "学校ID", @@ -3760,7 +3760,7 @@ } } }, - "summary": "导出本校学生账号信息到EXCEL", + "summary": "导出本校学生信息到EXCEL", "tags": [ "学生信息" ], @@ -8102,12 +8102,12 @@ ] } }, - "/base/organization/PageMainSchoolInfo": { + "/base/organization/PageSchoolInfo": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取主校列表", + "description": "获取学校列表", "parameters": [ { "description": "第几页", @@ -8131,9 +8131,16 @@ "type": "string" }, { - "description": "学校ID，增加学校时无需传，修改学校时需要传被修改学校的ID", + "description": "学校办学类型 -1：全部", "in": "query", - "name": "orgId", + "name": "xxbxlxm", + "required": true, + "type": "string" + }, + { + "description": "学校名称", + "in": "query", + "name": "orgName", "type": "string" } ], @@ -8144,11 +8151,11 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/base.organization.PageMainSchoolInfo" + "$ref": "#/definitions/base.organization.PageSchoolInfo" } } }, - "summary": "获取主校列表", + "summary": "获取学校列表", "tags": [ "组织机构" ], @@ -8178,6 +8185,9 @@ "x-lengthlimit": [ { "areaCode": "6,6" + }, + { + "orgName": "1,30" } ], "x-removeswaggerfield": [ @@ -8220,12 +8230,12 @@ ] } }, - "/base/organization/PageSchoolInfo": { + "/base/organization/PageMainSchoolInfo": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取学校列表", + "description": "获取主校列表", "parameters": [ { "description": "第几页", @@ -8249,16 +8259,9 @@ "type": "string" }, { - "description": "学校办学类型 -1：全部", - "in": "query", - "name": "xxbxlxm", - "required": true, - "type": "string" - }, - { - "description": "学校名称", + "description": "学校ID，增加学校时无需传，修改学校时需要传被修改学校的ID", "in": "query", - "name": "orgName", + "name": "orgId", "type": "string" } ], @@ -8269,11 +8272,11 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/base.organization.PageSchoolInfo" + "$ref": "#/definitions/base.organization.PageMainSchoolInfo" } } }, - "summary": "获取学校列表", + "summary": "获取主校列表", "tags": [ "组织机构" ], @@ -8303,9 +8306,6 @@ "x-lengthlimit": [ { "areaCode": "6,6" - }, - { - "orgName": "1,30" } ], "x-removeswaggerfield": [ @@ -9806,7 +9806,9 @@ } ], "x-rolelimit": [ - "1" + "1", + "3", + "4" ], "x-sort": [ 6 @@ -9895,30 +9897,16 @@ ] } }, - "/base/area/PageGovArea": { - "get": { + "/base/area/DeleteGovArea": { + "post": { "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", + "description": "区域代码", + "in": "formData", "name": "areaCode", "required": true, "type": "string" @@ -9931,22 +9919,15 @@ "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": [ @@ -9962,9 +9943,6 @@ "5", "6", "7" - ], - "x-tablename": [ - "t_gov_area" ] } }, @@ -10020,40 +9998,33 @@ ] } }, - "/base/area/AddGovArea": { - "post": { + "/base/area/PageGovArea": { + "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "增加行政区划信息", + "description": "获取行政区划信息(列表)", "parameters": [ { - "description": "区域代码", - "in": "formData", - "name": "areaCode", + "description": "第几页", + "in": "query", + "name": "page", "required": true, - "type": "string" + "type": "integer" }, { - "description": "区域名称", - "in": "formData", - "name": "areaName", + "description": "一页显示多少条", + "in": "query", + "name": "limit", "required": true, - "type": "string" + "type": "integer" }, { - "description": "上级代码", - "in": "formData", - "name": "masterCode", + "description": "行政区划码", + "in": "query", + "name": "areaCode", "required": true, "type": "string" - }, - { - "description": "区域类型", - "in": "formData", - "name": "areaTypeId", - "required": true, - "type": "integer" } ], "produces": [ @@ -10063,32 +10034,27 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/Model.Res" + "$ref": "#/definitions/base.area.PageGovArea" } } }, - "summary": "增加行政区划信息", + "summary": "获取行政区划信息(列表)", "tags": [ "行政区划" ], "x-emptylimit": [ - "areaTypeId", - "areaCode", - "areaName", - "masterCode" + "page", + "limit", + "areaCode" ], "x-intlimit": [ - "areaTypeId" + "page", + "limit", + "areaCode" ], "x-lengthlimit": [ { "areaCode": "6,6" - }, - { - "masterCode": "6,6" - }, - { - "areaName": "3,50" } ], "x-rolelimit": [ @@ -10099,15 +10065,18 @@ "5", "6", "7" + ], + "x-tablename": [ + "t_gov_area" ] } }, - "/base/area/DeleteGovArea": { + "/base/area/AddGovArea": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "删除行政区划信息", + "description": "增加行政区划信息", "parameters": [ { "description": "区域代码", @@ -10115,6 +10084,27 @@ "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": [ @@ -10128,16 +10118,28 @@ } } }, - "summary": "删除行政区划信息", + "summary": "增加行政区划信息", "tags": [ "行政区划" ], "x-emptylimit": [ - "areaCode" + "areaTypeId", + "areaCode", + "areaName", + "masterCode" + ], + "x-intlimit": [ + "areaTypeId" ], "x-lengthlimit": [ { "areaCode": "6,6" + }, + { + "masterCode": "6,6" + }, + { + "areaName": "3,50" } ], "x-rolelimit": [ diff --git a/dsBaseWeb/docs/swagger.yaml b/dsBaseWeb/docs/swagger.yaml index 359cd0fc..57c904a3 100644 --- a/dsBaseWeb/docs/swagger.yaml +++ b/dsBaseWeb/docs/swagger.yaml @@ -5061,6 +5061,8 @@ paths: - bureauId: 36,36 x-rolelimit: - "1" + - "3" + - "4" x-sort: - 6 /base/position/TreePositionInfo: