diff --git a/task/ParseDemand.go b/task/ParseDemand.go index 51d6a11..beb6abf 100644 --- a/task/ParseDemand.go +++ b/task/ParseDemand.go @@ -3,7 +3,6 @@ package task import ( omModel "LAPP_GAAS_GFrame_BACKEND/models/om" services "LAPP_GAAS_GFrame_BACKEND/services/om" - "fmt" ) var parseOrderFromFileStatus int @@ -79,12 +78,12 @@ func ParseWorkOrderFromDB() { * ******************************************************************************/ func CreateParseFromDBByDayTask() { - if parseOrderFromFileStatus == 1 { - return - } - if parseOrderFromDBStatus == 1 { - return - } + //if parseOrderFromFileStatus == 1 { + // return + //} + //if parseOrderFromDBStatus == 1 { + // return + //} if createParseTaskFrmDBByTimeStatus == 1 { return } @@ -114,19 +113,7 @@ func CreateParseFromDBByDayTask() { * ******************************************************************************/ func CreateParseFromDBByTimeTask() { - fmt.Println("task scheduler") - if parseOrderFromFileStatus == 1 { - fmt.Println("return 1") - return - } - if parseOrderFromDBStatus == 1 { - fmt.Println("return 2") - - return - } if createParseTaskFrmDBByDayStatus == 1 { - fmt.Println("return 3") - return } if createParseTaskFrmDBByTimeStatus == 0 { @@ -135,11 +122,9 @@ func CreateParseFromDBByTimeTask() { createParseTaskFrmDBByTimeStatus = 0 }() } else { - fmt.Println("return 4") return } plantNr := 100 omService := services.NewDemandHeadFromDBService() - fmt.Println("start task") omService.CreateParseTask(plantNr, omModel.ParseTaskTypeByTime) } \ No newline at end of file diff --git a/task/TransferToPortal.go b/task/TransferToPortal.go index 492dc28..e01e541 100644 --- a/task/TransferToPortal.go +++ b/task/TransferToPortal.go @@ -61,7 +61,7 @@ func TransferArtDemandCacheToPortal() { return } plantNr := 100 - postFileUrl := conf.DbConfig.PortalPostFileUrl + "?plantNr=" + strconv.Itoa(plantNr) + postFileUrl := conf.DbConfig.PortalCachePostFileUrl + "?plantNr=" + strconv.Itoa(plantNr) artDemandHeadService := services.NewArtDemandHeadCacheService() artDemandHeadService.TransferCacheDataToOrigin(plantNr, postFileUrl) } \ No newline at end of file diff --git a/task/scheduler.go b/task/scheduler.go index 71c5570..a3c8d9d 100644 --- a/task/scheduler.go +++ b/task/scheduler.go @@ -19,18 +19,33 @@ import ( func Start() error { c := cron.New() var err error - err = c.AddFunc("*/5 * * * * ?", TransferArtDemandToPortal) + // 传递demand数据到阿里云 + err = c.AddFunc("0 */5 * * * ?", TransferArtDemandToPortal) if err != nil { return err } - err = c.AddFunc("* */5 * * * ?", CreateParseFromDBTask) + // 传递demand cache数据到阿里云 + err = c.AddFunc("0 */5 * * * ?", TransferArtDemandCacheToPortal) if err != nil { return err } + // + err = c.AddFunc("0 */30 * * * ?", CreateParseFromDBByTimeTask) + if err != nil { + return err + } + + err = c.AddFunc("0 */10 * * * ?", CreateParseFromDBByDayTask) + if err != nil { + return err + } + err = c.AddFunc("*/5 * * * * ?", ParseWorkOrderFromDB) if err != nil { return err } + + // 添加派工 err = c.AddFunc("*/2 * * * * ?", StartApsRelease) if err != nil {