|
@@ -56,9 +56,9 @@ type CalculateResult struct {
|
|
|
|
|
|
func NewUserInfo() *UserTask {
|
|
|
return &UserTask{
|
|
|
- PInfo: make(chan *entity.ProjectInfo, 2000),
|
|
|
+ PInfo: make(chan *entity.ProjectInfo, do.TaskConfig.UserTask.PtChan),
|
|
|
AnalysisParam: entity.AnalyzeParameters{},
|
|
|
- Ticker: time.NewTicker(time.Duration(10000) * time.Second),
|
|
|
+ Ticker: time.NewTicker(time.Duration(do.TaskConfig.UserTask.Ticker) * time.Second),
|
|
|
Result: &CalculateResult{
|
|
|
Scale: &entity.MarketScaleMain{}, // 市场概况+时间分布
|
|
|
TopProject: &entity.MarketTopProject{}, // 项目规模TOP10 集合
|
|
@@ -92,6 +92,7 @@ func (ut *UserTask) Run() {
|
|
|
}
|
|
|
select {
|
|
|
case info := <-ut.PInfo:
|
|
|
+ ut.Ticker.Reset(time.Duration(do.TaskConfig.UserTask.Ticker))
|
|
|
//项目信息匹配
|
|
|
if ut.MatchConditions(info) {
|
|
|
ut.CalculateLock.Lock()
|
|
@@ -1239,6 +1240,18 @@ func (ut *UserTask) ResultSave() {
|
|
|
g.Log().Info(model.Ctx, fmt.Sprintf("marketanalysisreport -- 保存失败-:%s , %s", consts.MarketBuyerAndWinner, ut.MgoUserId))
|
|
|
}
|
|
|
}
|
|
|
+ //其他结果 保存正常
|
|
|
+ if !ut.IsFalse {
|
|
|
+ //未取消
|
|
|
+ if ut.IsCancel = utility.IsAnalyzeCancel(ut.RId); !ut.IsCancel {
|
|
|
+ if ok := do.Mgo.UpdateById(consts.MarketAnalysisReport, ut.RId, map[string]interface{}{
|
|
|
+ "i_state": 1,
|
|
|
+ }); !ok {
|
|
|
+ ut.IsFalse = true
|
|
|
+ g.Log().Info(model.Ctx, fmt.Sprintf("marketanalysisreport -- 保存失败-:%s , %s", consts.MarketAnalysisReport, ut.RId))
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
// 消息通知
|