|
@@ -46,11 +46,11 @@ type UserTask struct {
|
|
|
}
|
|
|
|
|
|
type CalculateResult struct {
|
|
|
- Scale entity.MarketScaleMain // 市场概况+时间分布
|
|
|
- TopProject entity.MarketTopProject // 项目规模TOP10 集合
|
|
|
- ProjectAllData entity.MarketProjectAllData /* 项目规模 地区分布 客户分布 地区客户top3*/
|
|
|
- ScaleRefine entity.MarketScaleRefine //细化市场
|
|
|
- BuyerAndWinner entity.MarketBuyerAndWinner /* 市场-采购单位&&中标企业*/
|
|
|
+ Scale *entity.MarketScaleMain // 市场概况+时间分布
|
|
|
+ TopProject *entity.MarketTopProject // 项目规模TOP10 集合
|
|
|
+ ProjectAllData *entity.MarketProjectAllData /* 项目规模 地区分布 客户分布 地区客户top3*/
|
|
|
+ ScaleRefine *entity.MarketScaleRefine //细化市场
|
|
|
+ BuyerAndWinner *entity.MarketBuyerAndWinner /* 市场-采购单位&&中标企业*/
|
|
|
}
|
|
|
|
|
|
func NewUserInfo() *UserTask {
|
|
@@ -58,10 +58,16 @@ func NewUserInfo() *UserTask {
|
|
|
PInfo: make(chan *entity.ProjectInfo, 2000),
|
|
|
AnalysisParam: entity.AnalyzeParameters{},
|
|
|
Ticker: time.NewTicker(time.Duration(10000) * time.Second),
|
|
|
- Result: &CalculateResult{},
|
|
|
- JudgmentMap: make(map[string]bool),
|
|
|
- CalculateWG: sync.WaitGroup{},
|
|
|
- Started: 0, //重置
|
|
|
+ Result: &CalculateResult{
|
|
|
+ Scale: &entity.MarketScaleMain{}, // 市场概况+时间分布
|
|
|
+ TopProject: &entity.MarketTopProject{}, // 项目规模TOP10 集合
|
|
|
+ ProjectAllData: &entity.MarketProjectAllData{}, /* 项目规模 地区分布 客户分布 地区客户top3*/
|
|
|
+ ScaleRefine: &entity.MarketScaleRefine{}, //细化市场
|
|
|
+ BuyerAndWinner: &entity.MarketBuyerAndWinner{}, /* 市场-采购单位&&中标企业*/
|
|
|
+ },
|
|
|
+ JudgmentMap: make(map[string]bool),
|
|
|
+ CalculateWG: sync.WaitGroup{},
|
|
|
+ Started: 0, //重置
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1246,7 +1252,13 @@ func (ut *UserTask) SendMsg() {
|
|
|
// Reset RESET
|
|
|
func (ut *UserTask) Reset() {
|
|
|
ut.JudgmentMap = map[string]bool{}
|
|
|
- ut.Result = &CalculateResult{}
|
|
|
+ ut.Result = &CalculateResult{
|
|
|
+ Scale: &entity.MarketScaleMain{}, // 市场概况+时间分布
|
|
|
+ TopProject: &entity.MarketTopProject{}, // 项目规模TOP10 集合
|
|
|
+ ProjectAllData: &entity.MarketProjectAllData{}, /* 项目规模 地区分布 客户分布 地区客户top3*/
|
|
|
+ ScaleRefine: &entity.MarketScaleRefine{}, //细化市场
|
|
|
+ BuyerAndWinner: &entity.MarketBuyerAndWinner{} /* 市场-采购单位&&中标企业*/
|
|
|
+ }
|
|
|
ut.AnalysisParam = entity.AnalyzeParameters{}
|
|
|
close(ut.PInfo)
|
|
|
ut.IsEnd = false
|