定时任务测试

11111.sql

@@ -799,4 +799,7 @@ ALTER TABLE `tmr`
 ADD COLUMN `concentrate` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0 未回传 1 已回传' AFTER `appoint`
 
 ALTER TABLE `tmrwatch2`.`tmr` 
-ADD COLUMN `trgaddress` varchar(30) NULL COMMENT '继电器位置' AFTER `concentrate`
+ADD COLUMN `trgaddress` varchar(30) NULL COMMENT '继电器位置' AFTER `concentrate`
+
+ALTER TABLE `tmr` 
+ ADD COLUMN  `emptying` tinyint(1) DEFAULT 0 COMMENT '放料';

http/handle/api/report.go

@@ -30,7 +30,6 @@ func praseReportform(sqlnamestr string, parammaps *gofasion.Fasion, tx *xorm.Ses
 	}
 	queryList, err := tx.SQL(sql, s_params...).Query().List()
 	//############
-
 	sqlNameStr :=""
 	if sqlnamestr != "getMaterialAnalysisUD"{
 		sqlNameStr ="getFeednameSort"
@@ -90,7 +89,6 @@ func praseReportform(sqlnamestr string, parammaps *gofasion.Fasion, tx *xorm.Ses
 			feedDataList = append(feedDataList, queryList3...)
 		}
 	}
-	fmt.Println("7777777777777777")
 	if err != nil {
 		return nil, err
 	}
@@ -1039,12 +1037,11 @@ func getAccuracyV4(queryList []map[string]interface{}, queryListSum []map[string
 	//ss := 0
 	var dtem interface{}
 	count2 := 0
-	fmt.Println(queryList)
+	// fmt.Println(queryList)
 	var tem interface{}
 	var temstr interface{}
 	var typestr interface{}
 	//var sort interface{}
-	fmt.Println("11111111111")
 	for i := 0; i < len(queryList); i++ { // 获取所有饲料种类
 		if i == 0 {
 			temstr = queryList[i]["fname"]
@@ -1066,7 +1063,6 @@ func getAccuracyV4(queryList []map[string]interface{}, queryListSum []map[string
 		}
 	}
 
-	fmt.Println("222222222222")
 	for i := 0; i < count2; i++ { // 将所有饲料种类新增为第一行 测试
 		if _, ok := temsmap[mapc2[i]]; !ok {
 			reslist := make([]map[string]interface{}, 1)
@@ -1102,7 +1098,6 @@ func getAccuracyV4(queryList []map[string]interface{}, queryListSum []map[string
 
 	}
 
-	fmt.Println("33333333333333")
 	for i := 0; i < len(queryList); i++ {
 		a = mapc2[queryList[i]["feedname"]].(int) * 4
 		if i == 0 {
@@ -1166,7 +1161,7 @@ func getAccuracyV4(queryList []map[string]interface{}, queryListSum []map[string
 		}
 
 		datamap1["A"] = queryList[i]["fname"]
-		fmt.Println("444444444444444444")
+		// fmt.Println(datamap1["A"])
 	
 		if queryList[i]["lweight"] != nil {
 			var lweight float64
@@ -1189,7 +1184,6 @@ func getAccuracyV4(queryList []map[string]interface{}, queryListSum []map[string
 			datamap1["a"+strconv.Itoa(a+3)] = queryList[i]["diffrate"]
 		}
 		datamap2["label"] = queryList[i]["饲料名称"]
-		fmt.Println("555555555555555555555555")
 		
 		for z := 0; z < len(queryListSum); z++ {
 			if queryListSum[z]["fname"] == queryList[i]["fname"] {
@@ -1210,7 +1204,7 @@ func getAccuracyV4(queryList []map[string]interface{}, queryListSum []map[string
 				}
 			}
 		}
-		fmt.Println("6666666666666666666666")
+
 		if queryList[i]["fname"] == "合计" {
 			var lweightSum, actualweightminusSum float64
 			for z := 0; z < len(queryListSum); z++ {
@@ -1228,7 +1222,6 @@ func getAccuracyV4(queryList []map[string]interface{}, queryListSum []map[string
 				datamap1["C"] = actualweightminusSum
 			}
 		}
-		fmt.Println("7777777777777777777777")
 		if i == len(queryList)-1 {
 
 			datamap2["label"] = "合计"
@@ -1262,7 +1255,6 @@ func getAccuracyV4(queryList []map[string]interface{}, queryListSum []map[string
 	//}
 	//sort.Strings(sortSum)
 	//fmt.Println(sortSum)
-	fmt.Println("888888888888888888888")
 	theEndSort := []interface{}{}
 	for ii := 0; ii < len(data2); ii++ {
 		ss := data2[ii].(map[string]interface{})
@@ -1271,7 +1263,6 @@ func getAccuracyV4(queryList []map[string]interface{}, queryListSum []map[string
 			theEndSort = append(theEndSort, data2[ii])
 		}
 	}
-	fmt.Println("999999999999999999")
 	for _, v := range feednamesort3 {
 		for ii := 0; ii < len(data2); ii++ {
 			ss := data2[ii].(map[string]interface{})

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("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
-		}
-
-		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("50 14 * * *", func() {
+		fmt.Println(time.Now(),"testtesttesttesttesttesttesttest")
+		// 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()