|
@@ -4,7 +4,6 @@ import (
|
|
"encoding/json"
|
|
"encoding/json"
|
|
"fmt"
|
|
"fmt"
|
|
"sort"
|
|
"sort"
|
|
- "strings"
|
|
|
|
"time"
|
|
"time"
|
|
"tmr-watch/models"
|
|
"tmr-watch/models"
|
|
"tmr-watch/module"
|
|
"tmr-watch/module"
|
|
@@ -142,11 +141,11 @@ func AnalysisAccuracyService(req *models.AnalysisAccuracyRequest) (*models.Analy
|
|
}
|
|
}
|
|
|
|
|
|
for _, mixedFodder := range mixedFodderCorrectDataList {
|
|
for _, mixedFodder := range mixedFodderCorrectDataList {
|
|
- myDate := strings.ReplaceAll(mixedFodder.Date, "T00:00:00+08:00", "")
|
|
|
|
- if myDate != dayTime {
|
|
|
|
|
|
+ mixDateStr, _ := time.ParseInLocation(time.RFC3339, mixedFodder.Date, time.Local)
|
|
|
|
+ mixDate := mixDateStr.Format("2006-01-02")
|
|
|
|
+ if mixDate != dayTime {
|
|
continue
|
|
continue
|
|
}
|
|
}
|
|
-
|
|
|
|
if mixedFodder.MixedCorrectNumber == 0 || mixedFodder.UseMixedFodderOptionNumber == 0 {
|
|
if mixedFodder.MixedCorrectNumber == 0 || mixedFodder.UseMixedFodderOptionNumber == 0 {
|
|
response.MixedFodderCorrectRatio = append(response.MixedFodderCorrectRatio, &models.PastureAnalysisAccuracyDataValue{
|
|
response.MixedFodderCorrectRatio = append(response.MixedFodderCorrectRatio, &models.PastureAnalysisAccuracyDataValue{
|
|
DayTime: dayTime,
|
|
DayTime: dayTime,
|
|
@@ -175,17 +174,11 @@ func AnalysisAccuracyService(req *models.AnalysisAccuracyRequest) (*models.Analy
|
|
}
|
|
}
|
|
|
|
|
|
if sprinkle.SprinkleCorrectNumber == 0 || sprinkle.UseSprinkleOptionNumber == 0 {
|
|
if sprinkle.SprinkleCorrectNumber == 0 || sprinkle.UseSprinkleOptionNumber == 0 {
|
|
- fmt.Println("====UseSprinkleOptionNumber=001==")
|
|
|
|
- fmt.Println("====SprinkleCorrectNumber===", sprinkle.SprinkleCorrectNumber)
|
|
|
|
- fmt.Println("====UseSprinkleOptionNumber===", sprinkle.UseSprinkleOptionNumber)
|
|
|
|
response.SprinkleFodderCorrectRatio = append(response.SprinkleFodderCorrectRatio, &models.PastureAnalysisAccuracyDataValue{
|
|
response.SprinkleFodderCorrectRatio = append(response.SprinkleFodderCorrectRatio, &models.PastureAnalysisAccuracyDataValue{
|
|
DayTime: dayTime,
|
|
DayTime: dayTime,
|
|
Ratio: 0,
|
|
Ratio: 0,
|
|
})
|
|
})
|
|
} else {
|
|
} else {
|
|
- fmt.Println("====UseSprinkleOptionNumber=002==")
|
|
|
|
- fmt.Println("====SprinkleCorrectNumber===", sprinkle.SprinkleCorrectNumber)
|
|
|
|
- fmt.Println("====UseSprinkleOptionNumber===", sprinkle.UseSprinkleOptionNumber)
|
|
|
|
response.SprinkleFodderCorrectRatio = append(response.SprinkleFodderCorrectRatio, &models.PastureAnalysisAccuracyDataValue{
|
|
response.SprinkleFodderCorrectRatio = append(response.SprinkleFodderCorrectRatio, &models.PastureAnalysisAccuracyDataValue{
|
|
DayTime: dayTime,
|
|
DayTime: dayTime,
|
|
Ratio: float64(sprinkle.SprinkleCorrectNumber) / float64(sprinkle.UseSprinkleOptionNumber) * 100,
|
|
Ratio: float64(sprinkle.SprinkleCorrectNumber) / float64(sprinkle.UseSprinkleOptionNumber) * 100,
|