feat: 添加任务是否需执行的配置。

This commit is contained in:
lanyulei 2021-06-26 17:16:48 +08:00
parent 590e14a36a
commit 12f485986b
4 changed files with 48 additions and 41 deletions

View File

@ -116,6 +116,7 @@ func ProcessWorkOrder(c *gin.Context) {
FlowProperties int `json:"flow_properties"` // 流转类型 0 拒绝1 同意2 其他 FlowProperties int `json:"flow_properties"` // 流转类型 0 拒绝1 同意2 其他
Remarks string `json:"remarks"` // 处理的备注信息 Remarks string `json:"remarks"` // 处理的备注信息
Tpls []map[string]interface{} `json:"tpls"` // 表单数据 Tpls []map[string]interface{} `json:"tpls"` // 表单数据
IsExecTask bool `json:"is_exec_task"` // 是否执行任务
} }
) )
@ -146,6 +147,7 @@ func ProcessWorkOrder(c *gin.Context) {
params.FlowProperties, // 流转属性 params.FlowProperties, // 流转属性
params.Remarks, // 备注信息 params.Remarks, // 备注信息
params.Tpls, // 工单数据更新 params.Tpls, // 工单数据更新
params.IsExecTask, // 是否执行任务
) )
if err != nil { if err != nil {
app.Error(c, -1, err, fmt.Sprintf("处理工单失败,%v", err.Error())) app.Error(c, -1, err, fmt.Sprintf("处理工单失败,%v", err.Error()))

View File

@ -40,6 +40,7 @@ func CreateWorkOrder(c *gin.Context) (err error) {
SourceState string `json:"source_state"` SourceState string `json:"source_state"`
Tasks json.RawMessage `json:"tasks"` Tasks json.RawMessage `json:"tasks"`
Source string `json:"source"` Source string `json:"source"`
IsExecTask bool `json:"is_exec_task"`
} }
paramsValue struct { paramsValue struct {
Id int `json:"id"` Id int `json:"id"`
@ -348,6 +349,7 @@ func CreateWorkOrder(c *gin.Context) (err error) {
}() }()
} }
if workOrderValue.IsExecTask {
// 执行任务 // 执行任务
err = json.Unmarshal(workOrderValue.Tasks, &taskList) err = json.Unmarshal(workOrderValue.Tasks, &taskList)
if err != nil { if err != nil {
@ -366,5 +368,7 @@ func CreateWorkOrder(c *gin.Context) (err error) {
go ExecTask(taskList, string(params)) go ExecTask(taskList, string(params))
} }
}
return return
} }

View File

@ -404,6 +404,7 @@ func (h *Handle) HandleWorkOrder(
flowProperties int, flowProperties int,
remarks string, remarks string,
tpls []map[string]interface{}, tpls []map[string]interface{},
isExecTask bool,
) (err error) { ) (err error) {
h.workOrderId = workOrderId h.workOrderId = workOrderId
h.flowProperties = flowProperties h.flowProperties = flowProperties
@ -907,6 +908,7 @@ func (h *Handle) HandleWorkOrder(
}(bodyData) }(bodyData)
} }
if isExecTask {
// 执行流程公共任务及节点任务 // 执行流程公共任务及节点任务
if h.stateValue["task"] != nil { if h.stateValue["task"] != nil {
for _, task := range h.stateValue["task"].([]interface{}) { for _, task := range h.stateValue["task"].([]interface{}) {
@ -931,6 +933,6 @@ continueTag:
return err return err
} }
go ExecTask(execTasks, string(params)) go ExecTask(execTasks, string(params))
}
return return
} }

View File

@ -1,9 +1,10 @@
package captcha package captcha
import ( import (
"image/color"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/mojocn/base64Captcha" "github.com/mojocn/base64Captcha"
"image/color"
) )
var store = base64Captcha.DefaultMemStore var store = base64Captcha.DefaultMemStore
@ -20,7 +21,6 @@ type configJsonBody struct {
DriverDigit *base64Captcha.DriverDigit DriverDigit *base64Captcha.DriverDigit
} }
func DriverStringFunc() (id, b64s string, err error) { func DriverStringFunc() (id, b64s string, err error) {
e := configJsonBody{} e := configJsonBody{}
e.Id = uuid.New().String() e.Id = uuid.New().String()
@ -30,11 +30,10 @@ func DriverStringFunc() (id, b64s string, err error) {
return cap.Generate() return cap.Generate()
} }
func DriverDigitFunc() (id, b64s string, err error) { func DriverDigitFunc() (id, b64s string, err error) {
e := configJsonBody{} e := configJsonBody{}
e.Id = uuid.New().String() e.Id = uuid.New().String()
e.DriverDigit = base64Captcha.DefaultDriverDigit e.DriverDigit = base64Captcha.NewDriverDigit(80, 240, 4, 0.7, 80)
driver := e.DriverDigit driver := e.DriverDigit
cap := base64Captcha.NewCaptcha(driver, store) cap := base64Captcha.NewCaptcha(driver, store)
return cap.Generate() return cap.Generate()