crontab: indicators 指标业务逻辑更新

config/app.develop.yaml

@@ -37,7 +37,7 @@ side_work_setting:
 cron:
   crontab_start_run: false
   update_cow_info: "0 01 1 * * ?"       # 每天凌晨1点01分执行
-  indicators: "0 03 1 * * ?"            # 每天凌晨1点03分执行
+  indicators: "0 30 11 * * ?"            # 每天凌晨1点03分执行
   generate_work_order: "0 05 1 * * ?"   # 每天凌晨1点05分执行
   immunization_plan: "0 10 1 * * ?"     # 每天凌晨1点10分执行
   same_time_plan: "0 15 1 * * ?"        # 每天凌晨1点15分执行

config/app.test.yaml

@@ -26,7 +26,7 @@ cache_key_suffix: "gmym"
 cron:
   crontab_start_run: false
   update_cow_info: "0 01 1 * * ?"
-  indicators: "0 03 1 * * ?"
+  indicators: "0 24 10 * * ?"
   generate_work_order: "0 05 1 * * ?"
   immunization_plan: "0 10 1 * * ?"
   same_time_plan: "0 15 1 * * ?"

dep/di_crontab.go

@@ -45,21 +45,16 @@ func EntryCrontab(dependency CrontabDependency) *cron.Crontab {
 	cs := cfg.CronSetting
 
 	newCrontab := cron.NewCrontab(DataCenterCrontabCounterVec)
-	err := newCrontab.Bind("UpdateCowInfo", cs.UpdateCowInfo, dependency.CrontabHub.UpdateCowInfo)
+	err := newCrontab.Bind("indicators", cs.Indicators, dependency.CrontabHub.Indicators)
 	if err != nil {
 		panic(err)
 	}
 
-	err = newCrontab.Bind("indicators", cs.Indicators, dependency.CrontabHub.Indicators)
+	err = newCrontab.Bind("UpdateCowInfo", cs.UpdateCowInfo, dependency.CrontabHub.UpdateCowInfo)
 	if err != nil {
 		panic(err)
 	}
 
-	/*err = newCrontab.Bind("GenerateWorkOrder", cs.GenerateWorkOrder, dependency.CrontabHub.GenerateAsynqWorkOrder)
-	if err != nil {
-		panic(err)
-	}*/
-
 	err = newCrontab.Bind("ImmunizationPlan", cs.ImmunizationPlan, dependency.CrontabHub.ImmunizationPlan)
 	if err != nil {
 		panic(err)
@@ -85,11 +80,6 @@ func EntryCrontab(dependency CrontabDependency) *cron.Crontab {
 		panic(err)
 	}
 
-	/*err = newCrontab.Bind("CowPregnant", cs.CowPregnant, dependency.CrontabHub.CowPregnant)
-	if err != nil {
-		panic(err)
-	}*/
-
 	err = newCrontab.Bind("UpdateCowEstrus", cs.NeckRingEstrus, dependency.CrontabHub.UpdateCowEstrus)
 	if err != nil {
 		zaplog.Error("EntryCrontab", zap.Any("UpdateCowEstrus", err))
@@ -108,5 +98,14 @@ func EntryCrontab(dependency CrontabDependency) *cron.Crontab {
 		panic(err)
 	}
 
+	/*err = newCrontab.Bind("GenerateWorkOrder", cs.GenerateWorkOrder, dependency.CrontabHub.GenerateAsynqWorkOrder)
+	if err != nil {
+		panic(err)
+	}
+	err = newCrontab.Bind("CowPregnant", cs.CowPregnant, dependency.CrontabHub.CowPregnant)
+	if err != nil {
+		panic(err)
+	}*/
+
 	return newCrontab
 }

model/cow.go

@@ -319,7 +319,7 @@ func (c CowSlice) ToPB2(penMap map[int32]*Pen, penWeightSlice PenWeightSlice) []
 	return res
 }
 
-func NewCow(pastureId int64, current *SystemUser, req *pasturePb.EventEnterRequest) *Cow {
+func NewCow(pastureId int64, req *pasturePb.EventEnterRequest, penMap map[int32]*Pen) *Cow {
 	var isPregnant = pasturePb.IsShow_No
 	if req.BreedStatus == pasturePb.BreedStatus_Pregnant {
 		isPregnant = pasturePb.IsShow_Ok
@@ -329,6 +329,7 @@ func NewCow(pastureId int64, current *SystemUser, req *pasturePb.EventEnterReque
 		Sex:                 req.Sex,
 		EarNumber:           req.EarNumber,
 		PenId:               req.PenId,
+		PenName:             penMap[req.PenId].Name,
 		Lact:                req.Lact,
 		CowType:             req.CowType,
 		BreedStatus:         req.BreedStatus,

model/event_estrus.go

@@ -40,7 +40,7 @@ func NewEventEstrus(
 	pastureId int64,
 	exposeEstrusType pasturePb.ExposeEstrusType_Kind,
 	level pasturePb.EstrusLevel_Kind,
-	result pasturePb.CheckResult_Kind,
+	checkResult pasturePb.CheckResult_Kind,
 	isShow, isPerk pasturePb.IsShow_Kind,
 	lastEstrusDate, activeDate string,
 	dayHigh, maxHigh int32,
@@ -56,7 +56,7 @@ func NewEventEstrus(
 		ActiveDate:       activeDate,
 		Level:            level,
 		IsShow:           isShow,
-		CheckResult:      result,
+		CheckResult:      checkResult,
 		DayHigh:          dayHigh,
 		MaxHigh:          maxHigh,
 		IsPeak:           isPerk,

module/backend/event_base.go

@@ -90,12 +90,13 @@ func (s *StoreEntry) CreateEnter(ctx context.Context, req *pasturePb.EventEnterR
 		req.OperationName = systemUser.Name
 	}
 
-	newCowData := model.NewCow(userModel.AppPasture.Id, userModel.SystemUser, req)
-	newEventEnter := model.NewEventEnter(userModel.AppPasture.Id, newCowData.Id, req)
+	penMap := s.PenMap(ctx, userModel.AppPasture.Id)
 	if err = s.DB.Transaction(func(tx *gorm.DB) error {
+		newCowData := model.NewCow(userModel.AppPasture.Id, req, penMap)
 		if err = tx.Create(newCowData).Error; err != nil {
 			return xerr.WithStack(err)
 		}
+		newEventEnter := model.NewEventEnter(userModel.AppPasture.Id, newCowData.Id, req)
 		if err = tx.Create(newEventEnter).Error; err != nil {
 			return xerr.WithStack(err)
 		}

module/crontab/cow_cron.go

@@ -60,17 +60,17 @@ func (e *Entry) GenerateAsynqWorkOrder() error {
 func (e *Entry) Indicators() error {
 	indicatorsRemarksList := make([]*model.IndicatorsDetails, 0)
 	if err := e.DB.Model(new(model.IndicatorsDetails)).
-		Where("is_show = ?", pasturePb.IsShow_Ok).
 		Find(&indicatorsRemarksList).Error; err != nil {
 		return err
 	}
 	nowTime := time.Now().Format(model.LayoutMonth)
+	zaplog.Info("Indicators", zap.Any("nowTime", nowTime))
 	for _, v := range indicatorsRemarksList {
 		switch v.Kind {
 		case "all_cow":
 			pastureIdAllCow := e.FindPastureAllCow()
 			for pastureId, value := range pastureIdAllCow {
-				e.UpdatePastureIndicators(pastureId, nowTime, v.Kind, fmt.Sprintf("%d", value))
+				e.UpdatePastureIndicators(pastureId, v, nowTime, fmt.Sprintf("%d", value))
 			}
 		case "calving_interval":
 
@@ -127,7 +127,7 @@ func (e *Entry) ImmunizationPlan() error {
 			Select("a.*").
 			Where("a.pasture_id = ?", plan.PastureId).
 			Where("a.admission_status = ?", pasturePb.AdmissionStatus_Admission).
-			Where("NOT EXISTS ( select 1 from event_immunization_plan b where b.pen_id = a.id and b.status = ? and b.plan_day > ?)", plan.Id, pasturePb.IsShow_No, nowTime)
+			Where("NOT EXISTS ( select 1 from event_immunization_plan b where b.pen_id = a.id and b.status = ? and b.plan_day > ?)", pasturePb.IsShow_No, nowTime)
 		if plan.CowType > 0 {
 			pref.Where("a.cow_type = ?", plan.CowType)
 		}
@@ -149,12 +149,12 @@ func (e *Entry) ImmunizationPlan() error {
 			if plan.ImmunizationPlanId > 0 {
 				pref.Joins("INNER JOIN event_immunization_plan as b ON b.immunization_plan_id = ? ", plan.ImmunizationPlanId).
 					Where("b.cow_id = a.id").
-					Where("DATE_ADD(b.reality_time, INTERVAL ? DAY) = ?", plan.Value, time.Now().Format(model.LayoutDate2)).
+					Where("DATE_ADD(b.reality_day, INTERVAL ? DAY) = ?", plan.Value, time.Now().Format(model.LayoutDate2)).
 					Where("b.status = ?", pasturePb.IsShow_Ok)
 			}
 		}
 
-		if err := pref.Find(&cowList).Error; err != nil {
+		if err := pref.Find(&cowList).Debug().Error; err != nil {
 			return xerr.WithStack(err)
 		}
 		if len(cowList) <= 0 {

module/crontab/cow_indicators.go

@@ -1,8 +1,11 @@
 package crontab
 
 import (
+	"errors"
 	"kpt-pasture/model"
 
+	"gorm.io/gorm"
+
 	pasturePb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/cow"
 
 	"gitee.com/xuyiping_admin/pkg/logger/zaplog"
@@ -26,24 +29,37 @@ func (e *Entry) FindPastureAllCow() map[int64]int32 {
 	return res
 }
 
-func (e *Entry) UpdatePastureIndicators(pastureId int64, date, kind, value string) {
-	indicatorsData := &model.IndicatorsData{
+func (e *Entry) UpdatePastureIndicators(pastureId int64, indicatorsDetails *model.IndicatorsDetails, date, value string) {
+	where := &model.IndicatorsData{
 		PastureId: pastureId,
 		Date:      date,
-		Kind:      kind,
+		Kind:      indicatorsDetails.Kind,
 	}
-	res := e.DB.Model(indicatorsData).
-		Where(indicatorsData).
-		FirstOrCreate(indicatorsData)
-	if res.Error != nil {
-		zaplog.Error("UpdatePastureIndicators", zap.Any("err", res.Error))
-		return
+	data := &model.IndicatorsData{
+		PastureId:    pastureId,
+		CategoryType: indicatorsDetails.CategoryType,
+		CategoryName: indicatorsDetails.CategoryName,
+		Date:         date,
+		Kind:         indicatorsDetails.Kind,
+		Value:        value,
 	}
 
-	if res.RowsAffected == 0 {
-		indicatorsData.Value = value
-		if err := e.DB.Save(indicatorsData).Error; err != nil {
-			zaplog.Error("UpdatePastureIndicators", zap.Any("err", err))
+	var existData model.IndicatorsData
+	if err := e.DB.Model(new(model.IndicatorsData)).
+		Where(where).First(&existData).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			if err = e.DB.Model(new(model.IndicatorsData)).Create(data).Error; err != nil {
+				zaplog.Error("UpdatePastureIndicators", zap.Any("Create", err))
+			}
+		} else {
+			zaplog.Error("UpdatePastureIndicators", zap.Any("Find", err))
+			return
 		}
 	}
+
+	if err := e.DB.Model(new(model.IndicatorsData)).
+		Where("id = ?", existData.Id).
+		Update("value", value).Error; err != nil {
+		zaplog.Error("UpdatePastureIndicators", zap.Any("Update", err))
+	}
 }

module/crontab/neck_ring_estrus.go

@@ -129,7 +129,7 @@ func (e *Entry) CowEstrusWarning(pastureId int64, xToday *XToday) (err error) {
 			b48 = t3.Sub(t1).Hours()
 		}
 
-		if (int32(maxCft) > before3Data.DayHigh || b48 > 48) && int32(maxCft)+cowEstrus.HadJust > int32(xToday.ActiveLow) {
+		if (int32(maxCft) > before3Data.DayHigh || b48 > 48) && int32(maxCft)+cowEstrus.HadJust > xToday.ActiveLow {
 			level := calculateLevel(maxCft, cowEstrus, xToday)
 			cowInfo := e.FindCowInfoByNeckRingNumber(cowHabitList[0].NeckRingNumber)
 			isShow := pasturePb.IsShow_Ok
@@ -138,11 +138,11 @@ func (e *Entry) CowEstrusWarning(pastureId int64, xToday *XToday) (err error) {
 			}
 			dayHigh := int32(maxCft) + cowEstrus.HadJust
 			lastEstrusDate := cowEstrus.ActiveDate
-			result := getResult(before3Data, maxCft, cowEstrus)
+			checkResult := getResult(before3Data, maxCft, cowEstrus)
 			isPeak := pasturePb.IsShow_Ok
 			zaplog.Info("CowEstrusWarning",
 				zap.Any("level", level),
-				zap.Any("result", result),
+				zap.Any("checkResult", checkResult),
 				zap.Any("isShow", isShow),
 				zap.Any("isPeak", isPeak),
 				zap.Any("lastEstrusDate", lastEstrusDate),
@@ -155,7 +155,7 @@ func (e *Entry) CowEstrusWarning(pastureId int64, xToday *XToday) (err error) {
 				zap.Any("cowHabitList", cowHabitList),
 			)
 			newEstrus := model.NewEventEstrus(
-				pastureId, pasturePb.ExposeEstrusType_Neck_Ring, level, result, isShow,
+				pastureId, pasturePb.ExposeEstrusType_Neck_Ring, level, checkResult, isShow,
 				isPeak, lastEstrusDate, activeDate, dayHigh, maxHigh, cowInfo,
 			)
 			eventEstrusList = append(eventEstrusList, newEstrus)

module/crontab/sql.go

@@ -52,7 +52,7 @@ func (e *Entry) GetBeforeThreeDaysCowEstrus(cowId int64, activeTime string) *mod
 	eventEstrus := &model.EventEstrus{}
 	if err := e.DB.Model(new(model.EventEstrus)).
 		Select("MAX(max_high) as max_high,cow_id,MAX(day_high) as day_high").
-		Select("MAX(IF(result=1,3,result)) AS result").
+		Select("MAX(IF(check_result=1,3,check_result)) AS check_result").
 		Where("cow_id = ?", cowId).
 		Where("active_date >= ?", activeTime).
 		First(eventEstrus).Error; err != nil {

util/util_test.go

@@ -508,8 +508,9 @@ func TestGetNeckRingActiveTimer(t *testing.T) {
 
 func Test_demo(t *testing.T) {
 
-	nowTime := time.Now()
-	year := nowTime.Year()
-	month := nowTime.Month()
-	fmt.Println(year, int32(month))
+	a := make(map[string]int32)
+	a["1"] = 110
+	for pastureId, value := range a {
+		fmt.Println(pastureId, value)
+	}
 }