From 2c168a65ecf802d66007fa23576a5ec6e0da5346 Mon Sep 17 00:00:00 2001 From: wubin Date: Tue, 4 Aug 2020 08:38:57 +0800 Subject: [PATCH] update --- .../BaseGlobalController.go | 4 +- dsBaseWeb/docs/docs.go | 248 +++++++++--------- dsBaseWeb/docs/swagger.json | 248 +++++++++--------- 3 files changed, 250 insertions(+), 250 deletions(-) diff --git a/dsBaseWeb/Business/BaseGlobal/BaseGlobalController/BaseGlobalController.go b/dsBaseWeb/Business/BaseGlobal/BaseGlobalController/BaseGlobalController.go index 2a2d2c55..fbcc3fcf 100644 --- a/dsBaseWeb/Business/BaseGlobal/BaseGlobalController/BaseGlobalController.go +++ b/dsBaseWeb/Business/BaseGlobal/BaseGlobalController/BaseGlobalController.go @@ -84,7 +84,7 @@ func AddGlobalInfo(c *gin.Context) { // @X-RoleLimit ["1"] // @X-Sort [5] func DeleteGlobalInfo(c *gin.Context) { - globalId := c.PostForm("globalId") + globalIds := c.PostForm("globalIds") //操作人 actionPersonId, err := c.Cookie("person_id") if err != nil { @@ -96,7 +96,7 @@ func DeleteGlobalInfo(c *gin.Context) { } //操作IP actionIpAddress := c.ClientIP() - r, err := BaseGlobalService.DeleteGlobalInfo(globalId, actionPersonId, actionIpAddress) + r, err := BaseGlobalService.DeleteGlobalInfo(globalIds, actionPersonId, actionIpAddress) if err != nil { c.JSON(http.StatusOK, Model.Res{ Success: false, diff --git a/dsBaseWeb/docs/docs.go b/dsBaseWeb/docs/docs.go index 355d05ae..47940475 100644 --- a/dsBaseWeb/docs/docs.go +++ b/dsBaseWeb/docs/docs.go @@ -2113,26 +2113,19 @@ var doc = `{ ] } }, - "/base/business/PageBaseBusiness": { - "get": { + "/base/business/DeleteBaseBusiness": { + "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取业务系统信息(列表)", + "description": "删除业务系统信息", "parameters": [ { - "description": "第几页", - "in": "query", - "name": "page", - "required": true, - "type": "integer" - }, - { - "description": "一页显示多少条", - "in": "query", - "name": "limit", + "description": "业务系统编码", + "in": "formData", + "name": "businessCode", "required": true, - "type": "integer" + "type": "string" } ], "produces": [ @@ -2146,36 +2139,43 @@ var doc = `{ } } }, - "summary": "获取业务系统信息(列表)", + "summary": "删除业务系统信息", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "page", - "limit" + "businessCode" ], - "x-intlimit": [ - "page", - "limit" + "x-lengthlimit": [ + { + "businessCode": "6,6" + } ], "x-rolelimit": [ "1" ] } }, - "/base/business/GetBaseBusiness": { + "/base/business/PageBaseBusiness": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取业务系统信息(单条)", + "description": "获取业务系统信息(列表)", "parameters": [ { - "description": "业务系统编码", + "description": "第几页", "in": "query", - "name": "businessCode", + "name": "page", "required": true, - "type": "string" + "type": "integer" + }, + { + "description": "一页显示多少条", + "in": "query", + "name": "limit", + "required": true, + "type": "integer" } ], "produces": [ @@ -2189,33 +2189,33 @@ var doc = `{ } } }, - "summary": "获取业务系统信息(单条)", + "summary": "获取业务系统信息(列表)", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "businessCode" + "page", + "limit" ], - "x-lengthlimit": [ - { - "businessCode": "6,6" - } + "x-intlimit": [ + "page", + "limit" ], "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" @@ -2232,7 +2232,7 @@ var doc = `{ } } }, - "summary": "删除业务系统信息", + "summary": "获取业务系统信息(单条)", "tags": [ "业务系统维护" ], @@ -3684,12 +3684,12 @@ var doc = `{ ] } }, - "/base/student/ExportStudentAccountExcel": { + "/base/student/ExportStudentExcel": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "导出本校学生账号信息到EXCEL", + "description": "导出本校学生信息到EXCEL", "parameters": [ { "description": "学校ID", @@ -3716,7 +3716,7 @@ var doc = `{ } } }, - "summary": "导出本校学生账号信息到EXCEL", + "summary": "导出本校学生信息到EXCEL", "tags": [ "学生信息" ], @@ -3741,12 +3741,12 @@ var doc = `{ ] } }, - "/base/student/ExportStudentExcel": { + "/base/student/ExportStudentAccountExcel": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "导出本校学生信息到EXCEL", + "description": "导出本校学生账号信息到EXCEL", "parameters": [ { "description": "学校ID", @@ -3773,7 +3773,7 @@ var doc = `{ } } }, - "summary": "导出本校学生信息到EXCEL", + "summary": "导出本校学生账号信息到EXCEL", "tags": [ "学生信息" ], @@ -7652,12 +7652,12 @@ var doc = `{ ] } }, - "/base/organization/PageSchoolInfo": { + "/base/organization/PageMainSchoolInfo": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取学校列表", + "description": "获取主校列表", "parameters": [ { "description": "第几页", @@ -7681,16 +7681,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" } ], @@ -7701,11 +7694,11 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/base.organization.PageSchoolInfo" + "$ref": "#/definitions/base.organization.PageMainSchoolInfo" } } }, - "summary": "获取学校列表", + "summary": "获取主校列表", "tags": [ "组织机构" ], @@ -7735,9 +7728,6 @@ var doc = `{ "x-lengthlimit": [ { "areaCode": "6,6" - }, - { - "orgName": "1,30" } ], "x-removeswaggerfield": [ @@ -7781,12 +7771,12 @@ var doc = `{ ] } }, - "/base/organization/PageMainSchoolInfo": { + "/base/organization/PageSchoolInfo": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取主校列表", + "description": "获取学校列表", "parameters": [ { "description": "第几页", @@ -7810,9 +7800,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" } ], @@ -7823,11 +7820,11 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/base.organization.PageMainSchoolInfo" + "$ref": "#/definitions/base.organization.PageSchoolInfo" } } }, - "summary": "获取主校列表", + "summary": "获取学校列表", "tags": [ "组织机构" ], @@ -7857,6 +7854,9 @@ var doc = `{ "x-lengthlimit": [ { "areaCode": "6,6" + }, + { + "orgName": "1,30" } ], "x-removeswaggerfield": [ @@ -8919,58 +8919,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": [ @@ -9093,12 +9041,12 @@ var doc = `{ ] } }, - "/base/area/UpdateGovArea": { + "/base/area/AddGovArea": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "修改行政区划信息", + "description": "增加行政区划信息", "parameters": [ { "description": "区域代码", @@ -9140,7 +9088,7 @@ var doc = `{ } } }, - "summary": "修改行政区划信息", + "summary": "增加行政区划信息", "tags": [ "行政区划" ], @@ -9161,7 +9109,7 @@ var doc = `{ "masterCode": "6,6" }, { - "areaName": "3:50" + "areaName": "3,50" } ], "x-rolelimit": [ @@ -9175,12 +9123,12 @@ var doc = `{ ] } }, - "/base/area/AddGovArea": { + "/base/area/UpdateGovArea": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "增加行政区划信息", + "description": "修改行政区划信息", "parameters": [ { "description": "区域代码", @@ -9222,7 +9170,7 @@ var doc = `{ } } }, - "summary": "增加行政区划信息", + "summary": "修改行政区划信息", "tags": [ "行政区划" ], @@ -9243,7 +9191,59 @@ var doc = `{ "masterCode": "6,6" }, { - "areaName": "3,50" + "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", + "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": [ diff --git a/dsBaseWeb/docs/swagger.json b/dsBaseWeb/docs/swagger.json index bc73fbed..124f52fc 100644 --- a/dsBaseWeb/docs/swagger.json +++ b/dsBaseWeb/docs/swagger.json @@ -2098,26 +2098,19 @@ ] } }, - "/base/business/PageBaseBusiness": { - "get": { + "/base/business/DeleteBaseBusiness": { + "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取业务系统信息(列表)", + "description": "删除业务系统信息", "parameters": [ { - "description": "第几页", - "in": "query", - "name": "page", - "required": true, - "type": "integer" - }, - { - "description": "一页显示多少条", - "in": "query", - "name": "limit", + "description": "业务系统编码", + "in": "formData", + "name": "businessCode", "required": true, - "type": "integer" + "type": "string" } ], "produces": [ @@ -2131,36 +2124,43 @@ } } }, - "summary": "获取业务系统信息(列表)", + "summary": "删除业务系统信息", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "page", - "limit" + "businessCode" ], - "x-intlimit": [ - "page", - "limit" + "x-lengthlimit": [ + { + "businessCode": "6,6" + } ], "x-rolelimit": [ "1" ] } }, - "/base/business/GetBaseBusiness": { + "/base/business/PageBaseBusiness": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取业务系统信息(单条)", + "description": "获取业务系统信息(列表)", "parameters": [ { - "description": "业务系统编码", + "description": "第几页", "in": "query", - "name": "businessCode", + "name": "page", "required": true, - "type": "string" + "type": "integer" + }, + { + "description": "一页显示多少条", + "in": "query", + "name": "limit", + "required": true, + "type": "integer" } ], "produces": [ @@ -2174,33 +2174,33 @@ } } }, - "summary": "获取业务系统信息(单条)", + "summary": "获取业务系统信息(列表)", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "businessCode" + "page", + "limit" ], - "x-lengthlimit": [ - { - "businessCode": "6,6" - } + "x-intlimit": [ + "page", + "limit" ], "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" @@ -2217,7 +2217,7 @@ } } }, - "summary": "删除业务系统信息", + "summary": "获取业务系统信息(单条)", "tags": [ "业务系统维护" ], @@ -3669,12 +3669,12 @@ ] } }, - "/base/student/ExportStudentAccountExcel": { + "/base/student/ExportStudentExcel": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "导出本校学生账号信息到EXCEL", + "description": "导出本校学生信息到EXCEL", "parameters": [ { "description": "学校ID", @@ -3701,7 +3701,7 @@ } } }, - "summary": "导出本校学生账号信息到EXCEL", + "summary": "导出本校学生信息到EXCEL", "tags": [ "学生信息" ], @@ -3726,12 +3726,12 @@ ] } }, - "/base/student/ExportStudentExcel": { + "/base/student/ExportStudentAccountExcel": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "导出本校学生信息到EXCEL", + "description": "导出本校学生账号信息到EXCEL", "parameters": [ { "description": "学校ID", @@ -3758,7 +3758,7 @@ } } }, - "summary": "导出本校学生信息到EXCEL", + "summary": "导出本校学生账号信息到EXCEL", "tags": [ "学生信息" ], @@ -7637,12 +7637,12 @@ ] } }, - "/base/organization/PageSchoolInfo": { + "/base/organization/PageMainSchoolInfo": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取学校列表", + "description": "获取主校列表", "parameters": [ { "description": "第几页", @@ -7666,16 +7666,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" } ], @@ -7686,11 +7679,11 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/base.organization.PageSchoolInfo" + "$ref": "#/definitions/base.organization.PageMainSchoolInfo" } } }, - "summary": "获取学校列表", + "summary": "获取主校列表", "tags": [ "组织机构" ], @@ -7720,9 +7713,6 @@ "x-lengthlimit": [ { "areaCode": "6,6" - }, - { - "orgName": "1,30" } ], "x-removeswaggerfield": [ @@ -7766,12 +7756,12 @@ ] } }, - "/base/organization/PageMainSchoolInfo": { + "/base/organization/PageSchoolInfo": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取主校列表", + "description": "获取学校列表", "parameters": [ { "description": "第几页", @@ -7795,9 +7785,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" } ], @@ -7808,11 +7805,11 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/base.organization.PageMainSchoolInfo" + "$ref": "#/definitions/base.organization.PageSchoolInfo" } } }, - "summary": "获取主校列表", + "summary": "获取学校列表", "tags": [ "组织机构" ], @@ -7842,6 +7839,9 @@ "x-lengthlimit": [ { "areaCode": "6,6" + }, + { + "orgName": "1,30" } ], "x-removeswaggerfield": [ @@ -8904,58 +8904,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": [ @@ -9078,12 +9026,12 @@ ] } }, - "/base/area/UpdateGovArea": { + "/base/area/AddGovArea": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "修改行政区划信息", + "description": "增加行政区划信息", "parameters": [ { "description": "区域代码", @@ -9125,7 +9073,7 @@ } } }, - "summary": "修改行政区划信息", + "summary": "增加行政区划信息", "tags": [ "行政区划" ], @@ -9146,7 +9094,7 @@ "masterCode": "6,6" }, { - "areaName": "3:50" + "areaName": "3,50" } ], "x-rolelimit": [ @@ -9160,12 +9108,12 @@ ] } }, - "/base/area/AddGovArea": { + "/base/area/UpdateGovArea": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "增加行政区划信息", + "description": "修改行政区划信息", "parameters": [ { "description": "区域代码", @@ -9207,7 +9155,7 @@ } } }, - "summary": "增加行政区划信息", + "summary": "修改行政区划信息", "tags": [ "行政区划" ], @@ -9228,7 +9176,59 @@ "masterCode": "6,6" }, { - "areaName": "3,50" + "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", + "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": [