|
|
@@ -1096,75 +1096,74 @@ func processAnalysisEarlyWarning(target []string, pastureId string, serviceId in
|
|
|
|
|
|
func manualUdData(pastureinfo *udPastureInfo) {
|
|
|
c := cron.New()
|
|
|
- c.AddFunc("20 11 * * *", func() {
|
|
|
- fmt.Println(time.Now(),"111111111111111111111")
|
|
|
- // tx := restful.Engine.NewSession()
|
|
|
- // defer tx.Close()
|
|
|
- // now := time.Now().AddDate(0, 0, -1).Format("2006-01-02")
|
|
|
- // // now := "2023-02-22"
|
|
|
- // dataList, err := tx.SQL(" select id from downloadedplan where mydate = ? ", now).QueryString()
|
|
|
- // if err != nil {
|
|
|
- // logging.Error("manualUdData-error-1:", err)
|
|
|
- // return
|
|
|
- // }
|
|
|
- // var idList []string
|
|
|
- // for _, data := range dataList {
|
|
|
- // idList = append(idList, data["id"])
|
|
|
- // }
|
|
|
+ c.AddFunc("10 07 * * *", func() {
|
|
|
+ tx := restful.Engine.NewSession()
|
|
|
+ defer tx.Close()
|
|
|
+ now := time.Now().AddDate(0, 0, -1).Format("2006-01-02")
|
|
|
+ // now := "2023-02-22"
|
|
|
+ dataList, err := tx.SQL(" select id from downloadedplan where mydate = ? ", now).QueryString()
|
|
|
+ if err != nil {
|
|
|
+ logging.Error("manualUdData-error-1:", err)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ var idList []string
|
|
|
+ for _, data := range dataList {
|
|
|
+ idList = append(idList, data["id"])
|
|
|
+ }
|
|
|
|
|
|
- // upList := make([]*ScheduledUpInfo, 0)
|
|
|
- // up := tx.Table("scheduled_up")
|
|
|
-
|
|
|
- // up.Where("company = ? ", "ud")
|
|
|
- // up.Where("datatype in (3,4,1)")
|
|
|
- // // up.Where("datatype in (8)")
|
|
|
- // up.Where("automatic = 1")
|
|
|
- // err = up.Find(&upList)
|
|
|
- // if err != nil {
|
|
|
- // logging.Error("manualUdData-error-2: ", err)
|
|
|
- // return
|
|
|
- // }
|
|
|
+ upList := make([]*ScheduledUpInfo, 0)
|
|
|
+ up := tx.Table("scheduled_up")
|
|
|
|
|
|
- // for _, item := range upList {
|
|
|
- // if item.Datasql != "" {
|
|
|
- // // if item.Datatype == 4 {
|
|
|
- // targetdataList := strings.Split(item.Targetdata, ",")
|
|
|
- // var args []interface{}
|
|
|
- // for _, targetdata := range targetdataList {
|
|
|
- // if targetdata == "pastureid" {
|
|
|
- // args = append(args, pastureinfo.Pastureid)
|
|
|
- // } else if targetdata == "idlist" {
|
|
|
- // item.Datasql = strings.ReplaceAll(item.Datasql, "idlist", strings.Join(idList, ","))
|
|
|
- // } else if targetdata == "date" {
|
|
|
- // args = append(args, now)
|
|
|
- // }
|
|
|
- // }
|
|
|
- // data, err := tx.SQL(item.Datasql, args...).Query().List()
|
|
|
- // if err != nil {
|
|
|
- // logging.Error("manualUdData-error-3: ", err)
|
|
|
- // continue
|
|
|
- // }
|
|
|
- // if len(data) > 0 {
|
|
|
- // databyte, err := json.Marshal(data)
|
|
|
- // if err != nil {
|
|
|
- // logging.Error("manualUdData-error-4: ", err)
|
|
|
- // continue
|
|
|
- // }
|
|
|
- // exist, err := tx.SQL(`select * from saplog where pastureId = ? and msgtype = ? and date_format(dataDate ,'%Y-%m-%d') = ? `,
|
|
|
- // pastureinfo.Pastureid, item.Datatype, now).Exist()
|
|
|
- // if exist {
|
|
|
- // continue
|
|
|
- // }
|
|
|
-
|
|
|
- // tx.Exec(` insert into saplog(pastureId,request,response,status,msgtext,createTime,msgtype,dataDate,url)
|
|
|
- // values(?,?,?,?,?,now(),?,?,?)`, pastureinfo.Pastureid, string(databyte), "", "", "", item.Datatype, now, "https://wdc.unidairy.cn/copartner_uploads/")
|
|
|
-
|
|
|
- // var method string
|
|
|
- // UDPostPush1(fmt.Sprintf(item.Package, string(databyte), len(data)), method)
|
|
|
- // }
|
|
|
- // // }
|
|
|
- // }
|
|
|
- // }
|
|
|
+ up.Where("company = ? ", "ud")
|
|
|
+ up.Where("datatype in (3,4,1)")
|
|
|
+ // up.Where("datatype in (8)")
|
|
|
+ up.Where("automatic = 1")
|
|
|
+ err = up.Find(&upList)
|
|
|
+ if err != nil {
|
|
|
+ logging.Error("manualUdData-error-2: ", err)
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ for _, item := range upList {
|
|
|
+ if item.Datasql != "" {
|
|
|
+ // if item.Datatype == 4 {
|
|
|
+ targetdataList := strings.Split(item.Targetdata, ",")
|
|
|
+ var args []interface{}
|
|
|
+ for _, targetdata := range targetdataList {
|
|
|
+ if targetdata == "pastureid" {
|
|
|
+ args = append(args, pastureinfo.Pastureid)
|
|
|
+ } else if targetdata == "idlist" {
|
|
|
+ item.Datasql = strings.ReplaceAll(item.Datasql, "idlist", strings.Join(idList, ","))
|
|
|
+ } else if targetdata == "date" {
|
|
|
+ args = append(args, now)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ data, err := tx.SQL(item.Datasql, args...).Query().List()
|
|
|
+ if err != nil {
|
|
|
+ logging.Error("manualUdData-error-3: ", err)
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ if len(data) > 0 {
|
|
|
+ databyte, err := json.Marshal(data)
|
|
|
+ if err != nil {
|
|
|
+ logging.Error("manualUdData-error-4: ", err)
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ exist, err := tx.SQL(`select * from saplog where pastureId = ? and msgtype = ? and date_format(dataDate ,'%Y-%m-%d') = ? `,
|
|
|
+ pastureinfo.Pastureid, item.Datatype, now).Exist()
|
|
|
+ if exist {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+
|
|
|
+ tx.Exec(` insert into saplog(pastureId,request,response,status,msgtext,createTime,msgtype,dataDate,url)
|
|
|
+ values(?,?,?,?,?,now(),?,?,?)`, pastureinfo.Pastureid, string(databyte), "", "", "", item.Datatype, now, "https://wdc.unidairy.cn/copartner_uploads/")
|
|
|
+
|
|
|
+ var method string
|
|
|
+ UDPostPush1(fmt.Sprintf(item.Package, string(databyte), len(data)), method)
|
|
|
+ }
|
|
|
+ // }
|
|
|
+ }
|
|
|
+ }
|
|
|
})
|
|
|
c.Start()
|
|
|
|