diff --git a/server/api/v1/sys_work_flow.go b/server/api/v1/sys_work_flow.go deleted file mode 100644 index 7758b10264fe21d0b796017ff3764704b97215d3..0000000000000000000000000000000000000000 --- a/server/api/v1/sys_work_flow.go +++ /dev/null @@ -1,32 +0,0 @@ -package v1 - -import ( - "gin-vue-admin/global" - "gin-vue-admin/model" - "gin-vue-admin/model/response" - "gin-vue-admin/service" - "gin-vue-admin/utils" - "github.com/gin-gonic/gin" - "go.uber.org/zap" -) - -// @Tags workflow -// @Summary 注册工作流 -// @Produce application/json -// @Param data body model.SysWorkflow true "注册工作流接口" -// @Success 200 {string} string "{"success":true,"data":{},"msg":"注册成功"}" -// @Router /workflow/createWorkFlow [post] -func CreateWorkFlow(c *gin.Context) { - var wk model.SysWorkflow - _ = c.ShouldBindJSON(&wk) - if err := utils.Verify(wk, utils.WorkFlowVerify); err != nil { - response.FailWithMessage(err.Error(), c) - return - } - if err := service.Create(wk); err != nil { - global.GVA_LOG.Error("注册失败!", zap.Any("err", err)) - response.FailWithMessage("注册失败", c) - } else { - response.OkWithMessage("注册成功", c) - } -} diff --git a/server/api/v1/wk_process.go b/server/api/v1/wk_process.go index d850dee729f2cfd0c1fbfccca1095bba9d128ea7..b4883d0df67b5ff8c239c8898bef97761a870f6e 100644 --- a/server/api/v1/wk_process.go +++ b/server/api/v1/wk_process.go @@ -2,10 +2,9 @@ package v1 import ( "fmt" - "gin-vue-admin/global/response" "gin-vue-admin/model" "gin-vue-admin/model/request" - resp "gin-vue-admin/model/response" + "gin-vue-admin/model/response" "gin-vue-admin/service" "github.com/gin-gonic/gin" ) @@ -120,7 +119,7 @@ func GetWorkflowProcessList(c *gin.Context) { if err != nil { response.FailWithMessage(fmt.Sprintf("获取数据失败,%v", err), c) } else { - response.OkWithData(resp.PageResult{ + response.OkWithData(response.PageResult{ List: list, Total: total, Page: pageInfo.Page, diff --git a/server/service/sys_workflow.go b/server/service/sys_workflow.go deleted file mode 100644 index 03c7f71d3674aaa8775b0bd5c2180d9e823a68d9..0000000000000000000000000000000000000000 --- a/server/service/sys_workflow.go +++ /dev/null @@ -1,17 +0,0 @@ -package service - -import ( - "gin-vue-admin/global" - "gin-vue-admin/model" -) - -//@author: [piexlmax](https://github.com/piexlmax) -//@function: Create -//@description: 创建工作流 -//@param: wk model.SysWorkflow -//@return: error - -func Create(wk model.SysWorkflow) error { - err := global.GVA_DB.Create(&wk).Error - return err -} diff --git a/server/service/wk_process.go b/server/service/wk_process.go index 18bff313485ed5ab8601999acd735bbadff05d26..6c52b67b6d78077b6d1087d1d4f81917b0845076 100644 --- a/server/service/wk_process.go +++ b/server/service/wk_process.go @@ -7,22 +7,22 @@ import ( "gorm.io/gorm" ) -// @title CreateWorkflowProcess -// @description create a WorkflowProcess -// @param workflowProcess model.WorkflowProcess -// @auth (2020/04/05 20:22) -// @return err error +//@author: [piexlmax](https://github.com/piexlmax) +//@function: CreateWorkflowProcess +//@description: 创建工作流相关信息 +//@param: workflowProcess model.WorkflowProcess +//@return: err error func CreateWorkflowProcess(workflowProcess model.WorkflowProcess) (err error) { err = global.GVA_DB.Create(&workflowProcess).Error return err } -// @title DeleteWorkflowProcess -// @description delete a WorkflowProcess -// @auth (2020/04/05 20:22) -// @param workflowProcess model.WorkflowProcess -// @return error +//@author: [piexlmax](https://github.com/piexlmax) +//@function: DeleteWorkflowProcess +//@description: 删除工作流相关信息 +//@param: workflowProcess model.WorkflowProcess +//@return: err error func DeleteWorkflowProcess(workflowProcess model.WorkflowProcess) (err error) { err = global.GVA_DB.Transaction(func(tx *gorm.DB) error { @@ -49,22 +49,22 @@ func DeleteWorkflowProcess(workflowProcess model.WorkflowProcess) (err error) { return err } -// @title DeleteWorkflowProcessByIds -// @description delete WorkflowProcesss -// @auth (2020/04/05 20:22) -// @param workflowProcess model.WorkflowProcess -// @return error +//@author: [piexlmax](https://github.com/piexlmax) +//@function: CreateWorkflowProcess +//@description: 批量删除工作流信息(暂未启用) +//@param: ids request.IdsReq +//@return: err error func DeleteWorkflowProcessByIds(ids request.IdsReq) (err error) { err = global.GVA_DB.Delete(&[]model.WorkflowProcess{}, "id in ?", ids.Ids).Error return err } -// @title UpdateWorkflowProcess -// @description update a WorkflowProcess -// @param workflowProcess *model.WorkflowProcess -// @auth (2020/04/05 20:22) -// @return error +//@author: [piexlmax](https://github.com/piexlmax) +//@function: UpdateWorkflowProcess +//@description: 更新工作流相关信息 +//@param: workflowProcess *model.WorkflowProcess +//@return: err error func UpdateWorkflowProcess(workflowProcess *model.WorkflowProcess) (err error) { return global.GVA_DB.Transaction(func(tx *gorm.DB) error { @@ -106,23 +106,22 @@ func UpdateWorkflowProcess(workflowProcess *model.WorkflowProcess) (err error) { }) } -// @title GetWorkflowProcess -// @description get the info of a WorkflowProcess -// @auth (2020/04/05 20:22) -// @param id uint -// @return error -// @return WorkflowProcess WorkflowProcess +//@author: [piexlmax](https://github.com/piexlmax) +//@function: GetWorkflowProcess +//@description: 获取工作流相关信息 +//@param: id string +//@return: err error func GetWorkflowProcess(id string) (err error, workflowProcess model.WorkflowProcess) { err = global.GVA_DB.Preload("Nodes").Preload("Edges").Where("id = ?", id).First(&workflowProcess).Error return } -// @title GetWorkflowProcessInfoList -// @description get WorkflowProcess list by pagination, 分页获取WorkflowProcess -// @auth (2020/04/05 20:22) -// @param info PageInfo -// @return error +//@author: [piexlmax](https://github.com/piexlmax) +//@function: GetWorkflowProcessInfoList +//@description: 获取工作流列表 +//@param: info request.WorkflowProcessSearch +//@return: err error, list interface{}, total int64 func GetWorkflowProcessInfoList(info request.WorkflowProcessSearch) (err error, list interface{}, total int64) { limit := info.PageSize