pig/pig-farm-controller
1
0
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases Wiki Activity

修bug

Browse Source
This commit is contained in:
huang
2025-10-29 18:56:05 +08:00
parent af8689d627
commit 8d48576305
5 changed files with 97 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
docs/docs.go
View File

@@ -998,6 +998,7 @@ const docTemplate = `{
}, },
{ {
"enum": [ "enum": [
7,
-1, -1,
0, 0,
1, 1,
@@ -1007,12 +1008,12 @@ const docTemplate = `{
5, 5,
-1, -1,
5, 5,
6, 6
7
], ],
"type": "integer", "type": "integer",
"format": "int32", "format": "int32",
"x-enum-varnames": [ "x-enum-varnames": [
"_numLevels",
"DebugLevel", "DebugLevel",
"InfoLevel", "InfoLevel",
"WarnLevel", "WarnLevel",
@@ -1022,8 +1023,7 @@ const docTemplate = `{
"FatalLevel", "FatalLevel",
"_minLevel", "_minLevel",
"_maxLevel", "_maxLevel",
"InvalidLevel", "InvalidLevel"
"_numLevels"
], ],
"name": "level", "name": "level",
"in": "query" "in": "query"
@@ -3622,8 +3622,18 @@ const docTemplate = `{
"in": "query" "in": "query"
}, },
{ {
"enum": [
"所有任务",
"自定义任务",
"系统任务"
],
"type": "string", "type": "string",
"description": "计划类型 (all, custom, system)，默认为 custom", "x-enum-varnames": [
"PlanTypeFilterAll",
"PlanTypeFilterCustom",
"PlanTypeFilterSystem"
],
"description": "计划类型",
"name": "planType", "name": "planType",
"in": "query" "in": "query"
} }
@@ -6903,10 +6913,24 @@ const docTemplate = `{
"NotifierTypeLog" "NotifierTypeLog"
] ]
}, },
"repository.PlanTypeFilter": {
"type": "string",
"enum": [
"所有任务",
"自定义任务",
"系统任务"
],
"x-enum-varnames": [
"PlanTypeFilterAll",
"PlanTypeFilterCustom",
"PlanTypeFilterSystem"
]
},
"zapcore.Level": { "zapcore.Level": {
"type": "integer", "type": "integer",
"format": "int32", "format": "int32",
"enum": [ "enum": [
7,
-1, -1,
0, 0,
1, 1,
@@ -6916,10 +6940,10 @@ const docTemplate = `{
5, 5,
-1, -1,
5, 5,
6, 6
7
], ],
"x-enum-varnames": [ "x-enum-varnames": [
"_numLevels",
"DebugLevel", "DebugLevel",
"InfoLevel", "InfoLevel",
"WarnLevel", "WarnLevel",
@@ -6929,8 +6953,7 @@ const docTemplate = `{
"FatalLevel", "FatalLevel",
"_minLevel", "_minLevel",
"_maxLevel", "_maxLevel",
"InvalidLevel", "InvalidLevel"
"_numLevels"
] ]
} }
}, },

41
docs/swagger.json
View File

@@ -990,6 +990,7 @@
}, },
{ {
"enum": [ "enum": [
7,
-1, -1,
0, 0,
1, 1,
@@ -999,12 +1000,12 @@
5, 5,
-1, -1,
5, 5,
6, 6
7
], ],
"type": "integer", "type": "integer",
"format": "int32", "format": "int32",
"x-enum-varnames": [ "x-enum-varnames": [
"_numLevels",
"DebugLevel", "DebugLevel",
"InfoLevel", "InfoLevel",
"WarnLevel", "WarnLevel",
@@ -1014,8 +1015,7 @@
"FatalLevel", "FatalLevel",
"_minLevel", "_minLevel",
"_maxLevel", "_maxLevel",
"InvalidLevel", "InvalidLevel"
"_numLevels"
], ],
"name": "level", "name": "level",
"in": "query" "in": "query"
@@ -3614,8 +3614,18 @@
"in": "query" "in": "query"
}, },
{ {
"enum": [
"所有任务",
"自定义任务",
"系统任务"
],
"type": "string", "type": "string",
"description": "计划类型 (all, custom, system)，默认为 custom", "x-enum-varnames": [
"PlanTypeFilterAll",
"PlanTypeFilterCustom",
"PlanTypeFilterSystem"
],
"description": "计划类型",
"name": "planType", "name": "planType",
"in": "query" "in": "query"
} }
@@ -6895,10 +6905,24 @@
"NotifierTypeLog" "NotifierTypeLog"
] ]
}, },
"repository.PlanTypeFilter": {
"type": "string",
"enum": [
"所有任务",
"自定义任务",
"系统任务"
],
"x-enum-varnames": [
"PlanTypeFilterAll",
"PlanTypeFilterCustom",
"PlanTypeFilterSystem"
]
},
"zapcore.Level": { "zapcore.Level": {
"type": "integer", "type": "integer",
"format": "int32", "format": "int32",
"enum": [ "enum": [
7,
-1, -1,
0, 0,
1, 1,
@@ -6908,10 +6932,10 @@
5, 5,
-1, -1,
5, 5,
6, 6
7
], ],
"x-enum-varnames": [ "x-enum-varnames": [
"_numLevels",
"DebugLevel", "DebugLevel",
"InfoLevel", "InfoLevel",
"WarnLevel", "WarnLevel",
@@ -6921,8 +6945,7 @@
"FatalLevel", "FatalLevel",
"_minLevel", "_minLevel",
"_maxLevel", "_maxLevel",
"InvalidLevel", "InvalidLevel"
"_numLevels"
] ]
} }
}, },

28
docs/swagger.yaml
View File

@@ -1923,8 +1923,19 @@ definitions:
- NotifierTypeWeChat - NotifierTypeWeChat
- NotifierTypeLark - NotifierTypeLark
- NotifierTypeLog - NotifierTypeLog
repository.PlanTypeFilter:
enum:
- 所有任务
- 自定义任务
- 系统任务
type: string
x-enum-varnames:
- PlanTypeFilterAll
- PlanTypeFilterCustom
- PlanTypeFilterSystem
zapcore.Level: zapcore.Level:
enum: enum:
- 7
- -1 - -1
- 0 - 0
- 1 - 1
@@ -1935,10 +1946,10 @@ definitions:
- -1 - -1
- 5 - 5
- 6 - 6
- 7
format: int32 format: int32
type: integer type: integer
x-enum-varnames: x-enum-varnames:
- _numLevels
- DebugLevel - DebugLevel
- InfoLevel - InfoLevel
- WarnLevel - WarnLevel
@@ -1949,7 +1960,6 @@ definitions:
- _minLevel - _minLevel
- _maxLevel - _maxLevel
- InvalidLevel - InvalidLevel
- _numLevels
info: info:
contact: contact:
email: divano@example.com email: divano@example.com
@@ -2521,6 +2531,7 @@ paths:
name: end_time name: end_time
type: string type: string
- enum: - enum:
- 7
- -1 - -1
- 0 - 0
- 1 - 1
@@ -2531,12 +2542,12 @@ paths:
- -1 - -1
- 5 - 5
- 6 - 6
- 7
format: int32 format: int32
in: query in: query
name: level name: level
type: integer type: integer
x-enum-varnames: x-enum-varnames:
- _numLevels
- DebugLevel - DebugLevel
- InfoLevel - InfoLevel
- WarnLevel - WarnLevel
@@ -2547,7 +2558,6 @@ paths:
- _minLevel - _minLevel
- _maxLevel - _maxLevel
- InvalidLevel - InvalidLevel
- _numLevels
- enum: - enum:
- 邮件 - 邮件
- 企业微信 - 企业微信
@@ -4080,10 +4090,18 @@ paths:
in: query in: query
name: pageSize name: pageSize
type: integer type: integer
- description: 计划类型 (all, custom, system)，默认为 custom - description: 计划类型
enum:
- 所有任务
- 自定义任务
- 系统任务
in: query in: query
name: planType name: planType
type: string type: string
x-enum-varnames:
- PlanTypeFilterAll
- PlanTypeFilterCustom
- PlanTypeFilterSystem
produces: produces:
- application/json - application/json
responses: responses:

11
internal/app/dto/plan_dto.go
View File

@@ -1,12 +1,15 @@
package dto 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 定义了获取计划列表时的查询参数 // ListPlansQuery 定义了获取计划列表时的查询参数
type ListPlansQuery struct { type ListPlansQuery struct {
PlanType string `form:"planType,default=custom"` // 计划类型 (all, custom, system)，默认为 custom PlanType repository.PlanTypeFilter `form:"planType,default=自定义任务"` // 计划类型
Page int `form:"page,default=1"` // 页码 Page int `form:"page,default=1"` // 页码
PageSize int `form:"pageSize,default=10"` // 每页大小 PageSize int `form:"pageSize,default=10"` // 每页大小
} }
// CreatePlanRequest 定义创建计划请求的结构体 // CreatePlanRequest 定义创建计划请求的结构体

6
internal/infra/repository/plan_repository.go
View File

@@ -25,9 +25,9 @@ var (
type PlanTypeFilter string type PlanTypeFilter string
const ( const (
PlanTypeFilterAll PlanTypeFilter = "all" PlanTypeFilterAll PlanTypeFilter = "所有任务"
PlanTypeFilterCustom PlanTypeFilter = "custom" PlanTypeFilterCustom PlanTypeFilter = "自定义任务"
PlanTypeFilterSystem PlanTypeFilter = "system" PlanTypeFilterSystem PlanTypeFilter = "系统任务"
) )
// ListPlansOptions 定义了查询计划时的可选参数 // ListPlansOptions 定义了查询计划时的可选参数