diff --git a/docs/docs.go b/docs/docs.go index 9caef23..551191c 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -998,6 +998,7 @@ const docTemplate = `{ }, { "enum": [ + 7, -1, 0, 1, @@ -1007,12 +1008,12 @@ const docTemplate = `{ 5, -1, 5, - 6, - 7 + 6 ], "type": "integer", "format": "int32", "x-enum-varnames": [ + "_numLevels", "DebugLevel", "InfoLevel", "WarnLevel", @@ -1022,8 +1023,7 @@ const docTemplate = `{ "FatalLevel", "_minLevel", "_maxLevel", - "InvalidLevel", - "_numLevels" + "InvalidLevel" ], "name": "level", "in": "query" @@ -3622,8 +3622,18 @@ const docTemplate = `{ "in": "query" }, { + "enum": [ + "所有任务", + "自定义任务", + "系统任务" + ], "type": "string", - "description": "计划类型 (all, custom, system)，默认为 custom", + "x-enum-varnames": [ + "PlanTypeFilterAll", + "PlanTypeFilterCustom", + "PlanTypeFilterSystem" + ], + "description": "计划类型", "name": "planType", "in": "query" } @@ -6903,10 +6913,24 @@ const docTemplate = `{ "NotifierTypeLog" ] }, + "repository.PlanTypeFilter": { + "type": "string", + "enum": [ + "所有任务", + "自定义任务", + "系统任务" + ], + "x-enum-varnames": [ + "PlanTypeFilterAll", + "PlanTypeFilterCustom", + "PlanTypeFilterSystem" + ] + }, "zapcore.Level": { "type": "integer", "format": "int32", "enum": [ + 7, -1, 0, 1, @@ -6916,10 +6940,10 @@ const docTemplate = `{ 5, -1, 5, - 6, - 7 + 6 ], "x-enum-varnames": [ + "_numLevels", "DebugLevel", "InfoLevel", "WarnLevel", @@ -6929,8 +6953,7 @@ const docTemplate = `{ "FatalLevel", "_minLevel", "_maxLevel", - "InvalidLevel", - "_numLevels" + "InvalidLevel" ] } }, diff --git a/docs/swagger.json b/docs/swagger.json index 1b12aa0..e052064 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -990,6 +990,7 @@ }, { "enum": [ + 7, -1, 0, 1, @@ -999,12 +1000,12 @@ 5, -1, 5, - 6, - 7 + 6 ], "type": "integer", "format": "int32", "x-enum-varnames": [ + "_numLevels", "DebugLevel", "InfoLevel", "WarnLevel", @@ -1014,8 +1015,7 @@ "FatalLevel", "_minLevel", "_maxLevel", - "InvalidLevel", - "_numLevels" + "InvalidLevel" ], "name": "level", "in": "query" @@ -3614,8 +3614,18 @@ "in": "query" }, { + "enum": [ + "所有任务", + "自定义任务", + "系统任务" + ], "type": "string", - "description": "计划类型 (all, custom, system)，默认为 custom", + "x-enum-varnames": [ + "PlanTypeFilterAll", + "PlanTypeFilterCustom", + "PlanTypeFilterSystem" + ], + "description": "计划类型", "name": "planType", "in": "query" } @@ -6895,10 +6905,24 @@ "NotifierTypeLog" ] }, + "repository.PlanTypeFilter": { + "type": "string", + "enum": [ + "所有任务", + "自定义任务", + "系统任务" + ], + "x-enum-varnames": [ + "PlanTypeFilterAll", + "PlanTypeFilterCustom", + "PlanTypeFilterSystem" + ] + }, "zapcore.Level": { "type": "integer", "format": "int32", "enum": [ + 7, -1, 0, 1, @@ -6908,10 +6932,10 @@ 5, -1, 5, - 6, - 7 + 6 ], "x-enum-varnames": [ + "_numLevels", "DebugLevel", "InfoLevel", "WarnLevel", @@ -6921,8 +6945,7 @@ "FatalLevel", "_minLevel", "_maxLevel", - "InvalidLevel", - "_numLevels" + "InvalidLevel" ] } }, diff --git a/docs/swagger.yaml b/docs/swagger.yaml index d030572..bae7566 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -1923,8 +1923,19 @@ definitions: - NotifierTypeWeChat - NotifierTypeLark - NotifierTypeLog + repository.PlanTypeFilter: + enum: + - 所有任务 + - 自定义任务 + - 系统任务 + type: string + x-enum-varnames: + - PlanTypeFilterAll + - PlanTypeFilterCustom + - PlanTypeFilterSystem zapcore.Level: enum: + - 7 - -1 - 0 - 1 @@ -1935,10 +1946,10 @@ definitions: - -1 - 5 - 6 - - 7 format: int32 type: integer x-enum-varnames: + - _numLevels - DebugLevel - InfoLevel - WarnLevel @@ -1949,7 +1960,6 @@ definitions: - _minLevel - _maxLevel - InvalidLevel - - _numLevels info: contact: email: divano@example.com @@ -2521,6 +2531,7 @@ paths: name: end_time type: string - enum: + - 7 - -1 - 0 - 1 @@ -2531,12 +2542,12 @@ paths: - -1 - 5 - 6 - - 7 format: int32 in: query name: level type: integer x-enum-varnames: + - _numLevels - DebugLevel - InfoLevel - WarnLevel @@ -2547,7 +2558,6 @@ paths: - _minLevel - _maxLevel - InvalidLevel - - _numLevels - enum: - 邮件 - 企业微信 @@ -4080,10 +4090,18 @@ paths: in: query name: pageSize type: integer - - description: 计划类型 (all, custom, system)，默认为 custom + - description: 计划类型 + enum: + - 所有任务 + - 自定义任务 + - 系统任务 in: query name: planType type: string + x-enum-varnames: + - PlanTypeFilterAll + - PlanTypeFilterCustom + - PlanTypeFilterSystem produces: - application/json responses: diff --git a/internal/app/dto/plan_dto.go b/internal/app/dto/plan_dto.go index c84a3ed..c6d33cb 100644 --- a/internal/app/dto/plan_dto.go +++ b/internal/app/dto/plan_dto.go @@ -1,12 +1,15 @@ package dto -import "git.huangwc.com/pig/pig-farm-controller/internal/infra/models" +import ( + "git.huangwc.com/pig/pig-farm-controller/internal/infra/models" + "git.huangwc.com/pig/pig-farm-controller/internal/infra/repository" +) // ListPlansQuery 定义了获取计划列表时的查询参数 type ListPlansQuery struct { - PlanType string `form:"planType,default=custom"` // 计划类型 (all, custom, system)，默认为 custom - Page int `form:"page,default=1"` // 页码 - PageSize int `form:"pageSize,default=10"` // 每页大小 + PlanType repository.PlanTypeFilter `form:"planType,default=自定义任务"` // 计划类型 + Page int `form:"page,default=1"` // 页码 + PageSize int `form:"pageSize,default=10"` // 每页大小 } // CreatePlanRequest 定义创建计划请求的结构体 diff --git a/internal/infra/repository/plan_repository.go b/internal/infra/repository/plan_repository.go index 4678072..58763cc 100644 --- a/internal/infra/repository/plan_repository.go +++ b/internal/infra/repository/plan_repository.go @@ -25,9 +25,9 @@ var ( type PlanTypeFilter string const ( - PlanTypeFilterAll PlanTypeFilter = "all" - PlanTypeFilterCustom PlanTypeFilter = "custom" - PlanTypeFilterSystem PlanTypeFilter = "system" + PlanTypeFilterAll PlanTypeFilter = "所有任务" + PlanTypeFilterCustom PlanTypeFilter = "自定义任务" + PlanTypeFilterSystem PlanTypeFilter = "系统任务" ) // ListPlansOptions 定义了查询计划时的可选参数