event: 称重事件优化

go.mod

@@ -3,7 +3,7 @@ module kpt-pasture
 go 1.17
 
 require (
-	gitee.com/xuyiping_admin/go_proto v0.0.0-20240605030356-5e185b3955e4
+	gitee.com/xuyiping_admin/go_proto v0.0.0-20240605085152-de3ddf049865
 	gitee.com/xuyiping_admin/pkg v0.0.0-20231218082641-aac597b8a015
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/getsentry/sentry-go v0.23.0

go.sum

@@ -132,6 +132,8 @@ gitee.com/xuyiping_admin/go_proto v0.0.0-20240605025134-92750dd51e8d h1:DJP0jJoL
 gitee.com/xuyiping_admin/go_proto v0.0.0-20240605025134-92750dd51e8d/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20240605030356-5e185b3955e4 h1:0hQ8qWbSBph/2jgB2RUUSbuXGu1NARJHVwRwIM1cV68=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20240605030356-5e185b3955e4/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20240605085152-de3ddf049865 h1:icm4K9AW11Yg8CaWGBRpM5VmCM2DnrjUJyBUDG7Dlno=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20240605085152-de3ddf049865/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
 gitee.com/xuyiping_admin/pkg v0.0.0-20231218082641-aac597b8a015 h1:dfb5dRd57L2HKjdwLT93UFmPYFPOmEl56gtZmqcNnaE=
 gitee.com/xuyiping_admin/pkg v0.0.0-20231218082641-aac597b8a015/go.mod h1:Fk4GYI/v0IK3XFrm1Gn+VkgCz5Y7mfswD5hsTJYOG6A=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=

http/handler/event/event.go

@@ -466,8 +466,13 @@ func WeightEventCreate(c *gin.Context) {
 	if err := valid.ValidateStruct(&req,
 		valid.Field(&req.CowId, valid.Required),
 		valid.Field(&req.WeightAt, valid.Required),
-		valid.Field(&req.Weight, valid.Required),
 		valid.Field(&req.StaffMemberId, valid.Required),
+		valid.Field(&req.WeightItems, valid.Required, valid.Each(valid.By(func(value interface{}) error {
+			s := value.(pasturePb.WeightItem)
+			return valid.ValidateStruct(&s,
+				valid.Field(&s.Weight, valid.Required),
+			)
+		}))),
 	); err != nil {
 		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
 		return

model/cow.go

@@ -35,6 +35,7 @@ type Cow struct {
 	LastBullId          int64                      `json:"last_bull_id"`
 	LastPregnantCheckAt int64                      `json:"last_pregnant_check_at"`
 	LastDryMilkAt       int64                      `json:"last_dry_milk_at"`
+	LastWeightAt        int64                      `json:"last_weight_at"`
 	CreatedAt           int64                      `json:"created_at"`
 	UpdatedAt           int64                      `json:"updated_at"`
 }

model/cow_weight.go

@@ -23,16 +23,16 @@ func (c *EventWeight) TableName() string {
 	return "event_weight"
 }
 
-func NewEventWeight(cow *Cow, operationId int64, req *pasturePb.WeightEventRequest) *EventWeight {
+func NewEventWeight(cow *Cow, systemUser *SystemUser, weight int32, req *pasturePb.WeightEventRequest) *EventWeight {
 	return &EventWeight{
 		CowId:         cow.Id,
 		EarNumber:     cow.EarNumber,
-		Weight:        int32(req.Weight * 100),
+		Weight:        weight,
 		Lact:          cow.Lact,
 		DayAge:        cow.GetDayAge(),
 		WeightAt:      int64(req.WeightAt),
 		Remarks:       req.Remarks,
 		StaffMemberId: req.StaffMemberId,
-		OperationId:   int32(operationId),
+		OperationId:   int32(systemUser.Id),
 	}
 }

module/backend/event.go

@@ -579,19 +579,34 @@ func (s *StoreEntry) CreateWeight(ctx context.Context, req *pasturePb.WeightEven
 		return xerr.Custom("请选择相关牛只")
 	}
 	currentSystemUser, _ := s.GetCurrentSystemUser(ctx)
-	cowList := strings.Split(req.CowId, ",")
 	weightEvent := make([]*model.EventWeight, 0)
-	for _, cowIdStr := range cowList {
-		cowId, _ := strconv.ParseInt(cowIdStr, 10, 64)
-		cow, err := s.GetCowInfo(ctx, cowId)
+	for _, item := range req.WeightItems {
+		cow, err := s.GetCowInfo(ctx, int64(item.CowId))
 		if err != nil {
 			return xerr.WithStack(err)
 		}
-		weightEvent = append(weightEvent, model.NewEventWeight(cow, currentSystemUser.Id, req))
+		var weight = int32(item.Weight * 100)
+		weightEvent = append(weightEvent, model.NewEventWeight(cow, currentSystemUser, weight, req))
 	}
 	if len(weightEvent) <= 0 {
 		return nil
 	}
 
-	return s.DB.Create(weightEvent).Error
+	if err := s.DB.Transaction(func(tx *gorm.DB) error {
+		for _, item := range weightEvent {
+			if err := tx.Model(new(model.Cow)).Where("id = ?", item.CowId).Updates(map[string]interface{}{
+				"last_weight_at": item.WeightAt,
+				"current_weight": item.Weight,
+			}).Error; err != nil {
+				return xerr.WithStack(err)
+			}
+		}
+		if err := tx.Create(weightEvent).Error; err != nil {
+			return xerr.WithStack(err)
+		}
+		return nil
+	}); err != nil {
+		return xerr.WithStack(err)
+	}
+	return nil
 }