cow: 牛只事件列表

go.mod

@@ -3,7 +3,7 @@ module kpt-pasture
 go 1.17
 
 require (
-	gitee.com/xuyiping_admin/go_proto v0.0.0-20250103092939-8816c3aabc06
+	gitee.com/xuyiping_admin/go_proto v0.0.0-20250107024845-37a577c13d5e
 	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

@@ -112,6 +112,10 @@ gitee.com/xuyiping_admin/go_proto v0.0.0-20250103030611-2b0c271353c7 h1:mk2G7/x2
 gitee.com/xuyiping_admin/go_proto v0.0.0-20250103030611-2b0c271353c7/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20250103092939-8816c3aabc06 h1:9pYtEuYYvFb1Zak/bMe7MFzElFlwya45G7mrco5bNp0=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20250103092939-8816c3aabc06/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20250107022103-9539c511e1dd h1:gkUnfEcy/OQOZXb797N+DExwYLFVRNP7P6zfLWjShdQ=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20250107022103-9539c511e1dd/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20250107024845-37a577c13d5e h1:P3cy/uJuG9uCpWiZJsncgkEPG4fuKffscpWqXwDJXiE=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20250107024845-37a577c13d5e/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

@@ -4,6 +4,8 @@ import (
 	"kpt-pasture/http/middleware"
 	"net/http"
 
+	"gitee.com/xuyiping_admin/pkg/valid"
+
 	pasturePb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/cow"
 	"gitee.com/xuyiping_admin/pkg/apierr"
 	"gitee.com/xuyiping_admin/pkg/ginutil"
@@ -23,7 +25,35 @@ func List(c *gin.Context) {
 		PageOffset: int32(c.GetInt(middleware.PageOffset)),
 	}
 
-	res, err := middleware.Dependency(c).StoreEventHub.OpsService.CowList(c, &req, pagination)
+	res, err := middleware.Dependency(c).StoreEventHub.OpsService.List(c, &req, pagination)
+	if err != nil {
+		apierr.ClassifiedAbort(c, err)
+		return
+	}
+	ginutil.JSONResp(c, res)
+}
+
+func EventList(c *gin.Context) {
+	var req pasturePb.SearchCowEventListRequest
+	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
+	}
+
+	pagination := &pasturePb.PaginationModel{
+		Page:       int32(c.GetInt(middleware.Page)),
+		PageSize:   int32(c.GetInt(middleware.PageSize)),
+		PageOffset: int32(c.GetInt(middleware.PageOffset)),
+	}
+
+	res, err := middleware.Dependency(c).StoreEventHub.OpsService.EventList(c, &req, pagination)
 	if err != nil {
 		apierr.ClassifiedAbort(c, err)
 		return

http/route/cow_api.go

@@ -14,5 +14,6 @@ func CowAPI(opts ...func(engine *gin.Engine)) func(s *gin.Engine) {
 		// CowAPI API 组  牛只信息
 		eventRoute := authRouteGroup(s, "/api/v1/cow/")
 		eventRoute.POST("/list", cow.List)
+		eventRoute.POST("/event/list", cow.EventList)
 	}
 }

model/event_cow_log.go

@@ -2,6 +2,7 @@ package model
 
 import (
 	"fmt"
+	"time"
 
 	pasturePb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/cow"
 )
@@ -9,25 +10,25 @@ import (
 const ShardTableNumber = 6
 
 type EventCowLog struct {
-	Id               int64                        `json:"id"`
-	PastureId        int64                        `json:"pastureId"`
-	CowId            int64                        `json:"cowId"`
-	DayAge           int32                        `json:"dayAge"`
-	Lact             int32                        `json:"lact"`
-	PenId            int32                        `json:"penId"`
-	PenName          string                       `json:"penName"`
-	CowType          pasturePb.CowType_Kind       `json:"cowType"`
-	CowTypeName      string                       `json:"cowTypeName"`
-	EventCategoryId  pasturePb.EventCategory_Kind `json:"eventCategoryId"`
-	EventType        pasturePb.EventType_Kind     `json:"eventType"`
-	EventTypeName    string                       `json:"eventTypeName"`
-	EventDescription string                       `json:"eventDescription"`
-	OperationId      int64                        `json:"operationId"`
-	OperationName    string                       `json:"operationName"`
-	EventAt          int64                        `json:"eventAt"`
-	Remarks          string                       `json:"remarks"`
-	CreatedAt        int64                        `json:"createdAt"`
-	UpdatedAt        int64                        `json:"updatedAt"`
+	Id                int64                        `json:"id"`
+	PastureId         int64                        `json:"pastureId"`
+	CowId             int64                        `json:"cowId"`
+	DayAge            int32                        `json:"dayAge"`
+	Lact              int32                        `json:"lact"`
+	PenId             int32                        `json:"penId"`
+	PenName           string                       `json:"penName"`
+	CowType           pasturePb.CowType_Kind       `json:"cowType"`
+	CowTypeName       string                       `json:"cowTypeName"`
+	EventCategoryKind pasturePb.EventCategory_Kind `json:"eventCategoryId"`
+	EventType         pasturePb.EventType_Kind     `json:"eventType"`
+	EventTypeName     string                       `json:"eventTypeName"`
+	EventDescription  string                       `json:"eventDescription"`
+	OperationId       int64                        `json:"operationId"`
+	OperationName     string                       `json:"operationName"`
+	EventAt           int64                        `json:"eventAt"`
+	Remarks           string                       `json:"remarks"`
+	CreatedAt         int64                        `json:"createdAt"`
+	UpdatedAt         int64                        `json:"updatedAt"`
 }
 
 func (e *EventCowLog) UnShardTableName() string {
@@ -40,18 +41,18 @@ func (e *EventCowLog) TableName() string {
 }
 
 type EventCowLogModel struct {
-	Cow              *Cow
-	EventType        pasturePb.EventType_Kind
-	OperationUser    *SystemUser
-	CurrentUser      *SystemUser
-	EventAt          int64
-	ExposeEstrusType pasturePb.ExposeEstrusType_Kind
-	EventCategoryId  pasturePb.EventCategory_Kind
-	PenName          string
-	Remarks          string
-	CowTypeName      string
-	EventTypeName    string
-	Description      string
+	Cow               *Cow
+	EventType         pasturePb.EventType_Kind
+	OperationUser     *SystemUser
+	CurrentUser       *SystemUser
+	EventAt           int64
+	ExposeEstrusType  pasturePb.ExposeEstrusType_Kind
+	EventCategoryKind pasturePb.EventCategory_Kind
+	PenName           string
+	Remarks           string
+	CowTypeName       string
+	EventTypeName     string
+	Description       string
 }
 
 func NewEventCowLog(req *EventCowLogModel) *EventCowLog {
@@ -62,21 +63,47 @@ func NewEventCowLog(req *EventCowLogModel) *EventCowLog {
 		operationName = req.OperationUser.Name
 	}
 	return &EventCowLog{
-		PastureId:        req.Cow.PastureId,
-		CowId:            req.Cow.Id,
-		DayAge:           req.Cow.GetDayAge(),
-		Lact:             req.Cow.Lact,
-		PenId:            req.Cow.PenId,
-		PenName:          req.PenName,
-		CowType:          req.Cow.CowType,
-		CowTypeName:      req.CowTypeName,
-		EventCategoryId:  req.EventCategoryId,
-		EventType:        req.EventType,
-		EventTypeName:    req.EventTypeName,
-		EventDescription: req.Description,
-		OperationId:      operationId,
-		OperationName:    operationName,
-		EventAt:          req.EventAt,
-		Remarks:          req.Remarks,
+		PastureId:         req.Cow.PastureId,
+		CowId:             req.Cow.Id,
+		DayAge:            req.Cow.GetDayAge(),
+		Lact:              req.Cow.Lact,
+		PenId:             req.Cow.PenId,
+		PenName:           req.PenName,
+		CowType:           req.Cow.CowType,
+		CowTypeName:       req.CowTypeName,
+		EventCategoryKind: req.EventCategoryKind,
+		EventType:         req.EventType,
+		EventTypeName:     req.EventTypeName,
+		EventDescription:  req.Description,
+		OperationId:       operationId,
+		OperationName:     operationName,
+		EventAt:           req.EventAt,
+		Remarks:           req.Remarks,
 	}
 }
+
+type EventCowLogSlice []*EventCowLog
+
+func (e EventCowLogSlice) ToPB(eventCategoryMap map[pasturePb.EventCategory_Kind]string) []*pasturePb.CowEvent {
+	res := make([]*pasturePb.CowEvent, len(e))
+	for i, v := range e {
+		res[i] = &pasturePb.CowEvent{
+			Id:                int32(v.Id),
+			PastureId:         int32(v.PastureId),
+			CowId:             int32(v.CowId),
+			Lact:              v.Lact,
+			DayAge:            v.DayAge,
+			PenName:           v.PenName,
+			CowTypeName:       v.CowTypeName,
+			EventTypeName:     v.EventTypeName,
+			EventDescription:  v.EventDescription,
+			OperationName:     v.OperationName,
+			Remarks:           v.Remarks,
+			EventAtFormat:     time.Unix(v.EventAt, 0).Format(LayoutDate2),
+			EventCategoryKind: v.EventCategoryKind,
+			EventCategoryName: eventCategoryMap[v.EventCategoryKind],
+		}
+	}
+
+	return res
+}

module/backend/config_data_base.go

@@ -185,3 +185,33 @@ func (s *StoreEntry) MatingResultEnumList(isAll string) []*pasturePb.ConfigOptio
 	})
 	return configOptions
 }
+
+func (s *StoreEntry) EventCategoryEnumList(isAll string) []*pasturePb.ConfigOptionsList {
+	configOptions := make([]*pasturePb.ConfigOptionsList, 0)
+	if isAll == model.IsAllYes {
+		configOptions = append(configOptions,
+			&pasturePb.ConfigOptionsList{
+				Value:    int32(0),
+				Label:    "全部",
+				Disabled: true,
+			})
+	}
+	configOptions = append(configOptions, &pasturePb.ConfigOptionsList{
+		Value:    int32(pasturePb.EventCategory_Base),
+		Label:    "基础事件",
+		Disabled: true,
+	}, &pasturePb.ConfigOptionsList{
+		Value:    int32(pasturePb.EventCategory_Breed),
+		Label:    "繁殖事件",
+		Disabled: true,
+	}, &pasturePb.ConfigOptionsList{
+		Value:    int32(pasturePb.EventCategory_Health),
+		Label:    "兽医事件",
+		Disabled: true,
+	}, &pasturePb.ConfigOptionsList{
+		Value:    int32(pasturePb.EventCategory_Other),
+		Label:    "其他事件",
+		Disabled: true,
+	})
+	return configOptions
+}

module/backend/cow.go

@@ -6,12 +6,15 @@ import (
 	"net/http"
 	"strings"
 
+	"gitee.com/xuyiping_admin/pkg/logger/zaplog"
+	"go.uber.org/zap"
+
 	"gitee.com/xuyiping_admin/pkg/xerr"
 
 	pasturePb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/cow"
 )
 
-func (s *StoreEntry) CowList(ctx context.Context, req *pasturePb.SearchEventRequest, pagination *pasturePb.PaginationModel) (*pasturePb.SearchCowListResponse, error) {
+func (s *StoreEntry) List(ctx context.Context, req *pasturePb.SearchEventRequest, pagination *pasturePb.PaginationModel) (*pasturePb.SearchCowListResponse, error) {
 	currentUser, err := s.GetCurrentSystemUser(ctx)
 	if err != nil {
 		return nil, xerr.Custom("当前用户信息错误,请退出重新登录")
@@ -91,3 +94,52 @@ func (s *StoreEntry) CowList(ctx context.Context, req *pasturePb.SearchEventRequ
 	}, nil
 
 }
+
+func (s *StoreEntry) EventList(ctx context.Context, req *pasturePb.SearchCowEventListRequest, pagination *pasturePb.PaginationModel) (*pasturePb.CowEventListResponse, error) {
+	currentUser, err := s.GetCurrentSystemUser(ctx)
+	if err != nil {
+		return nil, xerr.Custom("当前用户信息错误,请退出重新登录")
+	}
+
+	cow := &model.Cow{}
+	if err = s.DB.Model(cow).
+		Where("pasture_id = ?", currentUser.PastureId).
+		Where("id = ?", req.CowId).First(cow).Error; err != nil {
+		zaplog.Error("EventList", zap.Any("req", req), zap.Any("err", err), zap.Any("currentUser", currentUser))
+		return nil, xerr.Customf("该牛不存在: %d", req.CowId)
+	}
+
+	eventCowLogList := make([]*model.EventCowLog, 0)
+	eventCowLog := &model.EventCowLog{CowId: cow.Id}
+	pref := s.DB.Table(eventCowLog.TableName()).
+		Where("cow_id = ?", req.CowId)
+
+	if req.Lact >= 0 {
+		pref.Where("lact = ?", req.Lact)
+	}
+
+	if req.EventCategoryKind > 0 {
+		pref.Where("event_category_id = ?", req.EventCategoryKind)
+	}
+
+	if err = pref.Order("id desc").
+		Limit(int(pagination.PageSize)).
+		Offset(int(pagination.PageOffset)).
+		Find(&eventCowLogList).Error; err != nil {
+		zaplog.Error("EventList", zap.Any("req", req), zap.Any("err", err), zap.Any("currentUser", currentUser))
+		return nil, xerr.WithStack(err)
+	}
+
+	eventCategoryMap := s.EventCategoryMap()
+
+	return &pasturePb.CowEventListResponse{
+		Code:    http.StatusOK,
+		Message: "ok",
+		Data: &pasturePb.CowEventData{
+			List:     model.EventCowLogSlice(eventCowLogList).ToPB(eventCategoryMap),
+			Total:    int32(len(eventCowLogList)),
+			PageSize: pagination.PageSize,
+			Page:     pagination.Page,
+		},
+	}, nil
+}

module/backend/enum_map.go

@@ -278,3 +278,11 @@ func (s *StoreEntry) MatingResultMap() map[pasturePb.MatingResult_Kind]string {
 	}
 	return res
 }
+
+func (s *StoreEntry) EventCategoryMap() map[pasturePb.EventCategory_Kind]string {
+	res := make(map[pasturePb.EventCategory_Kind]string)
+	for _, v := range s.EventCategoryEnumList("") {
+		res[pasturePb.EventCategory_Kind(v.Value)] = v.Label
+	}
+	return res
+}

module/backend/enum_options.go

@@ -210,6 +210,7 @@ func (s *StoreEntry) SystemBaseConfigOptions(ctx context.Context, optionsName, i
 		"departureType":              s.DepartureTypeEnumList,
 		"outReason":                  s.OutReasonEnumList,
 		"deadReason":                 s.DeadReasonEnumList,
+		"eventCategory":              s.EventCategoryEnumList,
 	}
 
 	getConfigFunc, ok := getConfigFuncMap[optionsName]

module/backend/event_cow_log.go

@@ -175,16 +175,16 @@ func (s *StoreEntry) SubmitEventLog(
 		eventCategoryId = pasturePb.EventCategory_Health
 	}
 	newEventCowLogModel := &model.EventCowLogModel{
-		Cow:             cow,
-		CowTypeName:     cowTypeMap[cow.CowType],
-		OperationUser:   operationUser,
-		EventCategoryId: eventCategoryId,
-		EventAt:         eventAt,
-		EventType:       eventType,
-		EventTypeName:   eventTypeName,
-		Description:     desc,
-		Remarks:         remarks,
-		PenName:         penMap[cow.PenId].Name,
+		Cow:               cow,
+		CowTypeName:       cowTypeMap[cow.CowType],
+		OperationUser:     operationUser,
+		EventCategoryKind: eventCategoryId,
+		EventAt:           eventAt,
+		EventType:         eventType,
+		EventTypeName:     eventTypeName,
+		Description:       desc,
+		Remarks:           remarks,
+		PenName:           penMap[cow.PenId].Name,
 	}
 	return model.NewEventCowLog(newEventCowLogModel)
 }

module/backend/interface.go

@@ -208,7 +208,8 @@ type EventService interface {
 
 //go:generate mockgen -destination mock/CowService.go -package kptservicemock kpt-pasture/module/backend CowService
 type CowService interface {
-	CowList(ctx context.Context, req *pasturePb.SearchEventRequest, pagination *pasturePb.PaginationModel) (*pasturePb.SearchCowListResponse, error)
+	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)
 }
 
 //go:generate mockgen -destination mock/GoodsService.go -package kptservicemock kpt-pasture/module/backend GoodsService