软件牛头数同步

http/handle/api/report.go

@@ -30,7 +30,15 @@ func praseReportform(sqlnamestr string, parammaps *gofasion.Fasion, tx *xorm.Ses
 	}
 	queryList, err := tx.SQL(sql, s_params...).Query().List()
 	//############
-	sql2, p2 := restful.GetSqlByNameDBT("getFeednameSort", tx)
+
+	sqlNameStr :=""
+	if sqlnamestr != "getMaterialAnalysisUD"{
+		sqlNameStr ="getFeednameSort"
+	}else{
+		sqlNameStr ="getUdFeednameSort"
+	}
+
+	sql2, p2 := restful.GetSqlByNameDBT(sqlNameStr, tx)
 	s_params2 := make([]interface{}, 0)
 	if sql2 != "" {
 		paramslist2 := strings.Split(p2, ",")
@@ -49,7 +57,13 @@ func praseReportform(sqlnamestr string, parammaps *gofasion.Fasion, tx *xorm.Ses
 		}
 	}
 	// #########
-	sql3, p3 := restful.GetSqlByNameDBT("getFeednameSort2", tx)
+	sqlNameStr2 :=""
+	if sqlnamestr != "getMaterialAnalysisUD"{
+		sqlNameStr2 ="getFeednameSort2"
+	}else{
+		sqlNameStr2 ="getUdFeednameSort2"
+	}
+	sql3, p3 := restful.GetSqlByNameDBT( sqlNameStr2, tx)
 	s_params3 := make([]interface{}, 0)
 	if sql3 != "" {
 		paramslist3 := strings.Split(p3, ",")

http/handle/api/scheduled.go

@@ -1096,74 +1096,75 @@ func processAnalysisEarlyWarning(target []string, pastureId string, serviceId in
 
 func manualUdData(pastureinfo *udPastureInfo) {
 	c := cron.New()
-	c.AddFunc("30 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
-		}
-
-		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
-					}
+	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"])
+		// }
 
-					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/")
+		// 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
+		// }
 
-					var method string
-					UDPostPush1(fmt.Sprintf(item.Package, string(databyte), len(data)), method)
-				}
-				// }
-			}
-		}
+		// 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()