event: 入场事件

go.mod

@@ -3,7 +3,7 @@ module kpt-pasture
 go 1.17
 
 require (
-	gitee.com/xuyiping_admin/go_proto v0.0.0-20240429093656-ddd0948ba705
+	gitee.com/xuyiping_admin/go_proto v0.0.0-20240430082601-9300922bef83
 	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

@@ -70,6 +70,10 @@ gitee.com/xuyiping_admin/go_proto v0.0.0-20240429093353-bbb01da08b4e h1:d2iUF//P
 gitee.com/xuyiping_admin/go_proto v0.0.0-20240429093353-bbb01da08b4e/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20240429093656-ddd0948ba705 h1:FURTtdTQjJnDc9SOA2bFgwH7f+gMWovVVHFb6SF3E5k=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20240429093656-ddd0948ba705/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20240430072830-f136f793f6b1 h1:cR+0spDUIeSDjB9Mdm6ThAJsBmMFZN40EYP08nrK93I=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20240430072830-f136f793f6b1/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20240430082601-9300922bef83 h1:CgxdEzvMp/OlWUsuGUGcYJjNqYSBFk79xJFf3MipJ7c=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20240430082601-9300922bef83/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
 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/config/config.go

@@ -17,6 +17,15 @@ func BarnTypeOptions(c *gin.Context) {
 	ginutil.JSONResp(c, res)
 }
 
+func BarnListOptions(c *gin.Context) {
+	res, err := middleware.Dependency(c).StoreEventHub.OpsService.BarnListOptions(c)
+	if err != nil {
+		apierr.ClassifiedAbort(c, err)
+		return
+	}
+	ginutil.JSONResp(c, res)
+}
+
 func BreedStatusOptions(c *gin.Context) {
 	res, err := middleware.Dependency(c).StoreEventHub.OpsService.BreedStatusOptions(c)
 	if err != nil {

http/handler/event/event.go

@@ -0,0 +1,63 @@
+package event
+
+import (
+	"kpt-pasture/http/middleware"
+	"net/http"
+
+	operationPb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/operation"
+	"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"
+	"github.com/gin-gonic/gin"
+)
+
+func EnterEventList(c *gin.Context) {
+	var req pasturePb.SearchEnterEventRequest
+	if err := ginutil.BindProto(c, &req); 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.EnterList(c, &req, pagination)
+	if err != nil {
+		apierr.ClassifiedAbort(c, err)
+		return
+	}
+	ginutil.JSONResp(c, res)
+}
+
+func EnterEventCreate(c *gin.Context) {
+	var req pasturePb.SearchEnterData
+	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),
+		valid.Field(&req.EarNumber, valid.Required),
+		valid.Field(&req.BirthAt, valid.Required),
+	); err != nil {
+		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
+		return
+	}
+
+	if err := middleware.BackendOperation(c).OpsService.CreateEnterEvent(c, &req); err != nil {
+		apierr.ClassifiedAbort(c, err)
+		return
+	}
+
+	ginutil.JSONResp(c, &operationPb.CommonOK{
+		Code: http.StatusOK,
+		Msg:  "ok",
+		Data: &operationPb.Success{Success: true},
+	})
+}

http/handler/pasture/barn.go

@@ -365,7 +365,7 @@ func SearchCowSourceList(c *gin.Context) {
 		PageOffset: int32(c.GetInt(middleware.PageOffset)),
 	}
 
-	res, err := middleware.Dependency(c).StoreEventHub.OpsService.SearchTransferPenReasonList(c, &req, pagination)
+	res, err := middleware.Dependency(c).StoreEventHub.OpsService.SearchCowSourceList(c, &req, pagination)
 	if err != nil {
 		apierr.ClassifiedAbort(c, err)
 		return
@@ -388,7 +388,7 @@ func CreatedOrUpdateCowSource(c *gin.Context) {
 		return
 	}
 
-	if err := middleware.BackendOperation(c).OpsService.CreateOrUpdateTransferPenReason(c, &req); err != nil {
+	if err := middleware.BackendOperation(c).OpsService.CreateOrUpdateCowSource(c, &req); err != nil {
 		apierr.ClassifiedAbort(c, err)
 		return
 	}

http/route/config_api.go

@@ -14,7 +14,8 @@ func ConfigAPI(opts ...func(engine *gin.Engine)) func(s *gin.Engine) {
 		// pasture API 组  牧场管理
 		pastureRoute := authRouteGroup(s, "/api/v1/config/")
 		pastureRoute.GET("/barn/type/options", config.BarnTypeOptions)
-		pastureRoute.GET("/barn/status/options", config.BreedStatusOptions)
+		pastureRoute.GET("/barn/list/options", config.BarnListOptions)
+		pastureRoute.GET("/breed/status/options", config.BreedStatusOptions)
 		pastureRoute.GET("/cow/kind/options", config.CowKindOptions)
 		pastureRoute.GET("/cow/source/options", config.CowSourceOptions)
 		pastureRoute.GET("/cow/status/options", config.CowStatusOptions)

http/route/event_api.go

@@ -0,0 +1,19 @@
+package route
+
+import (
+	"kpt-pasture/http/handler/event"
+
+	"github.com/gin-gonic/gin"
+)
+
+func EventAPI(opts ...func(engine *gin.Engine)) func(s *gin.Engine) {
+	return func(s *gin.Engine) {
+		for _, opt := range opts {
+			opt(s)
+		}
+		// pasture API 组  牧场管理
+		pastureRoute := authRouteGroup(s, "/api/v1/event/")
+		pastureRoute.POST("/enter/list", event.EnterEventList)
+		pastureRoute.POST("/enter/create", event.EnterEventCreate)
+	}
+}

http/route/route.go

@@ -9,6 +9,7 @@ func HTTPServerRoute(opts ...func(engine *gin.Engine)) func(s *gin.Engine) {
 		SystemAPI(opts...),
 		PastureManageAPI(opts...),
 		ConfigAPI(opts...),
+		EventAPI(opts...),
 	}
 
 	return func(s *gin.Engine) {

model/barn.go

@@ -57,3 +57,15 @@ func (p PenSlice) ToPB(configBarnTypes []*ConfigPenType) []*pasturePb.SearchBarn
 	}
 	return res
 }
+
+func (p PenSlice) ToPB2() []*pasturePb.ConfigOptionsList {
+	res := make([]*pasturePb.ConfigOptionsList, len(p))
+	for i, d := range p {
+		res[i] = &pasturePb.ConfigOptionsList{
+			Value:    int32(d.Id),
+			Label:    d.Name,
+			Disabled: true,
+		}
+	}
+	return res
+}

model/event_enter.go

@@ -0,0 +1,73 @@
+package model
+
+import (
+	pasturePb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/cow"
+)
+
+type EventEnter struct {
+	Id               int64                  `json:"id"`
+	EarNumber        string                 `json:"ear_number"`
+	CowId            int64                  `json:"cow_id"`
+	Sex              pasturePb.Genders_Kind `json:"sex"`
+	BrithAt          int64                  `json:"brith_at"`
+	CowSourceId      int64                  `json:"cow_source_id"`
+	OldEarNumber     string                 `json:"old_ear_number"`
+	CowTypeId        int32                  `json:"cow_type_id"`
+	BreedStatusId    int32                  `json:"breed_status_id"`
+	Lact             int32                  `json:"lact"`
+	PenId            int32                  `json:"pen_id"`
+	CowKindId        int32                  `json:"cow_kind_id"`
+	FatherId         int64                  `json:"father_id"`
+	MotherId         int64                  `json:"mother_id"`
+	MatingAt         int64                  `json:"mating_at"`
+	PregnancyCheckAt int64                  `json:"pregnancy_check_at"`
+	DryMilkAt        int64                  `json:"dry_milk_at"`
+	WeaningAt        int64                  `json:"weaning_at"`
+	EstrusAt         int64                  `json:"estrus_at"`
+	EnterAt          int64                  `json:"enter_at"`
+	Remarks          string                 `json:"remarks"`
+	Weight           int64                  `json:"weight"`
+	Price            int64                  `json:"price"`
+	OperationId      int64                  `json:"operation_id"`
+	CreatedAt        int64                  `json:"created_at"`
+	UpdatedAt        int64                  `json:"updated_at"`
+}
+
+func (e *EventEnter) TableName() string {
+	return "event_enter"
+}
+
+type EventEnterSlice []*EventEnter
+
+func (e EventEnterSlice) ToPB() []*pasturePb.SearchEnterData {
+	res := make([]*pasturePb.SearchEnterData, len(e))
+	for i, d := range e {
+		res[i] = &pasturePb.SearchEnterData{
+			Id:               int32(d.Id),
+			EarNumber:        d.EarNumber,
+			CowId:            int32(d.CowId),
+			Sex:              d.Sex,
+			BirthAt:          int32(d.BrithAt),
+			CowSourceId:      int32(d.CowSourceId),
+			CowTypeId:        d.CowTypeId,
+			BreedStatusId:    d.BreedStatusId,
+			Lact:             d.Lact,
+			PenId:            d.PenId,
+			CowKindId:        d.CowKindId,
+			FatherId:         int32(d.FatherId),
+			MotherId:         int32(d.MotherId),
+			MatingAt:         int32(d.MatingAt),
+			PregnancyCheckAt: int32(d.PregnancyCheckAt),
+			DryMilkAt:        int32(d.DryMilkAt),
+			WeaningAt:        int32(d.WeaningAt),
+			EstrusAt:         int32(d.EstrusAt),
+			EnterAt:          int32(d.EnterAt),
+			Weight:           float32(d.Weight) / 100,
+			Price:            float32(d.Price) / 100,
+			Remarks:          d.Remarks,
+			CreatedAt:        int32(d.CreatedAt),
+			UpdatedAt:        int32(d.UpdatedAt),
+		}
+	}
+	return res
+}

module/backend/config_data.go

@@ -24,6 +24,21 @@ func (s *StoreEntry) BarnTypeOptions(ctx context.Context) (*pasturePb.ConfigOpti
 	}, nil
 }
 
+func (s *StoreEntry) BarnListOptions(ctx context.Context) (*pasturePb.ConfigOptionsListResponse, error) {
+	penList := make([]*model.Pen, 0)
+	if err := s.DB.Table(new(model.Pen).TableName()).
+		Where("is_delete = ?", pasturePb.IsShow_Ok).
+		Find(&penList).Error; err != nil {
+		return nil, err
+	}
+
+	return &pasturePb.ConfigOptionsListResponse{
+		Code:    http.StatusOK,
+		Message: "ok",
+		Data:    model.PenSlice(penList).ToPB2(),
+	}, nil
+}
+
 func (s *StoreEntry) BreedStatusOptions(ctx context.Context) (*pasturePb.ConfigOptionsListResponse, error) {
 	configBreedStatusList := make([]*model.ConfigBreedStatus, 0)
 	if err := s.DB.Table(new(model.ConfigBreedStatus).TableName()).Find(&configBreedStatusList).Error; err != nil {

module/backend/event.go

@@ -0,0 +1,53 @@
+package backend
+
+import (
+	"context"
+	"fmt"
+	"kpt-pasture/model"
+	"net/http"
+
+	"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) EnterList(ctx context.Context, req *pasturePb.SearchEnterEventRequest, pagination *pasturePb.PaginationModel) (*pasturePb.SearchEnterEventResponse, error) {
+	eventEnterList := make([]*pasturePb.SearchEnterData, 0)
+	var count int64 = 0
+	pref := s.DB.Table(fmt.Sprintf("%s as a", new(model.EventEnter).TableName())).
+		Select("a.*,b.name as breed_status_name,c.name as cow_source_name ,d.name as cow_type_name,e.name as cow_kind_name,f.name as pen_name").
+		Joins(fmt.Sprintf("JOIN %s AS b ON a.breed_status_id = b.id", new(model.ConfigBreedStatus).TableName())).
+		Joins(fmt.Sprintf("JOIN %s AS c on a.cow_source_id = c.id", new(model.ConfigCowSource).TableName())).
+		Joins(fmt.Sprintf("JOIN %s AS d on a.cow_type_id = d.id", new(model.ConfigCowType).TableName())).
+		Joins(fmt.Sprintf("JOIN %s AS e ON a.cow_kind_id = e.id", new(model.ConfigCowKind).TableName())).
+		Joins(fmt.Sprintf("JOIN %s AS f on a.pen_id = f.id", new(model.Pen).TableName()))
+	if req.CowId > 0 {
+		pref.Where("a.cow_id ?", req.CowId)
+	}
+
+	if err := pref.Order("a.id desc").
+		Count(&count).Limit(int(pagination.PageSize)).
+		Offset(int(pagination.PageOffset)).
+		Find(&eventEnterList).Error; err != nil {
+		return nil, xerr.WithStack(err)
+	}
+
+	return &pasturePb.SearchEnterEventResponse{
+		Code:    http.StatusOK,
+		Message: "ok",
+		Data: &pasturePb.SearchEnterEventData{
+			List:     eventEnterList,
+			Total:    int32(count),
+			PageSize: pagination.PageSize,
+			Page:     pagination.Page,
+		},
+	}, nil
+}
+
+func (s *StoreEntry) CreateEnterEvent(ctx context.Context, req *pasturePb.SearchEnterData) error {
+	zaplog.Info("CreateEnterEvent", zap.Any("req", req))
+	return nil
+}

module/backend/interface.go

@@ -44,6 +44,7 @@ type KptService interface {
 	SystemService        // 系统相关操作
 	PastureManageService // 牧场管理相关
 	ConfigDataService    // 配置数据相关
+	EventService         // 事件相关
 }
 
 //go:generate mockgen -destination mock/SystemService.go -package kptservicemock kpt-pasture/module/backend SystemService
@@ -108,6 +109,7 @@ type PastureManageService interface {
 //go:generate mockgen -destination mock/ConfigDataService.go -package kptservicemock kpt-pasture/module/backend ConfigDataService
 type ConfigDataService interface {
 	BarnTypeOptions(ctx context.Context) (*pasturePb.ConfigOptionsListResponse, error)
+	BarnListOptions(ctx context.Context) (*pasturePb.ConfigOptionsListResponse, error)
 	BreedStatusOptions(ctx context.Context) (*pasturePb.ConfigOptionsListResponse, error)
 	CowKindOptions(ctx context.Context) (*pasturePb.ConfigOptionsListResponse, error)
 	CowSourceOptions(ctx context.Context) (*pasturePb.ConfigOptionsListResponse, error)
@@ -115,3 +117,9 @@ type ConfigDataService interface {
 	CowTypeOptions(ctx context.Context) (*pasturePb.ConfigOptionsListResponse, error)
 	CowTransferPenReasonOptions(ctx context.Context) (*pasturePb.ConfigOptionsListResponse, error)
 }
+
+//go:generate mockgen -destination mock/EventService.go -package kptservicemock kpt-pasture/module/backend EventService
+type EventService interface {
+	EnterList(ctx context.Context, req *pasturePb.SearchEnterEventRequest, pagination *pasturePb.PaginationModel) (*pasturePb.SearchEnterEventResponse, error)
+	CreateEnterEvent(ctx context.Context, req *pasturePb.SearchEnterData) error
+}

module/backend/system_service.go

@@ -69,6 +69,19 @@ func (s *StoreEntry) Login(ctx context.Context, req *pasturePb.SearchUserRequest
 	}, nil
 }
 
+func (s *StoreEntry) GetSystemUserInfo(ctx context.Context, userId int64) (*model.SystemUser, error) {
+	systemUser := &model.SystemUser{
+		Id: userId,
+	}
+	if err := s.DB.First(systemUser).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, xerr.Custom("该用户不存在")
+		}
+		return nil, xerr.WithStack(err)
+	}
+	return systemUser, nil
+}
+
 // SearchSystemUserList 查询系统用户
 func (s *StoreEntry) SearchSystemUserList(ctx context.Context, req *pasturePb.SearchUserRequest, pagination *pasturePb.PaginationModel) (*pasturePb.SearchUserResponse, error) {
 	systemUserList := make([]*model.SystemUser, 0)
@@ -265,6 +278,25 @@ func (s *StoreEntry) GetCurrentUserName(ctx context.Context) (string, error) {
 	}
 }
 
+func (s *StoreEntry) GetCurrentSystemUser(ctx context.Context) (*model.SystemUser, error) {
+	// 解析token
+	userName, err := s.GetCurrentUserName(ctx)
+	if err != nil {
+		return nil, xerr.WithStack(err)
+	}
+	// 根据用户token获取用户数据
+	systemUser := &model.SystemUser{Name: userName}
+	if err = s.DB.Where("name = ?", userName).
+		Where("is_show = ? and is_delete = ?", pasturePb.IsShow_Ok, pasturePb.IsShow_Ok).
+		First(systemUser).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, xerr.Custom("该用户数据不存在")
+		}
+		return nil, xerr.WithStack(err)
+	}
+	return systemUser, nil
+}
+
 // GetSystemUserMenu 返回系统用户相关菜单权限
 func (s *StoreEntry) GetSystemUserMenu(ctx context.Context) (*pasturePb.SystemUserMenuTreeResponse, error) {
 	// 解析token