添加邮件通知。
This commit is contained in:
Mr. Lan
parent
9f3e66e50f
commit
c2c9576ac0
@ -213,13 +213,15 @@ func CreateWorkOrder(c *gin.Context) {
|
||||
SendTo: map[string]interface{}{
|
||||
"userList": sendToUserList,
|
||||
},
|
||||
Subject: "您有一条待办工单，请及时处理。",
|
||||
Classify: noticeList,
|
||||
Id: workOrderValue.Id,
|
||||
Title: workOrderValue.Title,
|
||||
Creator: userInfo.NickName,
|
||||
Priority: workOrderValue.Priority,
|
||||
CreatedAt: time.Now().Format("2006-01-02 15:04:05"),
|
||||
Subject: "您有一条待办工单，请及时处理",
|
||||
Description: "您有一条待办工单请及时处理，工单描述如下",
|
||||
Classify: noticeList,
|
||||
ProcessId: workOrderValue.Process,
|
||||
Id: workOrderInfo.Id,
|
||||
Title: workOrderValue.Title,
|
||||
Creator: userInfo.NickName,
|
||||
Priority: workOrderValue.Priority,
|
||||
CreatedAt: time.Now().Format("2006-01-02 15:04:05"),
|
||||
}
|
||||
bodyData.SendNotify()
|
||||
}()
|
||||
|
||||
@ -4,7 +4,6 @@ import (
|
||||
"bytes"
|
||||
"ferry/models/system"
|
||||
"ferry/pkg/notify/email"
|
||||
"os"
|
||||
"text/template"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
@ -26,6 +25,8 @@ type BodyData struct {
|
||||
PriorityValue string // 工单优先级
|
||||
CreatedAt string // 工单创建时间
|
||||
Content string // 通知的内容
|
||||
Description string // 表格上面的描述信息
|
||||
ProcessId int // 流程ID
|
||||
}
|
||||
|
||||
func (b *BodyData) ParsingTemplate() (err error) {
|
||||
@ -34,7 +35,6 @@ func (b *BodyData) ParsingTemplate() (err error) {
|
||||
buf bytes.Buffer
|
||||
)
|
||||
|
||||
log.Info(os.Getwd())
|
||||
tmpl, err := template.ParseFiles("./pkg/notify/template/email.html")
|
||||
if err != nil {
|
||||
return
|
||||
@ -68,15 +68,18 @@ func (b *BodyData) SendNotify() {
|
||||
for _, c := range b.Classify {
|
||||
switch c {
|
||||
case 1: // 邮件
|
||||
for _, user := range b.SendTo.(map[string]interface{})["userList"].([]system.SysUser) {
|
||||
emailList = append(emailList, user.Email)
|
||||
users := b.SendTo.(map[string]interface{})["userList"].([]system.SysUser)
|
||||
if len(users) > 0 {
|
||||
for _, user := range users {
|
||||
emailList = append(emailList, user.Email)
|
||||
}
|
||||
err = b.ParsingTemplate()
|
||||
if err != nil {
|
||||
log.Errorf("模版内容解析失败，%v", err.Error())
|
||||
return
|
||||
}
|
||||
go email.SendMail(emailList, b.Subject, b.Content)
|
||||
}
|
||||
err = b.ParsingTemplate()
|
||||
if err != nil {
|
||||
log.Errorf("模版内容解析失败，%v", err.Error())
|
||||
return
|
||||
}
|
||||
go email.SendMail(emailList, b.Subject, b.Content)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
</head>
|
||||
<body>
|
||||
<br>
|
||||
您有一条待办工单请及时处理，以下为工单详情：
|
||||
{{ .Description }}：
|
||||
<br>
|
||||
<br>
|
||||
<table>
|
||||
@ -29,7 +29,7 @@
|
||||
</table>
|
||||
|
||||
<br>
|
||||
<a href="" target="_blank">点击此处跳转工单详情</a>
|
||||
<a href="http://localhost:9527/#/process/handle-ticket?workOrderId={{ .Id }}&processId={{ .ProcessId }}" target="_blank">点击此处跳转到工单详情</a>
|
||||
</body>
|
||||
<style>
|
||||
table {
|
||||
|
||||
@ -7,6 +7,7 @@ import (
|
||||
"ferry/models/base"
|
||||
"ferry/models/process"
|
||||
"ferry/models/system"
|
||||
"ferry/pkg/notify"
|
||||
"ferry/tools"
|
||||
"ferry/tools/app"
|
||||
"fmt"
|
||||
@ -338,6 +339,11 @@ func (h *Handle) HandleWorkOrder(
|
||||
parallelStatusOk bool
|
||||
processInfo process.Info
|
||||
currentUserInfo system.SysUser
|
||||
sendToUserList []system.SysUser
|
||||
noticeList []int
|
||||
stateList []map[string]interface{}
|
||||
sendSubject string = "您有一条待办工单，请及时处理"
|
||||
sendDescription string = "您有一条待办工单请及时处理，工单描述如下"
|
||||
)
|
||||
|
||||
defer func() {
|
||||
@ -651,9 +657,10 @@ func (h *Handle) HandleWorkOrder(
|
||||
h.tx.Rollback()
|
||||
return
|
||||
}
|
||||
|
||||
// 判断目标是否是结束节点
|
||||
if h.targetStateValue["clazz"] == "end" && h.endHistory == true {
|
||||
sendSubject = "您的工单已完成"
|
||||
sendDescription = "您的工单已完成，工单描述如下"
|
||||
err = h.tx.Create(&process.CirculationHistory{
|
||||
Model: base.Model{},
|
||||
Title: h.workOrderDetails.Title,
|
||||
@ -672,6 +679,39 @@ func (h *Handle) HandleWorkOrder(
|
||||
|
||||
h.tx.Commit() // 提交事务
|
||||
|
||||
// 发送通知
|
||||
err = json.Unmarshal(processInfo.Notice, ¬iceList)
|
||||
if err != nil {
|
||||
app.Error(c, -1, err, "")
|
||||
return
|
||||
}
|
||||
if len(noticeList) > 0 {
|
||||
sendToUserList, err = GetPrincipalUserInfo(stateList, h.workOrderDetails.Creator)
|
||||
if err != nil {
|
||||
app.Error(c, -1, err, fmt.Sprintf("获取所有处理人的用户信息失败，%v", err.Error()))
|
||||
return
|
||||
}
|
||||
|
||||
// 发送通知
|
||||
go func() {
|
||||
bodyData := notify.BodyData{
|
||||
SendTo: map[string]interface{}{
|
||||
"userList": sendToUserList,
|
||||
},
|
||||
Subject: sendSubject,
|
||||
Description: sendDescription,
|
||||
Classify: noticeList,
|
||||
ProcessId: h.workOrderDetails.Process,
|
||||
Id: h.workOrderDetails.Id,
|
||||
Title: h.workOrderDetails.Title,
|
||||
Creator: currentUserInfo.NickName,
|
||||
Priority: h.workOrderDetails.Priority,
|
||||
CreatedAt: h.workOrderDetails.CreatedAt.Format("2006-01-02 15:04:05"),
|
||||
}
|
||||
bodyData.SendNotify()
|
||||
}()
|
||||
}
|
||||
|
||||
// 执行流程公共任务及节点任务
|
||||
if h.stateValue["task"] != nil {
|
||||
for _, task := range h.stateValue["task"].([]interface{}) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user