cow: 生长曲线图

go.mod

@@ -3,7 +3,7 @@ module kpt-pasture
 go 1.17
 
 require (
-	gitee.com/xuyiping_admin/go_proto v0.0.0-20250123060356-74f483993d26
+	gitee.com/xuyiping_admin/go_proto v0.0.0-20250123073911-033701a800ce
 	gitee.com/xuyiping_admin/pkg v0.0.0-20241108060137-caea58c59f5b
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/eclipse/paho.mqtt.golang v1.4.3

go.sum

@@ -126,6 +126,8 @@ gitee.com/xuyiping_admin/go_proto v0.0.0-20250120024815-cc7c8bda185b h1:iMNohD0Q
 gitee.com/xuyiping_admin/go_proto v0.0.0-20250120024815-cc7c8bda185b/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20250123060356-74f483993d26 h1:bUdNYFdlCUaAT6x6wIi6i4jLj1K3SyonTW8a0IiSGdU=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20250123060356-74f483993d26/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20250123073911-033701a800ce h1:DblWV5HpCOdKgxRxFA/W/DKei/jCcymyYZjoQz+bj/M=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20250123073911-033701a800ce/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
 gitee.com/xuyiping_admin/pkg v0.0.0-20241108060137-caea58c59f5b h1:w05MxH7yqveRlaRbxHhbif5YjPrJFodRPfOjYhXn7Zk=
 gitee.com/xuyiping_admin/pkg v0.0.0-20241108060137-caea58c59f5b/go.mod h1:8tF25X6pE9WkFCczlNAC0K2mrjwKvhhp02I7o0HtDxY=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=

http/handler/cow/cow.go

@@ -70,7 +70,6 @@ func BehaviorCurve(c *gin.Context) {
 
 	if err := valid.ValidateStruct(&req,
 		valid.Field(&req.CowId, valid.Required),
-		valid.Field(&req.CurveName, valid.Required),
 	); err != nil {
 		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
 		return
@@ -83,3 +82,25 @@ func BehaviorCurve(c *gin.Context) {
 	}
 	c.JSON(http.StatusOK, res)
 }
+
+func GrowthCurve(c *gin.Context) {
+	var req pasturePb.CowGrowthCurveRequest
+	if err := ginutil.BindProto(c, &req); err != nil {
+		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
+		return
+	}
+
+	if err := valid.ValidateStruct(&req,
+		valid.Field(&req.CowId, valid.Required),
+	); err != nil {
+		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
+		return
+	}
+
+	res, err := middleware.Dependency(c).StoreEventHub.OpsService.CowGrowthCurve(c, &req)
+	if err != nil {
+		apierr.ClassifiedAbort(c, err)
+		return
+	}
+	c.JSON(http.StatusOK, res)
+}

http/handler/event/event_base.go

@@ -52,6 +52,7 @@ func EnterEventCreate(c *gin.Context) {
 		valid.Field(&req.EnterAt, valid.Required),
 		valid.Field(&req.CowSource, valid.Required),
 		valid.Field(&req.OperationId, valid.Required),
+		valid.Field(&req.Weight, valid.Required),
 	); err != nil {
 		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
 		return

http/route/cow_api.go

@@ -16,5 +16,6 @@ func CowAPI(opts ...func(engine *gin.Engine)) func(s *gin.Engine) {
 		eventRoute.POST("/list", cow.List)
 		eventRoute.POST("/event/list", cow.EventList)
 		eventRoute.POST("/behavior/curve", cow.BehaviorCurve)
+		eventRoute.POST("/growth/curve", cow.GrowthCurve)
 	}
 }

model/cow.go

@@ -269,7 +269,7 @@ func (c CowSlice) ToPB(
 			LastWeightAtFormat:        lastWeightAtFormat,
 			LastCalvingAtFormat:       lastCalvingAtFormat,
 			LastAbortionAtFormat:      lastAbortionAtFormat,
-			LastSecondWeight:          float32(v.LastSecondWeight) / 100,
+			LastSecondWeight:          float32(v.LastSecondWeight) / 1000,
 			LastSecondWeightAtFormat:  lastSecondWeightAtFormat,
 		}
 	}
@@ -345,6 +345,7 @@ func NewCow(req *pasturePb.EventEnterRequest) *Cow {
 		LastMatingAt:        int64(req.MatingAt),
 		LastPregnantCheckAt: int64(req.PregnancyCheckAt),
 		AdmissionAt:         int64(req.BirthAt),
+		BirthWeight:         int64(req.Weight * 1000),
 	}
 }
 

model/event_weight.go

@@ -1,9 +1,14 @@
 package model
 
-import pasturePb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/cow"
+import (
+	"time"
+
+	pasturePb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/cow"
+)
 
 type EventWeight struct {
 	ID            int64  `json:"id"`
+	PastureId     int64  `json:"pastureId"`
 	CowId         int64  `json:"cowId"`
 	EarNumber     string `json:"earNumber"`
 	DayAge        int32  `json:"dayAge"`
@@ -28,6 +33,7 @@ func (c *EventWeight) TableName() string {
 
 func NewEventWeight(cow *Cow, currentUser *SystemUser, weight, height int32, req *pasturePb.EventWeight) *EventWeight {
 	return &EventWeight{
+		PastureId:     currentUser.PastureId,
 		CowId:         cow.Id,
 		EarNumber:     cow.EarNumber,
 		Weight:        weight,
@@ -42,3 +48,24 @@ func NewEventWeight(cow *Cow, currentUser *SystemUser, weight, height int32, req
 		OperationName: req.OperationName,
 	}
 }
+
+type EventWeightSlice []*EventWeight
+
+func (e EventWeightSlice) ToPB() []*pasturePb.CowGrowthCurveData {
+	res := make([]*pasturePb.CowGrowthCurveData, len(e))
+	for i, v := range e {
+		weightAtFormat := ""
+		if v.WeightAt > 0 {
+			weightAtFormat = time.Unix(v.WeightAt, 0).Format(LayoutTime)
+		}
+
+		res[i] = &pasturePb.CowGrowthCurveData{
+			Weight:          float32(v.Weight) / 1000,
+			WeightAtFormat:  weightAtFormat,
+			AvgWeight:       0, // 平均体重
+			DayAddWeight:    0, // 日增重
+			AvgDayAddWeight: 0, // 平均日增重
+			MonthAddWeight:  0, // 月增重
+		}
+	}
+}

module/backend/cow.go

@@ -88,8 +88,10 @@ func (s *StoreEntry) List(ctx context.Context, req *pasturePb.SearchEventRequest
 		Code: http.StatusOK,
 		Msg:  "ok",
 		Data: &pasturePb.SearchCowData{
-			List: model.CowSlice(cowList).ToPB(penMap, cowTypeMap, breedStatusMap,
-				cowKindMap, cowSourceMap, admissionStatusMap, healthStatusMap),
+			List: model.CowSlice(cowList).ToPB(
+				penMap, cowTypeMap, breedStatusMap, cowKindMap,
+				cowSourceMap, admissionStatusMap, healthStatusMap,
+			),
 			Total:    int32(count),
 			PageSize: pagination.PageSize,
 			Page:     pagination.Page,
@@ -227,3 +229,29 @@ func (s *StoreEntry) BehaviorCurve(ctx context.Context, req *pasturePb.CowBehavi
 		Data: data,
 	}, nil
 }
+
+func (s *StoreEntry) CowGrowthCurve(ctx context.Context, req *pasturePb.CowGrowthCurveRequest) (*pasturePb.CowGrowthCurveResponse, error) {
+	currentUser, err := s.GetCurrentSystemUser(ctx)
+	if err != nil {
+		return nil, xerr.Custom("当前用户信息错误,请退出重新登录")
+	}
+	cowInfo, err := s.GetCowInfoByCowId(ctx, currentUser.PastureId, int64(req.CowId))
+	if err != nil {
+		return nil, xerr.Customf("错误的牛只信息: %d", req.CowId)
+	}
+
+	weightList := make([]*model.EventWeight, 0)
+	if err = s.DB.Table(new(model.EventWeight).TableName()).
+		Where("cow_id = ?", cowInfo.Id).
+		Where("pasture_id = ?", currentUser.PastureId).
+		Order("weight_at").
+		Find(&weightList).Error; err != nil {
+		return nil, xerr.WithStack(err)
+	}
+
+	return &pasturePb.CowGrowthCurveResponse{
+		Code: http.StatusOK,
+		Msg:  "ok",
+		Data: model.EventWeightSlice(weightList).ToPB(),
+	}, nil
+}

module/backend/event_base.go

@@ -99,6 +99,15 @@ func (s *StoreEntry) CreateEnter(ctx context.Context, req *pasturePb.EventEnterR
 		if err = tx.Create(newEventEnter).Error; err != nil {
 			return xerr.WithStack(err)
 		}
+		eventWeight := model.NewEventWeight(newCowData, currentUser, int32(req.Weight*1000), 0, &pasturePb.EventWeight{
+			WeightAt:      req.EnterAt,
+			Remarks:       "入场体重",
+			OperationId:   req.OperationId,
+			OperationName: req.OperationName,
+		})
+		if err = tx.Create(eventWeight).Error; err != nil {
+			return xerr.WithStack(err)
+		}
 		return nil
 	}); err != nil {
 		return xerr.WithStack(err)

module/backend/interface.go

@@ -212,6 +212,7 @@ type CowService interface {
 	List(ctx context.Context, req *pasturePb.SearchEventRequest, pagination *pasturePb.PaginationModel) (*pasturePb.SearchCowListResponse, error)
 	EventList(ctx context.Context, req *pasturePb.SearchCowEventListRequest, pagination *pasturePb.PaginationModel) (*pasturePb.CowEventListResponse, error)
 	BehaviorCurve(ctx context.Context, req *pasturePb.CowBehaviorCurveRequest) (*model.CowBehaviorCurveResponse, error)
+	CowGrowthCurve(ctx context.Context, req *pasturePb.CowGrowthCurveRequest) (*pasturePb.CowGrowthCurveResponse, error)
 }
 
 //go:generate mockgen -destination mock/GoodsService.go -package kptservicemock kpt-pasture/module/backend GoodsService