indicators: 指标管理

model/indicators_data.go

@@ -21,6 +21,9 @@ const (
 	CureNumber        = "cure_number"
 	OutNumber         = "out_number"
 	CalfDieNumber     = "calf_die_number"
+	LactationCow      = "lactation_cow"
+	DryMilkCow        = "dry_milk_cow"
+	ReserveCow        = "reserve_cow"
 )
 
 type IndicatorsData struct {

module/backend/event_breed_more_more.go

@@ -152,7 +152,7 @@ func (s *StoreEntry) ForbiddenMatingBatch(ctx context.Context, req *pasturePb.Ev
 			// 更新牛只信息
 			item.Cow.ForbiddenMatingUpdate(item.ForbiddenMatingAt)
 			if err = tx.Model(new(model.Cow)).
-				Select("is_forbidden_mating", "last_forbidden_mating_at").
+				Select("is_forbidden_mating", "last_forbidden_mating_at", "breed_status").
 				Updates(item.Cow).Error; err != nil {
 				return xerr.WithStack(err)
 			}
@@ -255,7 +255,7 @@ func (s *StoreEntry) UnForbiddenMating(ctx context.Context, req *pasturePb.Event
 			// 牛只解配更新
 			cowInfo.UnForbiddenMatingUpdate()
 			if err = tx.Model(new(model.Cow)).
-				Select("is_forbidden_mating", "last_forbidden_mating_at").
+				Select("is_forbidden_mating", "last_forbidden_mating_at", "breed_status").
 				Updates(cowInfo).Error; err != nil {
 				return xerr.WithStack(err)
 			}

module/crontab/cow_cron.go

@@ -93,6 +93,12 @@ func (e *Entry) Indicators() error {
 			pastureIndicatorList = e.FindDepartureNumber(pastureList, pasturePb.DepartureType_Out, startTime, endTime)
 		case model.CalfDieNumber:
 			pastureIndicatorList = e.FindCalfDieNumber(pastureList, pasturePb.DepartureType_Death, startTime, endTime)
+		case model.LactationCow:
+			pastureIndicatorList = e.LactationCow(pastureList, pasturePb.CowMilk_Lactation)
+		case model.DryMilkCow:
+			pastureIndicatorList = e.LactationCow(pastureList, pasturePb.CowMilk_Dry_Milk)
+		case model.ReserveCow:
+			pastureIndicatorList = e.LactationCow(pastureList, pasturePb.CowMilk_Reserve)
 		}
 
 		for pastureId, value := range pastureIndicatorList {

module/crontab/cow_indicators_breed.go

@@ -25,3 +25,19 @@ func (e *Entry) FindCalvingNumber(pastureList []*model.AppPastureList, startTime
 	}
 	return res
 }
+
+func (e *Entry) LactationCow(pastureList []*model.AppPastureList, milkKind pasturePb.CowMilk_Kind) map[int64]string {
+	res := make(map[int64]string)
+	for _, pasture := range pastureList {
+		var count int64
+		if err := e.DB.Model(new(model.Cow)).
+			Where("pasture_id = ?", pasture.Id).
+			Where("admission_status = ?", pasturePb.AdmissionStatus_Admission).
+			Where("milk_kind = ?", milkKind).
+			Count(&count).Error; err != nil {
+			zaplog.Error("LactationCow", zap.Any("pasture_id", pasture.Id), zap.Any("err", err))
+		}
+		res[pasture.Id] = fmt.Sprintf("%d", count)
+	}
+	return res
+}