|
|
@@ -20,8 +20,10 @@ type ConverseController struct {
|
|
|
|
|
|
// 查询样本库系统,进行接口任务处理
|
|
|
func (this *ConverseController) SearchDatabase() map[string]*RequestEntity {
|
|
|
+ log.Println("组装请求数据报文开始---")
|
|
|
svc := GetConverseService(utils.DBE)
|
|
|
tasks := svc.ScanNewTaskDetail()
|
|
|
+ // tasks := svc.GetNewTaskBasic()
|
|
|
var reqMap = make(map[string]*RequestEntity)
|
|
|
|
|
|
//依次处理每一条新任务信息
|
|
|
@@ -29,7 +31,7 @@ func (this *ConverseController) SearchDatabase() map[string]*RequestEntity {
|
|
|
var time int64 = time.Now().Unix()
|
|
|
|
|
|
taskid := value.Task_id + "@" + strconv.FormatInt(time, 10)
|
|
|
- log.Println("taskid:", taskid)
|
|
|
+ // log.Println("taskid:", taskid)
|
|
|
//如果没有任务实体, 则创建新任务实体
|
|
|
if _, ok := reqMap[value.Task_id]; !ok {
|
|
|
entity := svc.GenerateRequestEntity(value.Task_type /*value.Task_id*/, taskid)
|
|
|
@@ -37,12 +39,15 @@ func (this *ConverseController) SearchDatabase() map[string]*RequestEntity {
|
|
|
}
|
|
|
//处理任务详细
|
|
|
svc.HandleTaskDetail(value.Task_type, reqMap[value.Task_id], &value)
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
for _, v := range reqMap {
|
|
|
- log.Println("****************************")
|
|
|
+ //log.Println("****************************")
|
|
|
m, _ := json.Marshal(v)
|
|
|
log.Println(string(m))
|
|
|
}
|
|
|
+ //log.Println("组装请求数据报文:",reqMap)
|
|
|
return reqMap
|
|
|
}
|
|
|
|