cow: 生长曲线图

model/data_indicators.go

@@ -1,28 +0,0 @@
-package model
-
-type DataIndicators struct {
-	Id            int64  `json:"id"`
-	PastureId     int64  `json:"pastureId"`
-	DateTime      string `json:"dateTime"`
-	IndicatorKind string `json:"indicatorKind"`
-	Name          string `json:"name"`
-	Value         string `json:"value"`
-	Remarks       string `json:"remarks"`
-	CreatedAt     int64  `json:"createdAt"`
-	UpdatedAt     int64  `json:"updatedAt"`
-}
-
-func (d *DataIndicators) TableName() string {
-	return "data_indicators"
-}
-
-func NewDataIndicators(pastureId int64, dataTime, value, remarks, indicatorKind, name string) *DataIndicators {
-	return &DataIndicators{
-		PastureId:     pastureId,
-		DateTime:      dataTime,
-		IndicatorKind: indicatorKind,
-		Name:          name,
-		Value:         value,
-		Remarks:       remarks,
-	}
-}

model/event_weight.go

@@ -59,13 +59,20 @@ func (e EventWeightSlice) ToPB() []*pasturePb.CowGrowthCurveData {
 			weightAtFormat = time.Unix(v.WeightAt, 0).Format(LayoutTime)
 		}
 
+		avgWeight := float32(0)
+		if i > 0 {
+			avgWeight = float32(v.Weight-e[i-1].Weight) / float32(v.WeightAt-e[i-1].WeightAt) / 24 / 1000
+		}
+
 		res[i] = &pasturePb.CowGrowthCurveData{
 			Weight:          float32(v.Weight) / 1000,
 			WeightAtFormat:  weightAtFormat,
-			AvgWeight:       0, // 平均体重
-			DayAddWeight:    0, // 日增重
-			AvgDayAddWeight: 0, // 平均日增重
-			MonthAddWeight:  0, // 月增重
+			AvgWeight:       0,              // 平均体重
+			DayAddWeight:    0,              // 日增重
+			AvgDayAddWeight: avgWeight,      // 阶段日增重
+			MonthAddWeight:  avgWeight * 30, // 月增重
 		}
 	}
+
+	return res
 }

model/indicators_data.go

@@ -0,0 +1,26 @@
+package model
+
+type IndicatorsData struct {
+	Id        int64  `json:"id"`
+	PastureId int64  `json:"pastureId"`
+	Year      string `json:"year"`
+	Month     string `json:"month"`
+	Kind      string `json:"kind"`
+	Value     string `json:"value"`
+	CreatedAt int64  `json:"createdAt"`
+	UpdatedAt int64  `json:"updatedAt"`
+}
+
+func (d *IndicatorsData) TableName() string {
+	return "indicators_data"
+}
+
+func NewDataIndicators(pastureId int64, year, month, value, indicatorKind string) *IndicatorsData {
+	return &IndicatorsData{
+		PastureId: pastureId,
+		Year:      year,
+		Month:     month,
+		Kind:      indicatorKind,
+		Value:     value,
+	}
+}

model/indicators_remarks.go

@@ -0,0 +1,16 @@
+package model
+
+type IndicatorsRemarks struct {
+	Id        int    `json:"id"`
+	Kind      string `json:"kind"`
+	Name      string `json:"name"`
+	Unit      string `json:"unit"`
+	Zh        string `json:"zh"`
+	En        string `json:"en"`
+	CreatedAt int64  `json:"createdAt"`
+	UpdatedAt int64  `json:"updatedAt"`
+}
+
+func (IndicatorsRemarks) TableName() string {
+	return "indicators_remarks"
+}

model/neck_active_habit.go

@@ -188,8 +188,8 @@ func (n NeckActiveHabitSlice) ToPB(curveName, startDateTime, endDateTime string)
 			res.ChangeDateList = append(res.ChangeDateList, v.ChangeChew)
 			res.SumDateList = append(res.SumDateList, 0)
 		case "immobility": // 静止
-			res.OriginalDateList = append(res.OriginalDateList, 0)
-			res.SumDateList = append(res.SumDateList, 0)
+			res.OriginalDateList = append(res.OriginalDateList, 120-v.Active)
+			res.SumDateList = append(res.SumDateList, 60*24-v.SumActive)
 		}
 		initFrameId++
 	}

module/crontab/neck_ring_handle.go

@@ -95,18 +95,19 @@ func (e *Entry) NeckRingOriginalMergeData() (err error) {
 		} else {
 			// 重新计算
 			newNeckActiveHabit := e.againRecalculate(historyNeckActiveHabit)
-			if newNeckActiveHabit != nil {
-				if err = e.DB.Model(new(model.NeckActiveHabit)).
-					Select("rumina", "intake", "inactive", "gasp", "other", "high", "active", "is_show").
-					Where("id = ?", historyNeckActiveHabit.Id).
-					Updates(newNeckActiveHabit).Error; err != nil {
-					zaplog.Error("NeckRingOriginalMergeData-3",
-						zap.Any("err", err),
-						zap.Any("ct", ct),
-						zap.Any("historyNeckActiveHabit", historyNeckActiveHabit),
-						zap.Any("newNeckActiveHabit", newNeckActiveHabit),
-					)
-				}
+			if newNeckActiveHabit == nil {
+				continue
+			}
+			if err = e.DB.Model(new(model.NeckActiveHabit)).
+				Select("rumina", "intake", "inactive", "gasp", "other", "high", "active", "is_show", "record_count").
+				Where("id = ?", historyNeckActiveHabit.Id).
+				Updates(newNeckActiveHabit).Error; err != nil {
+				zaplog.Error("NeckRingOriginalMergeData-3",
+					zap.Any("err", err),
+					zap.Any("ct", ct),
+					zap.Any("historyNeckActiveHabit", historyNeckActiveHabit),
+					zap.Any("newNeckActiveHabit", newNeckActiveHabit),
+				)
 			}
 		}
 
@@ -264,6 +265,10 @@ func (e *Entry) EntryUpdateActiveHabit(pastureId int64) (err error) {
 		if err = e.WeeklyUpdateActiveHabit(pastureId, processIds, xToday); err != nil {
 			zaplog.Error("NeckRingCalculate", zap.Any("WeeklyUpdateActiveHabit", err), zap.Any("xToday", xToday))
 		}
+
+		if err = e.Before3DaysNeckActiveHabit(pastureId, processIds, xToday); err != nil {
+			zaplog.Error("NeckRingCalculate", zap.Any("Before3DaysNeckActiveHabit", err), zap.Any("xToday", xToday))
+		}
 		// 二次更新滤波
 		if err = e.SecondUpdateChangeFilter(pastureId, xToday); err != nil {
 			zaplog.Error("NeckRingCalculate", zap.Any("SecondUpdateChangeFilter", err), zap.Any("xToday", xToday))
@@ -422,8 +427,6 @@ func (e *Entry) WeeklyUpdateActiveHabit(pastureId int64, processIds []int64, xTo
 		}
 
 		sumHabitData := e.FindSumHabitData(pastureId, v.NeckRingNumber, v.HeatDate, v.Frameid, xToDay)
-		before3DaysNeckActiveHabit := e.FindBefore3DaysNeckActiveHabit(pastureId, v.NeckRingNumber, v.HeatDate, v.Frameid)
-
 		// 更新过滤值
 		if err = e.DB.Model(new(model.NeckActiveHabit)).
 			Select(
@@ -432,23 +435,21 @@ func (e *Entry) WeeklyUpdateActiveHabit(pastureId int64, processIds []int64, xTo
 				"change_high", "change_rumina", "change_chew", "before_three_sum_rumina", "before_three_sum_intake",
 			).Where("id = ?", v.Id).
 			Updates(map[string]interface{}{
-				"week_high_habit":         weekHabitData.WeekHighHabit,
-				"week_rumina_habit":       weekHabitData.WeekRuminaHabit,
-				"week_chew_habit":         weekHabitData.WeekChewHabit,
-				"week_intake_habit":       weekHabitData.WeekIntakeHabit,
-				"week_inactive_habit":     weekHabitData.WeekIntakeHabit,
-				"sum_rumina":              sumHabitData.SumRumina,
-				"sum_intake":              sumHabitData.SumIntake,
-				"sum_inactive":            sumHabitData.SumInactive,
-				"sum_active":              sumHabitData.SumActive,
-				"sum_max_high":            sumHabitData.SumMaxHigh,
-				"sum_min_high":            sumHabitData.SumMinHigh,
-				"sum_min_chew":            sumHabitData.SumMinChew,
-				"change_high":             v.ChangeHigh,
-				"change_rumina":           v.ChangeRumina,
-				"change_chew":             v.ChangeChew,
-				"before_three_sum_rumina": before3DaysNeckActiveHabit.SumRumina,
-				"before_three_sum_intake": before3DaysNeckActiveHabit.SumIntake,
+				"week_high_habit":     weekHabitData.WeekHighHabit,
+				"week_rumina_habit":   weekHabitData.WeekRuminaHabit,
+				"week_chew_habit":     weekHabitData.WeekChewHabit,
+				"week_intake_habit":   weekHabitData.WeekIntakeHabit,
+				"week_inactive_habit": weekHabitData.WeekIntakeHabit,
+				"sum_rumina":          sumHabitData.SumRumina,
+				"sum_intake":          sumHabitData.SumIntake,
+				"sum_inactive":        sumHabitData.SumInactive,
+				"sum_active":          sumHabitData.SumActive,
+				"sum_max_high":        sumHabitData.SumMaxHigh,
+				"sum_min_high":        sumHabitData.SumMinHigh,
+				"sum_min_chew":        sumHabitData.SumMinChew,
+				"change_high":         v.ChangeHigh,
+				"change_rumina":       v.ChangeRumina,
+				"change_chew":         v.ChangeChew,
 			}).Error; err != nil {
 			zaplog.Error("WeeklyUpdateActiveHabit",
 				zap.Error(err),
@@ -460,6 +461,34 @@ func (e *Entry) WeeklyUpdateActiveHabit(pastureId int64, processIds []int64, xTo
 	return err
 }
 
+func (e *Entry) Before3DaysNeckActiveHabit(pastureId int64, processIds []int64, xToDay *XToday) (err error) {
+	newNeckActiveHabitList := make([]*model.NeckActiveHabit, 0)
+	if err = e.DB.Model(new(model.NeckActiveHabit)).
+		Where("id IN (?)", processIds).
+		Order("heat_date,neck_ring_number,frameid").
+		Find(&newNeckActiveHabitList).Error; err != nil {
+		return xerr.WithStack(err)
+	}
+	for _, v := range newNeckActiveHabitList {
+		before3DaysNeckActiveHabit := e.FindBefore3DaysNeckActiveHabit(pastureId, v.NeckRingNumber, v.HeatDate, v.Frameid)
+		// 更新过滤值
+		if err = e.DB.Model(new(model.NeckActiveHabit)).
+			Select("before_three_sum_rumina", "before_three_sum_intake").
+			Where("id = ?", v.Id).
+			Updates(map[string]interface{}{
+				"before_three_sum_rumina": before3DaysNeckActiveHabit.SumRumina,
+				"before_three_sum_intake": before3DaysNeckActiveHabit.SumIntake,
+			}).Error; err != nil {
+			zaplog.Error("Before3DaysNeckActiveHabit",
+				zap.Error(err),
+				zap.Any("NeckActiveHabit", v),
+				zap.Any("pastureId", pastureId),
+			)
+		}
+	}
+	return nil
+}
+
 // SecondUpdateChangeFilter 第二次更新变化趋势滤波
 func (e *Entry) SecondUpdateChangeFilter(pastureId int64, xToday *XToday) (err error) {
 	newChangeFilterList := make([]*ChangeFilterData, 0)

module/crontab/sql.go

@@ -227,7 +227,7 @@ func (e *Entry) FindSumHabitData(pastureId int64, neckRingNumber, heatDate strin
 		Where("heat_date BETWEEN ? AND ?", before1DayDate, heatDate).
 		Where("active_time BETWEEN ? AND ?", activeStartTime, activeTime).
 		Where(e.DB.Where("high > ?", xToday.High).Or("rumina >= ?", xToday.Rumina)).
-		Where("neck_ring_number = ? AND frameid = ?", neckRingNumber, frameid).
+		Where("neck_ring_number = ?", neckRingNumber).
 		Group("neck_ring_number").First(sumHabitData).Debug().Error; err != nil {
 		zaplog.Error("WeeklyActiveAvgUpdate-2",
 			zap.Any("error", err),

util/util_test.go

@@ -508,12 +508,7 @@ func TestGetNeckRingActiveTimer(t *testing.T) {
 
 func Test_demo(t *testing.T) {
 
-	for i := 0; i <= 11; i++ {
-		switch i {
-		case 6:
-			fmt.Println("ok")
-		default:
-			fmt.Println("i", i)
-		}
-	}
+	beginDayDate, _ := time.Parse("2006-01-02", "2025-01-23")
+	before3DayDate := beginDayDate.AddDate(0, 0, -3).Format("2006-01-02")
+	fmt.Println(before3DayDate)
 }