|
|
@@ -7,18 +7,20 @@ import (
|
|
|
"math"
|
|
|
"time"
|
|
|
|
|
|
+ pasturePb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/cow"
|
|
|
+
|
|
|
"gorm.io/gorm"
|
|
|
|
|
|
"gitee.com/xuyiping_admin/pkg/logger/zaplog"
|
|
|
"go.uber.org/zap"
|
|
|
|
|
|
- pasturePb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/cow"
|
|
|
"gitee.com/xuyiping_admin/pkg/xerr"
|
|
|
)
|
|
|
|
|
|
const (
|
|
|
MinChangeFilter = -99
|
|
|
MinRuminaFilter = -99
|
|
|
+ MinChewFilter = -99
|
|
|
MinChangeHigh = -99
|
|
|
DefaultNb = 30
|
|
|
DefaultScore = 100
|
|
|
@@ -45,88 +47,29 @@ func (e *Entry) EntryUpdateActiveHabit(pastureId int64) (err error) {
|
|
|
}
|
|
|
|
|
|
lastMaxHabitId := lastMaxHabitData.Value
|
|
|
- currentMaxHabit := &model.NeckActiveHabit{}
|
|
|
- if err = e.DB.Model(currentMaxHabit).
|
|
|
- Where("id > ?", lastMaxHabitId).
|
|
|
- Order("id desc").First(currentMaxHabit).Error; err != nil {
|
|
|
- return xerr.WithStack(err)
|
|
|
- }
|
|
|
- // 本次执行<=上次执行的id，则不执行
|
|
|
- if currentMaxHabit.Id < lastMaxHabitId {
|
|
|
- return nil
|
|
|
- }
|
|
|
-
|
|
|
- // 统一更新is_max_time为0
|
|
|
- if err = e.DB.Model(new(model.NeckActiveHabit)).
|
|
|
- Where("is_max_time = ?", pasturePb.IsShow_Ok).
|
|
|
- Where("heat_date > ?", time.Now().AddDate(0, 0, -10).Format(model.LayoutDate2)).
|
|
|
- Update("is_max_time", pasturePb.IsShow_No).Error; err != nil {
|
|
|
- return xerr.WithStack(err)
|
|
|
- }
|
|
|
-
|
|
|
- // 获取这段执行数据内最大日期和最小日期
|
|
|
- xToday := &XToday{}
|
|
|
+ currMaxHabit := &model.NeckActiveHabit{}
|
|
|
if err = e.DB.Model(new(model.NeckActiveHabit)).
|
|
|
- Select(`MIN(heat_date) as x_beg_date, MAX(heat_date) as x_end_date`).
|
|
|
- Where("id BETWEEN ? AND ?", lastMaxHabitId, currentMaxHabit.Id).
|
|
|
- First(xToday).Error; err != nil {
|
|
|
- return xerr.WithStack(err)
|
|
|
- }
|
|
|
-
|
|
|
- xToday.LastMaxHabitId = lastMaxHabitId // 上次执行的id
|
|
|
- xToday.CurrMaxHabitId = currentMaxHabit.Id // 本次执行的id
|
|
|
-
|
|
|
- minHeatDateParse, err := time.Parse(model.LayoutDate2, xToday.XBegDate) // 开始日期
|
|
|
- if err != nil {
|
|
|
- return xerr.WithStack(err)
|
|
|
- }
|
|
|
- xBefore2Day := minHeatDateParse.AddDate(0, 0, -1).Format(model.LayoutDate2)
|
|
|
- xBefore7Day := minHeatDateParse.AddDate(0, 0, -7).Format(model.LayoutDate2)
|
|
|
- xMin2Id, err := e.GetMinIdByHeatDate(xBefore2Day, xToday.LastMaxHabitId)
|
|
|
- if err != nil {
|
|
|
+ Where("id > ?", lastMaxHabitId).
|
|
|
+ Where("pasture_id = ?", pastureId).
|
|
|
+ Where(e.DB.Where("record_count = ?", model.AvgHours).Or("is_show = ?", pasturePb.IsShow_Ok)).
|
|
|
+ Order("id desc").First(currMaxHabit).Error; err != nil {
|
|
|
return xerr.WithStack(err)
|
|
|
}
|
|
|
|
|
|
- xMin7Id, err := e.GetMinIdByHeatDate(xBefore7Day, xToday.LastMaxHabitId)
|
|
|
- if err != nil {
|
|
|
- return xerr.WithStack(err)
|
|
|
+ if currMaxHabit.Id <= 0 || currMaxHabit.Id <= lastMaxHabitId {
|
|
|
+ return nil
|
|
|
}
|
|
|
-
|
|
|
defer func() {
|
|
|
// 更新最后一次执行的id值
|
|
|
if err == nil {
|
|
|
e.DB.Model(new(model.SystemConfigure)).
|
|
|
Where("name = ?", model.MaxHabit).
|
|
|
Where("pasture_id = ?", pastureId).
|
|
|
- Update("value", currentMaxHabit.Id)
|
|
|
+ Update("value", currMaxHabit.Id)
|
|
|
}
|
|
|
}()
|
|
|
- xToday.XMin2Id = xMin2Id
|
|
|
- xToday.XMin7Id = xMin7Id
|
|
|
-
|
|
|
- // id到上一次执行结果并且heat_date > 7天之前的最大牛只id置为is_max_time=1
|
|
|
- maxHabitIdArray := make([]*model.MaxHabitIdModel, 0)
|
|
|
- if err = e.DB.Model(new(model.NeckActiveHabit)).
|
|
|
- Select("Max(id) as id").
|
|
|
- Where("change_filter > ?", model.DefaultChangeFilter).
|
|
|
- Where("heat_date > ?", xBefore7Day).
|
|
|
- Group("neck_ring_number").
|
|
|
- Find(&maxHabitIdArray).Error; err != nil {
|
|
|
- return xerr.WithStack(err)
|
|
|
- }
|
|
|
-
|
|
|
- if len(maxHabitIdArray) > 0 {
|
|
|
- maxHabitIds := make([]int64, 0)
|
|
|
- for _, v := range maxHabitIdArray {
|
|
|
- maxHabitIds = append(maxHabitIds, v.Id)
|
|
|
- }
|
|
|
- if err = e.DB.Model(new(model.NeckActiveHabit).TableName()).
|
|
|
- Where("id IN (?)", maxHabitIds).
|
|
|
- Update("is_max_time", pasturePb.IsShow_Ok).Error; err != nil {
|
|
|
- return xerr.WithStack(err)
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
+ // 获取这段执行数据内最大日期和最小日期
|
|
|
+ xToday := &XToday{}
|
|
|
activeLowest, err := e.GetSystemConfigure2(pastureId, model.ActiveLowest)
|
|
|
if err != nil {
|
|
|
return xerr.WithStack(err)
|
|
|
@@ -135,8 +78,21 @@ func (e *Entry) EntryUpdateActiveHabit(pastureId int64) (err error) {
|
|
|
if err != nil {
|
|
|
return xerr.WithStack(err)
|
|
|
}
|
|
|
- xToday.ActiveLowest = activeLowest.Value
|
|
|
- xToday.RuminaLowest = ruminaLowest.Value
|
|
|
+ xRuminaDisc, err := e.GetSystemConfigure2(pastureId, model.XRuminaDisc)
|
|
|
+ if err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
+ xChangeDiscount, err := e.GetSystemConfigure2(pastureId, model.XChangeDiscount)
|
|
|
+ if err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
+
|
|
|
+ xToday.ActiveLowest = int32(activeLowest.Value)
|
|
|
+ xToday.RuminaLowest = int32(ruminaLowest.Value)
|
|
|
+ xToday.XRuminaDisc = int32(xRuminaDisc.Value)
|
|
|
+ xToday.XChangeDiscount = int32(xChangeDiscount.Value)
|
|
|
+ xToday.LastMaxHabitId = lastMaxHabitId // 上次执行的id
|
|
|
+ xToday.CurrMaxHabitId = currMaxHabit.Id // 本次执行的id
|
|
|
// 更新活动滤波
|
|
|
if err = e.FirstFilterUpdate(pastureId, xToday); err != nil {
|
|
|
zaplog.Error("EntryUpdateActiveHabit", zap.Any("FirstFilterUpdate", err), zap.Any("xToday", xToday))
|
|
|
@@ -145,12 +101,13 @@ func (e *Entry) EntryUpdateActiveHabit(pastureId int64) (err error) {
|
|
|
if err = e.WeeklyActiveAvgUpdate(pastureId, xToday); err != nil {
|
|
|
zaplog.Error("EntryUpdateActiveHabit", zap.Any("WeeklyActiveAvgUpdate", err), zap.Any("xToday", xToday))
|
|
|
}
|
|
|
-
|
|
|
+ // 二次更新滤波
|
|
|
if err = e.SecondUpdateChangeFilter(pastureId, xToday); err != nil {
|
|
|
zaplog.Error("EntryUpdateActiveHabit", zap.Any("SecondUpdateChangeFilter", err), zap.Any("xToday", xToday))
|
|
|
}
|
|
|
|
|
|
- if err = e.ActivityVolumeChanges(pastureId, xToday); err != nil {
|
|
|
+ // 活动量校正系数和健康评分
|
|
|
+ if err = e.FilterCorrectAndScoreUpdate(pastureId, xToday); err != nil {
|
|
|
zaplog.Error("EntryUpdateActiveHabit", zap.Any("ActivityVolumeChanges", err), zap.Any("xToday", xToday))
|
|
|
}
|
|
|
|
|
|
@@ -188,49 +145,70 @@ func (e *Entry) EntryUpdateActiveHabit(pastureId int64) (err error) {
|
|
|
func (e *Entry) FirstFilterUpdate(pastureId int64, xToDay *XToday) error {
|
|
|
newNeckActiveHabitList := make([]*model.NeckActiveHabit, 0)
|
|
|
if err := e.DB.Model(new(model.NeckActiveHabit)).
|
|
|
+ Where("id BETWEEN ? AND ?", xToDay.LastMaxHabitId, xToDay.CurrMaxHabitId).
|
|
|
Where("pasture_id = ?", pastureId).
|
|
|
- Where(e.DB.Where("change_filter = ?", model.InitChangeFilter).Or("is_max_time = ?", pasturePb.IsShow_Ok)).
|
|
|
- Order("neck_ring_number,id").
|
|
|
- Find(&newNeckActiveHabitList).Error; err != nil {
|
|
|
+ Where("change_filter = ?", model.InitChangeFilter).
|
|
|
+ Where(e.DB.Where("high >= ?", xToDay.ActiveLowest).Or("rumina >= ?", xToDay.RuminaLowest)). // 活动量过低牛只不参与计算
|
|
|
+ Order("neck_ring_number,heat_date,frameid").
|
|
|
+ Limit(int(defaultLimit)).Find(&newNeckActiveHabitList).Error; err != nil {
|
|
|
return xerr.WithStack(err)
|
|
|
}
|
|
|
-
|
|
|
- var filterValues = make(map[string]*model.NeckActiveHabit)
|
|
|
// 活动量滤波
|
|
|
for _, v := range newNeckActiveHabitList {
|
|
|
- // 活动量过低牛只不参与计算
|
|
|
- if v.High < int32(xToDay.ActiveLowest) || v.Rumina < int32(xToDay.RuminaLowest) {
|
|
|
- continue
|
|
|
+ firstFilterData := &FirstFilterData{}
|
|
|
+ frameId := v.Frameid
|
|
|
+ heatDate := v.HeatDate
|
|
|
+ if v.Frameid == 0 {
|
|
|
+ frameId = 11
|
|
|
+ heatDateParse, _ := time.Parse(model.LayoutDate2, heatDate)
|
|
|
+ heatDate = heatDateParse.AddDate(0, 0, -1).Format(model.LayoutDate2)
|
|
|
}
|
|
|
- prev, ok := filterValues[v.NeckRingNumber]
|
|
|
- if !ok {
|
|
|
- if v.FilterHigh <= 0 {
|
|
|
- v.FilterHigh = v.High
|
|
|
- }
|
|
|
- if v.FilterRumina <= 0 {
|
|
|
- v.FilterRumina = v.Rumina
|
|
|
- }
|
|
|
- if v.FilterChew <= 0 {
|
|
|
- v.FilterChew = v.Rumina + v.Intake
|
|
|
- }
|
|
|
- filterValues[v.NeckRingNumber] = v
|
|
|
- continue
|
|
|
+ if err := e.DB.Model(new(model.NeckActiveHabit)).
|
|
|
+ Select("neck_ring_number", "filter_high", "filter_rumina", "filter_chew").
|
|
|
+ Where("neck_ring_number = ?", v.NeckRingNumber).
|
|
|
+ Where("heat_date = ?", heatDate).
|
|
|
+ Where("frameid = ?", frameId).
|
|
|
+ First(&firstFilterData).Error; err != nil {
|
|
|
+ zaplog.Error("EntryUpdateActiveHabit", zap.Any("FirstFilterUpdate", err))
|
|
|
}
|
|
|
- if v.FilterHigh <= 0 {
|
|
|
- v.FilterHigh = int32(computeIfPositiveElse(float64(v.High), float64(prev.FilterHigh), 0.23, 0.77))
|
|
|
+
|
|
|
+ if v.FilterHigh > 0 {
|
|
|
+ firstFilterData.FilterHigh = v.FilterHigh
|
|
|
+ } else {
|
|
|
+ if v.NeckRingNumber == firstFilterData.NeckRingNumber {
|
|
|
+ firstFilterData.FilterHigh = int32(computeIfPositiveElse(float64(v.High), float64(firstFilterData.FilterHigh), 0.23, 0.77))
|
|
|
+ } else {
|
|
|
+ firstFilterData.FilterHigh = v.High
|
|
|
+ }
|
|
|
}
|
|
|
- if v.FilterRumina <= 0 {
|
|
|
- v.FilterRumina = int32(computeIfPositiveElse(float64(v.Rumina), float64(prev.FilterRumina), 0.33, 0.67))
|
|
|
+
|
|
|
+ if v.FilterRumina > 0 {
|
|
|
+ firstFilterData.FilterRumina = v.FilterRumina
|
|
|
+ } else {
|
|
|
+ if v.NeckRingNumber == firstFilterData.NeckRingNumber {
|
|
|
+ firstFilterData.FilterRumina = int32(computeIfPositiveElse(float64(v.Rumina), float64(firstFilterData.FilterRumina), 0.33, 0.67))
|
|
|
+ } else {
|
|
|
+ firstFilterData.FilterRumina = v.Rumina
|
|
|
+ }
|
|
|
}
|
|
|
- if v.FilterChew <= 0 {
|
|
|
- v.FilterChew = int32(computeIfPositiveElse(float64(v.Rumina+v.Intake), float64(prev.FilterChew), 0.33, 0.67))
|
|
|
+ if v.FilterChew > 0 {
|
|
|
+ firstFilterData.FilterChew = v.FilterChew
|
|
|
+ } else {
|
|
|
+ if v.NeckRingNumber == firstFilterData.NeckRingNumber {
|
|
|
+ firstFilterData.FilterChew = int32(computeIfPositiveElse(float64(v.Rumina+v.Intake), float64(firstFilterData.FilterChew), 0.33, 0.67))
|
|
|
+ } else {
|
|
|
+ firstFilterData.FilterChew = v.Rumina + v.Intake
|
|
|
+ }
|
|
|
}
|
|
|
// 更新过滤值
|
|
|
- filterValues[v.NeckRingNumber] = v
|
|
|
if err := e.DB.Model(new(model.NeckActiveHabit)).
|
|
|
Select("filter_high", "filter_rumina", "filter_chew").
|
|
|
Where("id = ?", v.Id).
|
|
|
- Updates(v).Error; err != nil {
|
|
|
+ Updates(map[string]interface{}{
|
|
|
+ "filter_high": firstFilterData.FilterHigh,
|
|
|
+ "filter_rumina": firstFilterData.FilterRumina,
|
|
|
+ "filter_chew": firstFilterData.FilterChew,
|
|
|
+ }).Error; err != nil {
|
|
|
return xerr.WithStack(err)
|
|
|
}
|
|
|
}
|
|
|
@@ -248,21 +226,22 @@ func (e *Entry) WeeklyActiveAvgUpdate(pastureId int64, xToday *XToday) (err erro
|
|
|
if err = e.DB.Transaction(func(tx *gorm.DB) error {
|
|
|
neckActiveHabitList := make([]*model.NeckActiveHabit, 0)
|
|
|
if err = tx.Model(new(model.NeckActiveHabit)).
|
|
|
- Where("id BETWEEN ? AND ?", xToday.XMin2Id, xToday.CurrMaxHabitId).
|
|
|
+ Where("id BETWEEN ? AND ?", xToday.LastMaxHabitId, xToday.CurrMaxHabitId).
|
|
|
Where("pasture_id = ?", pastureId).
|
|
|
Where("change_filter = ?", model.InitChangeFilter).
|
|
|
Where(e.DB.Where("high > ?", xToday.ActiveLowest).Or("rumina > ?", xToday.RuminaLowest)).
|
|
|
- Group("neck_ring_number,frameid").
|
|
|
- Find(&neckActiveHabitList).Error; err != nil {
|
|
|
- zaplog.Error("WeeklyActiveAvgUpdate-0", zap.Any("error", err), zap.Any("xToday", xToday))
|
|
|
+ Order("neck_ring_number,frameid").
|
|
|
+ Limit(int(defaultLimit)).Find(&neckActiveHabitList).Error; err != nil {
|
|
|
return xerr.WithStack(err)
|
|
|
}
|
|
|
+
|
|
|
+ zaplog.Info("WeeklyActiveAvgUpdate-0", zap.Any("neckActiveHabitList", neckActiveHabitList))
|
|
|
for _, v := range neckActiveHabitList {
|
|
|
beginDayDate, _ := time.Parse(model.LayoutDate2, v.HeatDate)
|
|
|
before7DayDate := beginDayDate.AddDate(0, 0, -7).Format(model.LayoutDate2)
|
|
|
before1DayDate := beginDayDate.AddDate(0, 0, -1).Format(model.LayoutDate2)
|
|
|
|
|
|
- avgHabitData := &crontab.AvgHabit{}
|
|
|
+ weekHabitData := &crontab.WeekHabit{}
|
|
|
if err = tx.Model(new(model.NeckActiveHabit)).
|
|
|
Select("neck_ring_number").
|
|
|
Select("IF(COUNT(1)>=3, ROUND((SUM(filter_high) -MIN(filter_high) -MAX(filter_high))/ABS(COUNT(1) -2),0), -1) as avg_high_habit").
|
|
|
@@ -270,12 +249,11 @@ func (e *Entry) WeeklyActiveAvgUpdate(pastureId int64, xToday *XToday) (err erro
|
|
|
Select("IF(COUNT(1)>=3, ROUND((SUM(filter_chew) -MIN(filter_chew) -MAX(filter_chew))/ABS(COUNT(1) -2),0), -1) as avg_chew_habit").
|
|
|
Select("ROUND(AVG(intake),0) as avg_intake_habit").
|
|
|
Select("ROUND(AVG(inactive),0) as avg_inactive_habit").
|
|
|
- Where("id BETWEEN ? AND ?", xToday.XMin7Id, xToday.CurrMaxHabitId).
|
|
|
Where("heat_date BETWEEN ? AND ?", before7DayDate, before1DayDate).
|
|
|
Where("pasture_id = ?", pastureId).
|
|
|
Where("neck_ring_number = ? AND frameid = ?", v.NeckRingNumber, v.Frameid).
|
|
|
Where(e.DB.Where("high > ?", xToday.ActiveLowest).Or("rumina > ?", xToday.RuminaLowest)).
|
|
|
- First(avgHabitData).Error; err != nil {
|
|
|
+ Group("neck_ring_number").First(weekHabitData).Error; err != nil {
|
|
|
zaplog.Error("WeeklyActiveAvgUpdate-1", zap.Any("error", err), zap.Any("xToday", xToday))
|
|
|
}
|
|
|
|
|
|
@@ -290,26 +268,26 @@ func (e *Entry) WeeklyActiveAvgUpdate(pastureId int64, xToday *XToday) (err erro
|
|
|
Select("MAX(h2.change_filter) as sum_max_high").
|
|
|
Select("MIN(IF(change_filter > ?, change_filter, ?)) as sum_min_high", model.DefaultChangeFilter, model.InitChangeFilter).
|
|
|
Select("MIN( CASE WHEN filter_chew > ? THEN filter_chew WHEN filter_rumina >= ? THEN filter_rumina ELSE 0 END) as sum_min_chew", model.DefaultChangeFilter, model.DefaultRuminaFilter).
|
|
|
- Where("id BETWEEN ? AND ?", xToday.XMin2Id, xToday.CurrMaxHabitId).
|
|
|
Where("pasture_id = ?", pastureId).
|
|
|
Where("heat_date BETWEEN ? AND ?", before1DayDate, beginDayDate).
|
|
|
Where("active_time BETWEEN ? AND ?", beginDayDate.Add(-23*time.Hour).Format(model.LayoutTime), beginDayDate.Format(model.LayoutTime)).
|
|
|
Where(e.DB.Where("high > ?", xToday.ActiveLowest).Or("rumina >= ?", xToday.RuminaLowest)).
|
|
|
Where("neck_ring_number = ? AND frameid = ?", v.NeckRingNumber, v.Frameid).
|
|
|
+ Group("neck_ring_number").
|
|
|
First(sumHabitData).Error; err != nil {
|
|
|
zaplog.Error("WeeklyActiveAvgUpdate-2", zap.Any("error", err), zap.Any("xToday", xToday))
|
|
|
}
|
|
|
|
|
|
// 变化百分比
|
|
|
- if v.AvgHighHabit > 0 {
|
|
|
- if v.FilterHigh-v.AvgHighHabit > 0 {
|
|
|
- v.ChangeHigh = (v.FilterHigh - v.AvgHighHabit) / int32(float64(v.WeekHigh)*0.6+float64(v.AvgHighHabit)*0.2+float64(weeklyActive.Value)*0.2)
|
|
|
+ if v.WeekHighHabit > 0 {
|
|
|
+ if v.FilterHigh-v.WeekHighHabit > 0 {
|
|
|
+ v.ChangeHigh = (v.FilterHigh - v.WeekHighHabit) / int32(float64(v.WeekHigh)*0.6+float64(v.WeekHighHabit)*0.2+float64(weeklyActive.Value)*0.2)
|
|
|
} else {
|
|
|
- v.ChangeHigh = v.FilterHigh - v.AvgHighHabit/v.AvgHighHabit*100
|
|
|
+ v.ChangeHigh = v.FilterHigh - v.WeekHighHabit/v.WeekHighHabit*100
|
|
|
}
|
|
|
|
|
|
- v.ChangeRumina = v.RuminaFilter - v.AvgRuminaHabit/v.AvgHighHabit*100
|
|
|
- v.ChangeChew = v.FilterChew - v.AvgChewHabit/v.AvgHighHabit*100
|
|
|
+ v.ChangeRumina = v.RuminaFilter - v.WeekRuminaHabit/v.WeekHighHabit*100
|
|
|
+ v.ChangeChew = v.FilterChew - v.WeekChewHabit/v.WeekHighHabit*100
|
|
|
if err = e.DB.Model(new(model.NeckActiveHabit)).
|
|
|
Select("change_high", "change_rumina", "change_chew").
|
|
|
Where("id = ?", v.Id).
|
|
|
@@ -326,37 +304,22 @@ func (e *Entry) WeeklyActiveAvgUpdate(pastureId int64, xToday *XToday) (err erro
|
|
|
Where("pasture_id = ?", pastureId).
|
|
|
Where("neck_ring_number = ?", v.NeckRingNumber).
|
|
|
Where("heat_date = ?", before3DayDate).
|
|
|
- Where("frameid = ? ", v.Frameid).First(before3DaysNeckActiveHabit).Error; err != nil {
|
|
|
+ Where("frameid = ? ", v.Frameid).
|
|
|
+ First(before3DaysNeckActiveHabit).Error; err != nil {
|
|
|
zaplog.Error("WeeklyActiveAvgUpdate-3", zap.Any("error", err), zap.Any("xToday", xToday))
|
|
|
}
|
|
|
|
|
|
- cowId := int64(0)
|
|
|
- Lact := int32(0)
|
|
|
- calvingAge := int64(0)
|
|
|
- cow := e.GetCowInfoByNeckRingNumber(pastureId, v.NeckRingNumber)
|
|
|
- if cow != nil {
|
|
|
- cowId = cow.Id
|
|
|
- Lact = cow.Lact
|
|
|
- calvingAge = cow.CalvingAge
|
|
|
- } else {
|
|
|
- zaplog.Error("WeeklyActiveAvgUpdate-4", zap.Any("error", err), zap.Any("xToday", xToday))
|
|
|
- }
|
|
|
-
|
|
|
if err = tx.Model(new(model.NeckActiveHabit)).
|
|
|
Select("avg_high_habit", "avg_rumina_habit", "avg_chew_habit", "avg_intake_habit", "avg_inactive_habit").
|
|
|
Select("sum_rumina", "sum_intake", "sum_inactive", "sum_active", "sum_max_high", "sum_min_high", "sum_min_chew").
|
|
|
- Select("change_high", "change_rumina", "change_chew", "cow_id", "lact", "calving_age").
|
|
|
- Select("sum_rumina_before_three_day,sum_intake_before_three_day").
|
|
|
+ Select("change_high", "change_rumina", "change_chew", "sum_rumina_before_three_day", "sum_intake_before_three_day").
|
|
|
Where("id = ?", v.Id).
|
|
|
Updates(map[string]interface{}{
|
|
|
- "cow_id": cowId,
|
|
|
- "lact": Lact,
|
|
|
- "calving_age": calvingAge,
|
|
|
- "avg_high_habit": avgHabitData.AvgHighHabit,
|
|
|
- "avg_rumina_habit": avgHabitData.AvgRuminaHabit,
|
|
|
- "avg_chew_habit": avgHabitData.AvgChewHabit,
|
|
|
- "avg_intake_habit": avgHabitData.AvgIntakeHabit,
|
|
|
- "avg_inactive_habit": avgHabitData.AvgIntakeHabit,
|
|
|
+ "week_high_habit": weekHabitData.AvgHighHabit,
|
|
|
+ "week_rumina_habit": weekHabitData.AvgRuminaHabit,
|
|
|
+ "week_chew_habit": weekHabitData.AvgChewHabit,
|
|
|
+ "week_intake_habit": weekHabitData.AvgIntakeHabit,
|
|
|
+ "week_inactive_habit": weekHabitData.AvgIntakeHabit,
|
|
|
"sum_rumina": sumHabitData.SumRumina,
|
|
|
"sum_intake": sumHabitData.SumIntake,
|
|
|
"sum_inactive": sumHabitData.SumInactive,
|
|
|
@@ -371,121 +334,133 @@ func (e *Entry) WeeklyActiveAvgUpdate(pastureId int64, xToday *XToday) (err erro
|
|
|
"sum_intake_before_three_day": before3DaysNeckActiveHabit.SumIntake,
|
|
|
}).Error; err != nil {
|
|
|
zaplog.Error("WeeklyActiveAvgUpdate-6", zap.Any("error", err), zap.Any("xToday", xToday))
|
|
|
- continue
|
|
|
}
|
|
|
+
|
|
|
+ zaplog.Info("WeeklyActiveAvgUpdate-7",
|
|
|
+ zap.Any("v", v),
|
|
|
+ zap.Any("xToday", xToday),
|
|
|
+ zap.Any("before3DaysNeckActiveHabit", before3DaysNeckActiveHabit),
|
|
|
+ zap.Any("sumHabitData", sumHabitData),
|
|
|
+ zap.Any("weekHabitData", weekHabitData),
|
|
|
+ )
|
|
|
}
|
|
|
return nil
|
|
|
}); err != nil {
|
|
|
return xerr.WithStack(err)
|
|
|
}
|
|
|
-
|
|
|
+ zaplog.Info("WeeklyActiveAvgUpdate-Success", zap.Any("xToday", xToday))
|
|
|
return nil
|
|
|
}
|
|
|
|
|
|
// SecondUpdateChangeFilter 第二次更新变化趋势滤波
|
|
|
func (e *Entry) SecondUpdateChangeFilter(pastureId int64, xToday *XToday) (err error) {
|
|
|
- xRuminaDisc, err := e.GetSystemConfigure2(pastureId, model.XRuminaDisc)
|
|
|
- if err != nil {
|
|
|
- return err
|
|
|
- }
|
|
|
- xChangeDiscount, err := e.GetSystemConfigure2(pastureId, model.XChangeDiscount)
|
|
|
- if err != nil {
|
|
|
- return err
|
|
|
- }
|
|
|
- newChangeFilterList := make([]*crontab.ChangeFilterData, 0)
|
|
|
+ newChangeFilterList := make([]*ChangeFilterData, 0)
|
|
|
if err = e.DB.Model(new(model.NeckActiveHabit)).
|
|
|
- Select("id,neck_ring_number,change_high,change_filter,rumina_filter,change_rumina,chew_filter,change_chew").
|
|
|
+ Select("id,neck_ring_number,change_high,change_filter,rumina_filter,change_rumina,chew_filter,change_chew,heat_date,frameid").
|
|
|
Select("IF(lact = 0, 0.8, 1) as xlc_dis_count").
|
|
|
Where("id BETWEEN ? AND ?", xToday.XMin2Id, xToday.CurrMaxHabitId).
|
|
|
Where("pasture_id = ?", pastureId).
|
|
|
- Where(e.DB.Where("change_filter = ?", model.InitChangeFilter).Or("is_max_time = ?", pasturePb.IsShow_Ok)).
|
|
|
+ Where("change_filter = ?", model.InitChangeFilter).
|
|
|
Where("change_high > ?", MinChangeHigh).
|
|
|
Order("neck_ring_number,heat_date,frameid").
|
|
|
Find(&newChangeFilterList).Error; err != nil {
|
|
|
return xerr.WithStack(err)
|
|
|
}
|
|
|
- var filterValues = make(map[string]*crontab.ChangeFilterData)
|
|
|
+
|
|
|
for _, v := range newChangeFilterList {
|
|
|
- prev, ok := filterValues[v.NeckRingNumber]
|
|
|
- if v.ChangeFilter <= MinChangeFilter {
|
|
|
- prefChangeFilter := int32(0)
|
|
|
- if ok {
|
|
|
- prefChangeFilter = prev.ChangeFilter
|
|
|
- }
|
|
|
- leastValue := v.HighChange
|
|
|
- if prefChangeFilter < v.HighChange {
|
|
|
- leastValue = prefChangeFilter
|
|
|
- }
|
|
|
- v.ChangeFilter = int32(float64(prefChangeFilter)*(1-(float64(xChangeDiscount.Value)/10)*v.XlcDisCount) +
|
|
|
- float64(leastValue)*(float64(xChangeDiscount.Value)/10)*v.XlcDisCount)
|
|
|
+ secondFilterData := &SecondFilterData{}
|
|
|
+ frameId := v.FrameId
|
|
|
+ heatDate := v.HeatDate
|
|
|
+ if v.FrameId == 0 {
|
|
|
+ frameId = 11
|
|
|
+ heatDateParse, _ := time.Parse(model.LayoutDate2, heatDate)
|
|
|
+ heatDate = heatDateParse.AddDate(0, 0, -1).Format(model.LayoutDate2)
|
|
|
+ }
|
|
|
+ if err = e.DB.Model(new(model.NeckActiveHabit)).
|
|
|
+ Select("neck_ring_number", "filter_high", "filter_rumina", "filter_chew").
|
|
|
+ Where("neck_ring_number = ?", v.NeckRingNumber).
|
|
|
+ Where("heat_date = ?", heatDate).
|
|
|
+ Where("frameid = ?", frameId).
|
|
|
+ First(&secondFilterData).Error; err != nil {
|
|
|
+ zaplog.Error("EntryUpdateActiveHabit", zap.Any("FirstFilterUpdate", err))
|
|
|
}
|
|
|
|
|
|
- if v.RuminaFilter <= MinChangeFilter {
|
|
|
- prefRuminaFilter := int32(0)
|
|
|
- if ok {
|
|
|
- prefRuminaFilter = prev.RuminaFilter
|
|
|
+ if v.ChangeFilter > MinChangeFilter {
|
|
|
+ secondFilterData.ChangeFilter = float64(v.ChangeFilter)
|
|
|
+ } else {
|
|
|
+ if v.NeckRingNumber == secondFilterData.NeckRingNumber {
|
|
|
+ secondFilterData.ChangeFilter = secondFilterData.ChangeFilter*(1-(float64(xToday.XChangeDiscount)/10)*v.XlcDisCount) +
|
|
|
+ math.Min(float64(v.ChangeHigh), secondFilterData.ChangeFilter+135)*(float64(xToday.XChangeDiscount)/10)*v.XlcDisCount
|
|
|
+ } else {
|
|
|
+ secondFilterData.ChangeFilter = 0
|
|
|
}
|
|
|
+ }
|
|
|
|
|
|
- factor := float64(1)
|
|
|
- if math.Abs(float64(v.ChangeRumina)) > 60 {
|
|
|
- factor = 0.5
|
|
|
+ if v.RuminaFilter > MinRuminaFilter {
|
|
|
+ secondFilterData.RuminaFilter = float64(v.ChangeFilter)
|
|
|
+ } else {
|
|
|
+ if v.NeckRingNumber == secondFilterData.NeckRingNumber {
|
|
|
+ discount := float64(xToday.XRuminaDisc) / 10 * v.XlcDisCount
|
|
|
+ if math.Abs(float64(v.ChangeRumina)) > 60 {
|
|
|
+ discount *= 0.5
|
|
|
+ }
|
|
|
+ secondFilterData.RuminaFilter = secondFilterData.RuminaFilter*(1-discount) + float64(v.ChangeRumina)*discount
|
|
|
+ } else {
|
|
|
+ secondFilterData.RuminaFilter = 0
|
|
|
}
|
|
|
-
|
|
|
- v.RuminaFilter = int32(float64(prefRuminaFilter)*(1-float64(xRuminaDisc.Value/10)*v.XlcDisCount*factor) +
|
|
|
- float64(v.ChangeRumina)*float64(xRuminaDisc.Value)/10*v.XlcDisCount*factor)
|
|
|
-
|
|
|
- }
|
|
|
- if v.RuminaFilter > 50 {
|
|
|
- v.RuminaFilter = 50
|
|
|
}
|
|
|
|
|
|
- if v.ChewFilter <= MinChangeFilter {
|
|
|
- prefChewFilter := int32(0)
|
|
|
- if ok {
|
|
|
- prefChewFilter = prev.ChewFilter
|
|
|
- }
|
|
|
- factor := float64(1)
|
|
|
- if math.Abs(float64(v.ChangeChew)) > 60 {
|
|
|
- factor = 0.5
|
|
|
- }
|
|
|
+ secondFilterData.RuminaFilter = math.Min(50, secondFilterData.RuminaFilter)
|
|
|
|
|
|
- v.ChewFilter = int32(float64(prefChewFilter)*(1-float64(xRuminaDisc.Value)/10*factor) +
|
|
|
- float64(v.ChangeChew)*float64(xRuminaDisc.Value)/10*factor)
|
|
|
+ if v.ChewFilter > MinChewFilter {
|
|
|
+ secondFilterData.ChewFilter = float64(v.ChangeChew)
|
|
|
+ } else {
|
|
|
+ if v.NeckRingNumber == secondFilterData.NeckRingNumber {
|
|
|
+ discount := float64(xToday.XRuminaDisc) / 10
|
|
|
+ if math.Abs(float64(v.ChangeChew)) > 60 {
|
|
|
+ discount *= 0.5
|
|
|
+ }
|
|
|
+ secondFilterData.ChewFilter = secondFilterData.ChewFilter*(1-discount) + float64(v.ChangeChew)*discount
|
|
|
+ } else {
|
|
|
+ secondFilterData.ChewFilter = 0
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- if v.ChewFilter > 50 {
|
|
|
- v.ChangeChew = 50
|
|
|
- }
|
|
|
+ secondFilterData.ChewFilter = math.Min(50, secondFilterData.ChewFilter)
|
|
|
if err = e.DB.Model(new(model.NeckActiveHabit)).
|
|
|
Select("change_filter", "rumina_filter", "chew_filter").
|
|
|
Where("id = ?", v.Id).
|
|
|
Where("neck_ring_number = ?", v.NeckRingNumber).
|
|
|
Where("change_filter = ?", model.InitChangeFilter).
|
|
|
- Updates(v).Error; err != nil {
|
|
|
+ Updates(map[string]interface{}{
|
|
|
+ "change_filter": secondFilterData.ChangeFilter,
|
|
|
+ "rumina_filter": secondFilterData.RuminaFilter,
|
|
|
+ "chew_filter": secondFilterData.ChewFilter,
|
|
|
+ }).Error; err != nil {
|
|
|
zaplog.Error("SecondUpdateChangeFilter-1", zap.Any("error", err), zap.Any("xToday", xToday))
|
|
|
}
|
|
|
- filterValues[v.NeckRingNumber] = v
|
|
|
+ zaplog.Info("SecondUpdateChangeFilter",
|
|
|
+ zap.Any("secondFilterData", secondFilterData),
|
|
|
+ zap.Any("xToday", xToday),
|
|
|
+ zap.Any("v", v),
|
|
|
+ )
|
|
|
}
|
|
|
return nil
|
|
|
}
|
|
|
|
|
|
-// ActivityVolumeChanges 计算活动量变化趋势校正值（活跃度校正）
|
|
|
-func (e *Entry) ActivityVolumeChanges(pastureId int64, xToday *XToday) error {
|
|
|
- beginDayDate, err := time.Parse(model.LayoutDate2, xToday.XBegDate)
|
|
|
- if err != nil {
|
|
|
- return xerr.WithStack(err)
|
|
|
- }
|
|
|
+// FilterCorrectAndScoreUpdate 计算活动量变化趋势校正值（活跃度校正）和健康评分
|
|
|
+func (e *Entry) FilterCorrectAndScoreUpdate(pastureId int64, xToday *XToday) error {
|
|
|
+ beginDayDate := time.Now()
|
|
|
before7DayDate := beginDayDate.AddDate(0, 0, -7).Format(model.LayoutDate2)
|
|
|
before1DayDate := beginDayDate.AddDate(0, 0, -1).Format(model.LayoutDate2)
|
|
|
|
|
|
activityVolumeList := make([]*crontab.ActivityVolume, 0)
|
|
|
activityVolumeMap := make(map[string]*crontab.ActivityVolume)
|
|
|
- if err = e.DB.Model(new(model.NeckActiveHabit)).
|
|
|
+ if err := e.DB.Model(new(model.NeckActiveHabit)).
|
|
|
Select("neck_ring_number").
|
|
|
Select("AVG(IF(change_filter>=60, 60, change_filter)) as avg_filter").
|
|
|
Select("ROUND(STD(IF(change_filter>=60, 60, change_filter))) as std_filter").
|
|
|
Select("COUNT(1) as nb").
|
|
|
- Where("id BETWEEN ? AND ?", xToday.XMin7Id, xToday.CurrMaxHabitId).
|
|
|
Where("heat_date BETWEEN ? AND ?", before7DayDate, before1DayDate).
|
|
|
Where("pasture_id = ?", pastureId).
|
|
|
Where(e.DB.Where("high > ?", xToday.ActiveLowest).Or("rumina >= ?", xToday.RuminaLowest)).
|
|
|
@@ -504,7 +479,7 @@ func (e *Entry) ActivityVolumeChanges(pastureId int64, xToday *XToday) error {
|
|
|
}
|
|
|
|
|
|
neckActiveHabitList := make([]*model.NeckActiveHabit, 0)
|
|
|
- if err = e.DB.Model(new(model.NeckActiveHabit)).
|
|
|
+ if err := e.DB.Model(new(model.NeckActiveHabit)).
|
|
|
Where("id BETWEEN ? AND ?", xToday.XMin2Id, xToday.CurrMaxHabitId).
|
|
|
Where("pasture_id = ?", pastureId).
|
|
|
Where(e.DB.Where("high > ?", xToday.ActiveLowest).Or("rumina > ?", xToday.RuminaLowest)).
|
|
|
@@ -516,10 +491,8 @@ func (e *Entry) ActivityVolumeChanges(pastureId int64, xToday *XToday) error {
|
|
|
for _, v := range neckActiveHabitList {
|
|
|
if filterCorrectMap, ok := activityVolumeMap[v.NeckRingNumber]; ok {
|
|
|
filterCorrect := model.DefaultFilterCorrect - int(math.Floor(float64(filterCorrectMap.AvgFilter)/3+float64(filterCorrectMap.StdFilter)/2))
|
|
|
- v.FilterCorrect = int32(filterCorrect)
|
|
|
-
|
|
|
// 活动量校正系数
|
|
|
- if err = e.DB.Model(new(model.NeckActiveHabit)).
|
|
|
+ if err := e.DB.Model(new(model.NeckActiveHabit)).
|
|
|
Where("id = ?", v.Id).
|
|
|
Where("neck_ring_number = ?", v.NeckRingNumber).
|
|
|
Update("filter_correct", filterCorrect).Error; err != nil {
|
|
|
@@ -527,19 +500,13 @@ func (e *Entry) ActivityVolumeChanges(pastureId int64, xToday *XToday) error {
|
|
|
continue
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
// 健康评分
|
|
|
if v.Score != 0 {
|
|
|
continue
|
|
|
}
|
|
|
|
|
|
- cow := e.GetCowInfoByNeckRingNumber(v.PastureId, v.NeckRingNumber)
|
|
|
- if cow == nil {
|
|
|
- continue
|
|
|
- }
|
|
|
-
|
|
|
cowScore := calculateScore(v)
|
|
|
- if err = e.DB.Model(new(model.NeckActiveHabit)).
|
|
|
+ if err := e.DB.Model(new(model.NeckActiveHabit)).
|
|
|
Where("id = ?", v.Id).
|
|
|
Where("neck_ring_number = ?", v.NeckRingNumber).
|
|
|
Update("score", cowScore).Error; err != nil {
|
Yi