|
@@ -4,6 +4,7 @@ import (
|
|
|
"encoding/json"
|
|
"encoding/json"
|
|
|
"log"
|
|
"log"
|
|
|
"strconv"
|
|
"strconv"
|
|
|
|
|
+ "strings"
|
|
|
"time"
|
|
"time"
|
|
|
|
|
|
|
|
// "github.com/astaxie/beego"
|
|
// "github.com/astaxie/beego"
|
|
@@ -27,14 +28,15 @@ func (this *ConverseController) SearchDatabase() map[string]*RequestEntity {
|
|
|
for _, value := range tasks {
|
|
for _, value := range tasks {
|
|
|
var time int64 = time.Now().Unix()
|
|
var time int64 = time.Now().Unix()
|
|
|
|
|
|
|
|
- taskid :=value.Task_id + strconv.FormatInt(time,10)
|
|
|
|
|
|
|
+ taskid :=value.Task_id +"_"+ strconv.FormatInt(time,10)
|
|
|
|
|
+ log.Println("taskid:",taskid)
|
|
|
//如果没有任务实体, 则创建新任务实体
|
|
//如果没有任务实体, 则创建新任务实体
|
|
|
- if _, ok := reqMap[taskid]; !ok {
|
|
|
|
|
- entity := svc.GenerateRequestEntity(value.Task_type, value.Task_id)
|
|
|
|
|
- reqMap[taskid] = entity
|
|
|
|
|
|
|
+ if _, ok := reqMap[value.Task_id]; !ok {
|
|
|
|
|
+ entity := svc.GenerateRequestEntity(value.Task_type, /*value.Task_id*/taskid)
|
|
|
|
|
+ reqMap[value.Task_id] = entity
|
|
|
}
|
|
}
|
|
|
//处理任务详细
|
|
//处理任务详细
|
|
|
- svc.HandleTaskDetail(value.Task_type, reqMap[taskid], &value)
|
|
|
|
|
|
|
+ svc.HandleTaskDetail(value.Task_type, reqMap[value.Task_id], &value)
|
|
|
}
|
|
}
|
|
|
for _, v := range reqMap {
|
|
for _, v := range reqMap {
|
|
|
log.Println("****************************")
|
|
log.Println("****************************")
|
|
@@ -111,7 +113,7 @@ func (this *ConverseController) HandleMessage(n int, message []byte) {
|
|
|
|
|
|
|
|
resp := res.Response
|
|
resp := res.Response
|
|
|
result := res.Result
|
|
result := res.Result
|
|
|
- taskId := res.Data.Task_id
|
|
|
|
|
|
|
+ taskId := strings.Split(res.Data.Task_id,"_")[0]
|
|
|
isEnd := res.Data.Is_end
|
|
isEnd := res.Data.Is_end
|
|
|
taskType := res.Data.Type
|
|
taskType := res.Data.Type
|
|
|
|
|
|