From c56699c2dbeaa77bd9f1ae0e7c685a72dd1c770d Mon Sep 17 00:00:00 2001 From: wubin Date: Mon, 6 Jul 2020 14:13:44 +0800 Subject: [PATCH] update --- dsBaseWeb/docs/docs.go | 281 ++++++++++++++++++------------------ dsBaseWeb/docs/swagger.json | 281 ++++++++++++++++++------------------ dsBaseWeb/docs/swagger.yaml | 18 ++- dsBaseWeb/main.go | 2 +- 4 files changed, 297 insertions(+), 285 deletions(-) diff --git a/dsBaseWeb/docs/docs.go b/dsBaseWeb/docs/docs.go index 44ce9de8..7d8bcef6 100644 --- a/dsBaseWeb/docs/docs.go +++ b/dsBaseWeb/docs/docs.go @@ -1490,11 +1490,6 @@ var doc = `{ "list": { "items": { "properties": { - "person_name": { - "description": "登录人名称", - "example": "李老师", - "type": "string" - }, "role_id": { "description": "角色ID", "example": "9CD6B804-0F89-4626-A812-29465CFC7410", @@ -1907,12 +1902,12 @@ var doc = `{ "version": "1.0" }, "paths": { - "/base/business/AddBaseBusiness": { + "/base/business/DeleteBaseBusiness": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "增加业务系统信息", + "description": "删除业务系统信息", "parameters": [ { "description": "业务系统编码", @@ -1920,13 +1915,6 @@ var doc = `{ "name": "businessCode", "required": true, "type": "string" - }, - { - "description": "业务系统名称", - "in": "formData", - "name": "businessName", - "required": true, - "type": "string" } ], "produces": [ @@ -1940,20 +1928,16 @@ var doc = `{ } } }, - "summary": "增加业务系统信息", + "summary": "删除业务系统信息", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "businessCode", - "businessName" + "businessCode" ], "x-lengthlimit": [ { - "businessCode": "6:6" - }, - { - "businessName": "1:50" + "businessCode": "6,6" } ], "x-rolelimit": [ @@ -2011,26 +1995,19 @@ var doc = `{ ] } }, - "/base/business/UpdateBaseBusiness": { - "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" - }, - { - "description": "业务系统名称", - "in": "formData", - "name": "businessName", - "required": true, - "type": "string" } ], "produces": [ @@ -2044,20 +2021,16 @@ var doc = `{ } } }, - "summary": "修改业务系统信息", + "summary": "获取业务系统信息(单条)", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "businessCode", - "businessName" + "businessCode" ], "x-lengthlimit": [ { "businessCode": "6,6" - }, - { - "businessName": "1:50" } ], "x-rolelimit": [ @@ -2065,12 +2038,12 @@ var doc = `{ ] } }, - "/base/business/DeleteBaseBusiness": { + "/base/business/UpdateBaseBusiness": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "删除业务系统信息", + "description": "修改业务系统信息", "parameters": [ { "description": "业务系统编码", @@ -2078,6 +2051,13 @@ var doc = `{ "name": "businessCode", "required": true, "type": "string" + }, + { + "description": "业务系统名称", + "in": "formData", + "name": "businessName", + "required": true, + "type": "string" } ], "produces": [ @@ -2091,16 +2071,20 @@ var doc = `{ } } }, - "summary": "删除业务系统信息", + "summary": "修改业务系统信息", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "businessCode" + "businessCode", + "businessName" ], "x-lengthlimit": [ { "businessCode": "6,6" + }, + { + "businessName": "1:50" } ], "x-rolelimit": [ @@ -2108,19 +2092,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": [ @@ -2134,16 +2125,20 @@ var doc = `{ } } }, - "summary": "获取业务系统信息(单条)", + "summary": "增加业务系统信息", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "businessCode" + "businessCode", + "businessName" ], "x-lengthlimit": [ { - "businessCode": "6,6" + "businessCode": "6:6" + }, + { + "businessName": "1:50" } ], "x-rolelimit": [ @@ -3473,12 +3468,12 @@ var doc = `{ ] } }, - "/base/student/ExportStudentAccountExcel": { + "/base/student/ExportStudentExcel": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "导出本校学生账号信息到EXCEL", + "description": "导出本校学生信息到EXCEL", "parameters": [ { "description": "学校ID", @@ -3505,7 +3500,7 @@ var doc = `{ } } }, - "summary": "导出本校学生账号信息到EXCEL", + "summary": "导出本校学生信息到EXCEL", "tags": [ "学生信息" ], @@ -3530,12 +3525,12 @@ var doc = `{ ] } }, - "/base/student/ExportStudentExcel": { + "/base/student/ExportStudentAccountExcel": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "导出本校学生信息到EXCEL", + "description": "导出本校学生账号信息到EXCEL", "parameters": [ { "description": "学校ID", @@ -3562,7 +3557,7 @@ var doc = `{ } } }, - "summary": "导出本校学生信息到EXCEL", + "summary": "导出本校学生账号信息到EXCEL", "tags": [ "学生信息" ], @@ -7361,12 +7356,12 @@ var doc = `{ ] } }, - "/base/organization/PageSchoolInfo": { + "/base/organization/PageMainSchoolInfo": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取学校列表", + "description": "获取主校列表", "parameters": [ { "description": "第几页", @@ -7388,19 +7383,6 @@ var doc = `{ "name": "areaCode", "required": true, "type": "string" - }, - { - "description": "学校办学类型 -1：全部", - "in": "query", - "name": "xxbxlxm", - "required": true, - "type": "string" - }, - { - "description": "学校名称", - "in": "query", - "name": "orgName", - "type": "string" } ], "produces": [ @@ -7410,11 +7392,11 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/base.organization.PageSchoolInfo" + "$ref": "#/definitions/base.organization.PageMainSchoolInfo" } } }, - "summary": "获取学校列表", + "summary": "获取主校列表", "tags": [ "组织机构" ], @@ -7444,9 +7426,6 @@ var doc = `{ "x-lengthlimit": [ { "areaCode": "6,6" - }, - { - "orgName": "1,50" } ], "x-removeswaggerfield": [ @@ -7490,12 +7469,12 @@ var doc = `{ ] } }, - "/base/organization/PageMainSchoolInfo": { + "/base/organization/PageSchoolInfo": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取主校列表", + "description": "获取学校列表", "parameters": [ { "description": "第几页", @@ -7517,6 +7496,19 @@ var doc = `{ "name": "areaCode", "required": true, "type": "string" + }, + { + "description": "学校办学类型 -1：全部", + "in": "query", + "name": "xxbxlxm", + "required": true, + "type": "string" + }, + { + "description": "学校名称", + "in": "query", + "name": "orgName", + "type": "string" } ], "produces": [ @@ -7526,11 +7518,11 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/base.organization.PageMainSchoolInfo" + "$ref": "#/definitions/base.organization.PageSchoolInfo" } } }, - "summary": "获取主校列表", + "summary": "获取学校列表", "tags": [ "组织机构" ], @@ -7560,6 +7552,9 @@ var doc = `{ "x-lengthlimit": [ { "areaCode": "6,6" + }, + { + "orgName": "1,50" } ], "x-removeswaggerfield": [ @@ -8622,58 +8617,6 @@ var doc = `{ ] } }, - "/base/area/GetGovArea": { - "get": { - "consumes": [ - "application/x-www-form-urlencoded" - ], - "description": "获取行政区划信息(单条)", - "parameters": [ - { - "description": "行政区划码", - "in": "query", - "name": "areaCode", - "required": true, - "type": "string" - } - ], - "produces": [ - "application/json" - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/Model.Res" - } - } - }, - "summary": "获取行政区划信息(单条)", - "tags": [ - "行政区划" - ], - "x-emptylimit": [ - "areaCode" - ], - "x-intlimit": [ - "areaCode" - ], - "x-lengthlimit": [ - { - "areaCode": "6,6" - } - ], - "x-rolelimit": [ - "1", - "2", - "3", - "4", - "5", - "6", - "7" - ] - } - }, "/base/area/DeleteGovArea": { "post": { "consumes": [ @@ -8878,6 +8821,58 @@ var doc = `{ ] } }, + "/base/area/GetGovArea": { + "get": { + "consumes": [ + "application/x-www-form-urlencoded" + ], + "description": "获取行政区划信息(单条)", + "parameters": [ + { + "description": "行政区划码", + "in": "query", + "name": "areaCode", + "required": true, + "type": "string" + } + ], + "produces": [ + "application/json" + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Model.Res" + } + } + }, + "summary": "获取行政区划信息(单条)", + "tags": [ + "行政区划" + ], + "x-emptylimit": [ + "areaCode" + ], + "x-intlimit": [ + "areaCode" + ], + "x-lengthlimit": [ + { + "areaCode": "6,6" + } + ], + "x-rolelimit": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7" + ] + } + }, "/base/area/UpdateGovArea": { "post": { "consumes": [ @@ -8966,6 +8961,15 @@ var doc = `{ "application/x-www-form-urlencoded" ], "description": "根据人员ID获取所管辖的地区信息", + "parameters": [ + { + "description": "地区类型 1：市 2：区", + "in": "query", + "name": "areaType", + "required": true, + "type": "integer" + } + ], "produces": [ "application/json" ], @@ -8981,9 +8985,17 @@ var doc = `{ "tags": [ "角色信息" ], + "x-emptylimit": [ + "areaType" + ], "x-interfacename": [ "GetBaseRolePerson" ], + "x-intrangelimit": [ + { + "areaType": "1,2" + } + ], "x-rolelimit": [ "1", "2", @@ -9019,13 +9031,6 @@ var doc = `{ "tags": [ "角色信息" ], - "x-extendswaggerfield": [ - { - "column_comment": "登录人名称", - "column_name": "person_name", - "sample_data": "李老师" - } - ], "x-interfacename": [ "GetBaseRolePerson" ], diff --git a/dsBaseWeb/docs/swagger.json b/dsBaseWeb/docs/swagger.json index a47cc416..f97cff1a 100644 --- a/dsBaseWeb/docs/swagger.json +++ b/dsBaseWeb/docs/swagger.json @@ -1475,11 +1475,6 @@ "list": { "items": { "properties": { - "person_name": { - "description": "登录人名称", - "example": "李老师", - "type": "string" - }, "role_id": { "description": "角色ID", "example": "9CD6B804-0F89-4626-A812-29465CFC7410", @@ -1892,12 +1887,12 @@ "version": "1.0" }, "paths": { - "/base/business/AddBaseBusiness": { + "/base/business/DeleteBaseBusiness": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "增加业务系统信息", + "description": "删除业务系统信息", "parameters": [ { "description": "业务系统编码", @@ -1905,13 +1900,6 @@ "name": "businessCode", "required": true, "type": "string" - }, - { - "description": "业务系统名称", - "in": "formData", - "name": "businessName", - "required": true, - "type": "string" } ], "produces": [ @@ -1925,20 +1913,16 @@ } } }, - "summary": "增加业务系统信息", + "summary": "删除业务系统信息", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "businessCode", - "businessName" + "businessCode" ], "x-lengthlimit": [ { - "businessCode": "6:6" - }, - { - "businessName": "1:50" + "businessCode": "6,6" } ], "x-rolelimit": [ @@ -1996,26 +1980,19 @@ ] } }, - "/base/business/UpdateBaseBusiness": { - "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" - }, - { - "description": "业务系统名称", - "in": "formData", - "name": "businessName", - "required": true, - "type": "string" } ], "produces": [ @@ -2029,20 +2006,16 @@ } } }, - "summary": "修改业务系统信息", + "summary": "获取业务系统信息(单条)", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "businessCode", - "businessName" + "businessCode" ], "x-lengthlimit": [ { "businessCode": "6,6" - }, - { - "businessName": "1:50" } ], "x-rolelimit": [ @@ -2050,12 +2023,12 @@ ] } }, - "/base/business/DeleteBaseBusiness": { + "/base/business/UpdateBaseBusiness": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "删除业务系统信息", + "description": "修改业务系统信息", "parameters": [ { "description": "业务系统编码", @@ -2063,6 +2036,13 @@ "name": "businessCode", "required": true, "type": "string" + }, + { + "description": "业务系统名称", + "in": "formData", + "name": "businessName", + "required": true, + "type": "string" } ], "produces": [ @@ -2076,16 +2056,20 @@ } } }, - "summary": "删除业务系统信息", + "summary": "修改业务系统信息", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "businessCode" + "businessCode", + "businessName" ], "x-lengthlimit": [ { "businessCode": "6,6" + }, + { + "businessName": "1:50" } ], "x-rolelimit": [ @@ -2093,19 +2077,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": [ @@ -2119,16 +2110,20 @@ } } }, - "summary": "获取业务系统信息(单条)", + "summary": "增加业务系统信息", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "businessCode" + "businessCode", + "businessName" ], "x-lengthlimit": [ { - "businessCode": "6,6" + "businessCode": "6:6" + }, + { + "businessName": "1:50" } ], "x-rolelimit": [ @@ -3458,12 +3453,12 @@ ] } }, - "/base/student/ExportStudentAccountExcel": { + "/base/student/ExportStudentExcel": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "导出本校学生账号信息到EXCEL", + "description": "导出本校学生信息到EXCEL", "parameters": [ { "description": "学校ID", @@ -3490,7 +3485,7 @@ } } }, - "summary": "导出本校学生账号信息到EXCEL", + "summary": "导出本校学生信息到EXCEL", "tags": [ "学生信息" ], @@ -3515,12 +3510,12 @@ ] } }, - "/base/student/ExportStudentExcel": { + "/base/student/ExportStudentAccountExcel": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "导出本校学生信息到EXCEL", + "description": "导出本校学生账号信息到EXCEL", "parameters": [ { "description": "学校ID", @@ -3547,7 +3542,7 @@ } } }, - "summary": "导出本校学生信息到EXCEL", + "summary": "导出本校学生账号信息到EXCEL", "tags": [ "学生信息" ], @@ -7346,12 +7341,12 @@ ] } }, - "/base/organization/PageSchoolInfo": { + "/base/organization/PageMainSchoolInfo": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取学校列表", + "description": "获取主校列表", "parameters": [ { "description": "第几页", @@ -7373,19 +7368,6 @@ "name": "areaCode", "required": true, "type": "string" - }, - { - "description": "学校办学类型 -1：全部", - "in": "query", - "name": "xxbxlxm", - "required": true, - "type": "string" - }, - { - "description": "学校名称", - "in": "query", - "name": "orgName", - "type": "string" } ], "produces": [ @@ -7395,11 +7377,11 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/base.organization.PageSchoolInfo" + "$ref": "#/definitions/base.organization.PageMainSchoolInfo" } } }, - "summary": "获取学校列表", + "summary": "获取主校列表", "tags": [ "组织机构" ], @@ -7429,9 +7411,6 @@ "x-lengthlimit": [ { "areaCode": "6,6" - }, - { - "orgName": "1,50" } ], "x-removeswaggerfield": [ @@ -7475,12 +7454,12 @@ ] } }, - "/base/organization/PageMainSchoolInfo": { + "/base/organization/PageSchoolInfo": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取主校列表", + "description": "获取学校列表", "parameters": [ { "description": "第几页", @@ -7502,6 +7481,19 @@ "name": "areaCode", "required": true, "type": "string" + }, + { + "description": "学校办学类型 -1：全部", + "in": "query", + "name": "xxbxlxm", + "required": true, + "type": "string" + }, + { + "description": "学校名称", + "in": "query", + "name": "orgName", + "type": "string" } ], "produces": [ @@ -7511,11 +7503,11 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/base.organization.PageMainSchoolInfo" + "$ref": "#/definitions/base.organization.PageSchoolInfo" } } }, - "summary": "获取主校列表", + "summary": "获取学校列表", "tags": [ "组织机构" ], @@ -7545,6 +7537,9 @@ "x-lengthlimit": [ { "areaCode": "6,6" + }, + { + "orgName": "1,50" } ], "x-removeswaggerfield": [ @@ -8607,58 +8602,6 @@ ] } }, - "/base/area/GetGovArea": { - "get": { - "consumes": [ - "application/x-www-form-urlencoded" - ], - "description": "获取行政区划信息(单条)", - "parameters": [ - { - "description": "行政区划码", - "in": "query", - "name": "areaCode", - "required": true, - "type": "string" - } - ], - "produces": [ - "application/json" - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/Model.Res" - } - } - }, - "summary": "获取行政区划信息(单条)", - "tags": [ - "行政区划" - ], - "x-emptylimit": [ - "areaCode" - ], - "x-intlimit": [ - "areaCode" - ], - "x-lengthlimit": [ - { - "areaCode": "6,6" - } - ], - "x-rolelimit": [ - "1", - "2", - "3", - "4", - "5", - "6", - "7" - ] - } - }, "/base/area/DeleteGovArea": { "post": { "consumes": [ @@ -8863,6 +8806,58 @@ ] } }, + "/base/area/GetGovArea": { + "get": { + "consumes": [ + "application/x-www-form-urlencoded" + ], + "description": "获取行政区划信息(单条)", + "parameters": [ + { + "description": "行政区划码", + "in": "query", + "name": "areaCode", + "required": true, + "type": "string" + } + ], + "produces": [ + "application/json" + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Model.Res" + } + } + }, + "summary": "获取行政区划信息(单条)", + "tags": [ + "行政区划" + ], + "x-emptylimit": [ + "areaCode" + ], + "x-intlimit": [ + "areaCode" + ], + "x-lengthlimit": [ + { + "areaCode": "6,6" + } + ], + "x-rolelimit": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7" + ] + } + }, "/base/area/UpdateGovArea": { "post": { "consumes": [ @@ -8951,6 +8946,15 @@ "application/x-www-form-urlencoded" ], "description": "根据人员ID获取所管辖的地区信息", + "parameters": [ + { + "description": "地区类型 1：市 2：区", + "in": "query", + "name": "areaType", + "required": true, + "type": "integer" + } + ], "produces": [ "application/json" ], @@ -8966,9 +8970,17 @@ "tags": [ "角色信息" ], + "x-emptylimit": [ + "areaType" + ], "x-interfacename": [ "GetBaseRolePerson" ], + "x-intrangelimit": [ + { + "areaType": "1,2" + } + ], "x-rolelimit": [ "1", "2", @@ -9004,13 +9016,6 @@ "tags": [ "角色信息" ], - "x-extendswaggerfield": [ - { - "column_comment": "登录人名称", - "column_name": "person_name", - "sample_data": "李老师" - } - ], "x-interfacename": [ "GetBaseRolePerson" ], diff --git a/dsBaseWeb/docs/swagger.yaml b/dsBaseWeb/docs/swagger.yaml index 219d8a76..1d56bf25 100644 --- a/dsBaseWeb/docs/swagger.yaml +++ b/dsBaseWeb/docs/swagger.yaml @@ -1114,10 +1114,6 @@ definitions: list: items: properties: - person_name: - description: 登录人名称 - example: 李老师 - type: string role_id: description: 角色ID example: 9CD6B804-0F89-4626-A812-29465CFC7410 @@ -4885,6 +4881,12 @@ paths: consumes: - application/x-www-form-urlencoded description: 根据人员ID获取所管辖的地区信息 + parameters: + - description: 地区类型 1：市 2：区 + in: query + name: areaType + required: true + type: integer produces: - application/json responses: @@ -4895,8 +4897,12 @@ paths: summary: 根据人员ID获取所管辖的地区信息 tags: - 角色信息 + x-emptylimit: + - areaType x-interfacename: - GetBaseRolePerson + x-intrangelimit: + - areaType: 1,2 x-rolelimit: - "1" - "2" @@ -4922,10 +4928,6 @@ paths: summary: 获取人员角色信息 tags: - 角色信息 - x-extendswaggerfield: - - column_comment: 登录人名称 - column_name: person_name - sample_data: 李老师 x-interfacename: - GetBaseRolePerson x-removeswaggerfield: diff --git a/dsBaseWeb/main.go b/dsBaseWeb/main.go index b6f32ca1..947d8707 100644 --- a/dsBaseWeb/main.go +++ b/dsBaseWeb/main.go @@ -57,7 +57,7 @@ func main() { r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler)) //统一认证拦截器 - //r.Use(Handler.SsoHandler()) + r.Use(Handler.SsoHandler()) //前台页面目录 r.Static("/dsBaseWeb", "./Html")