pasture: 栏舍分类相关接口

go.mod

@@ -3,7 +3,7 @@ module kpt-pasture
 go 1.17
 
 require (
-	gitee.com/xuyiping_admin/go_proto v0.0.0-20240426071708-b9b3ad7038bd
+	gitee.com/xuyiping_admin/go_proto v0.0.0-20240428015639-7a6e0cd54b97
 	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

@@ -62,6 +62,8 @@ gitee.com/xuyiping_admin/go_proto v0.0.0-20240426060603-a68c0321fda3 h1:CpeOukiJ
 gitee.com/xuyiping_admin/go_proto v0.0.0-20240426060603-a68c0321fda3/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20240426071708-b9b3ad7038bd h1:t/CNbQqjhxWVw53ZQz/4GV1e0eLw7eEmQhGCsIT1p9k=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20240426071708-b9b3ad7038bd/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20240428015639-7a6e0cd54b97 h1:J7A5DbtzqOJ77FlRXMDsHfWYQtFpllNIfSMsKaSPKHs=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20240428015639-7a6e0cd54b97/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

@@ -8,8 +8,8 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-func BarnTypeList(c *gin.Context) {
-	res, err := middleware.Dependency(c).StoreEventHub.OpsService.BarnTypeList(c)
+func BarnTypeOptions(c *gin.Context) {
+	res, err := middleware.Dependency(c).StoreEventHub.OpsService.BarnTypeOptions(c)
 	if err != nil {
 		apierr.ClassifiedAbort(c, err)
 		return

http/handler/pasture/barn.go

@@ -14,7 +14,7 @@ import (
 )
 
 func SearchBarnList(c *gin.Context) {
-	var req pasturePb.SearchBarnRequest
+	var req pasturePb.SearchNameRequest
 	if err := ginutil.BindProto(c, &req); err != nil {
 		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
 		return
@@ -63,3 +63,51 @@ func CreatedOrUpdateBarn(c *gin.Context) {
 		Data: &operationPb.Success{Success: true},
 	})
 }
+
+func SearchBarnTypeList(c *gin.Context) {
+	var req pasturePb.SearchNameRequest
+	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.SearchBarnTypeList(c, &req, pagination)
+	if err != nil {
+		apierr.ClassifiedAbort(c, err)
+		return
+	}
+	ginutil.JSONResp(c, res)
+}
+
+// CreatedOrUpdateBarnType 添加或者更新栏舍类型
+func CreatedOrUpdateBarnType(c *gin.Context) {
+	var req pasturePb.SearchBaseConfigList
+	if err := ginutil.BindProto(c, &req); err != nil {
+		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
+		return
+	}
+
+	if err := valid.ValidateStruct(&req,
+		valid.Field(&req.Name, valid.Required),
+	); err != nil {
+		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
+		return
+	}
+
+	if err := middleware.BackendOperation(c).OpsService.CreateOrUpdateBarnType(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/route/config_api.go

@@ -13,6 +13,6 @@ func ConfigAPI(opts ...func(engine *gin.Engine)) func(s *gin.Engine) {
 		}
 		// pasture API 组  牧场管理
 		pastureRoute := authRouteGroup(s, "/api/v1/config/")
-		pastureRoute.GET("/barn/type/list", config.BarnTypeList)
+		pastureRoute.GET("/barn/type/options", config.BarnTypeOptions)
 	}
 }

http/route/pasture_api.go

@@ -15,5 +15,7 @@ func PastureManageAPI(opts ...func(engine *gin.Engine)) func(s *gin.Engine) {
 		pastureRoute := authRouteGroup(s, "/api/v1/pasture/")
 		pastureRoute.POST("/barn/list", pasture.SearchBarnList)
 		pastureRoute.POST("/barn/createOrUpdate", pasture.CreatedOrUpdateBarn)
+		pastureRoute.POST("/barn/type/list", pasture.SearchBarnTypeList)
+		pastureRoute.POST("/barn/type/createOrUpdate", pasture.CreatedOrUpdateBarnType)
 	}
 }

model/config_barn_type.go

@@ -30,3 +30,18 @@ func (c ConfigBarnTypeSlice) ToPB() []*pasturePb.BarnTypeList {
 	}
 	return res
 }
+
+func (c ConfigBarnTypeSlice) ToPB2() []*pasturePb.SearchBaseConfigList {
+	res := make([]*pasturePb.SearchBaseConfigList, len(c))
+	for i, d := range c {
+		res[i] = &pasturePb.SearchBaseConfigList{
+			Id:        d.Id,
+			Name:      d.Name,
+			Remarks:   d.Remarks,
+			IsShow:    d.IsShow,
+			CreatedAt: int32(d.CreatedAt),
+			UpdatedAt: int32(d.UpdatedAt),
+		}
+	}
+	return res
+}

module/backend/config_data.go

@@ -8,7 +8,7 @@ import (
 	pasturePb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/cow"
 )
 
-func (s *StoreEntry) BarnTypeList(ctx context.Context) (*pasturePb.BarnTypeListResponse, error) {
+func (s *StoreEntry) BarnTypeOptions(ctx context.Context) (*pasturePb.BarnTypeListResponse, error) {
 	configBarnTypeList := make([]*model.ConfigBarnType, 0)
 
 	if err := s.DB.Table(new(model.ConfigBarnType).TableName()).Find(&configBarnTypeList).Error; err != nil {

module/backend/interface.go

@@ -86,11 +86,13 @@ type SystemService interface {
 
 //go:generate mockgen -destination mock/PastureManageService.go -package kptservicemock kpt-pasture/module/backend PastureManageService
 type PastureManageService interface {
-	SearchBarnList(ctx context.Context, req *pasturePb.SearchBarnRequest, pagination *pasturePb.PaginationModel) (*pasturePb.SearchBarnResponse, error)
+	SearchBarnList(ctx context.Context, req *pasturePb.SearchNameRequest, pagination *pasturePb.PaginationModel) (*pasturePb.SearchBarnResponse, error)
 	CreateOrUpdateBarn(ctx context.Context, req *pasturePb.SearchBarnList) error
+	SearchBarnTypeList(ctx context.Context, req *pasturePb.SearchNameRequest, pagination *pasturePb.PaginationModel) (*pasturePb.SearchBaseConfigResponse, error)
+	CreateOrUpdateBarnType(ctx context.Context, req *pasturePb.SearchBaseConfigList) error
 }
 
 //go:generate mockgen -destination mock/ConfigDataService.go -package kptservicemock kpt-pasture/module/backend ConfigDataService
 type ConfigDataService interface {
-	BarnTypeList(ctx context.Context) (*pasturePb.BarnTypeListResponse, error)
+	BarnTypeOptions(ctx context.Context) (*pasturePb.BarnTypeListResponse, error)
 }

module/backend/pasture_manage.go

@@ -13,7 +13,7 @@ import (
 	pasturePb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/cow"
 )
 
-func (s *StoreEntry) SearchBarnList(ctx context.Context, req *pasturePb.SearchBarnRequest, pagination *pasturePb.PaginationModel) (*pasturePb.SearchBarnResponse, error) {
+func (s *StoreEntry) SearchBarnList(ctx context.Context, req *pasturePb.SearchNameRequest, pagination *pasturePb.PaginationModel) (*pasturePb.SearchBarnResponse, error) {
 	barnList := make([]*model.Bran, 0)
 	var count int64 = 0
 
@@ -72,3 +72,51 @@ func (s *StoreEntry) CreateOrUpdateBarn(ctx context.Context, req *pasturePb.Sear
 	}
 	return nil
 }
+
+func (s *StoreEntry) SearchBarnTypeList(ctx context.Context, req *pasturePb.SearchNameRequest, pagination *pasturePb.PaginationModel) (*pasturePb.SearchBaseConfigResponse, error) {
+	barnTypeList := make([]*model.ConfigBarnType, 0)
+	var count int64 = 0
+
+	pref := s.DB.Model(new(model.ConfigBarnType))
+	if req.Name != "" {
+		pref.Where("name like ?", fmt.Sprintf("%s%s%s", "%", req.Name, "%"))
+	}
+
+	if err := pref.Order("id desc").Count(&count).Limit(int(pagination.PageSize)).Offset(int(pagination.PageOffset)).
+		Find(&barnTypeList).Debug().Error; err != nil {
+		return nil, xerr.WithStack(err)
+	}
+
+	return &pasturePb.SearchBaseConfigResponse{
+		Code:    http.StatusOK,
+		Message: "ok",
+		Data: &pasturePb.SearchBaseConfigData{
+			List:     model.ConfigBarnTypeSlice(barnTypeList).ToPB2(),
+			Total:    int32(count),
+			PageSize: pagination.PageSize,
+			Page:     pagination.Page,
+		},
+	}, nil
+}
+
+func (s *StoreEntry) CreateOrUpdateBarnType(ctx context.Context, req *pasturePb.SearchBaseConfigList) error {
+	if req.Id > 0 {
+		barn := &model.ConfigBarnType{Id: req.Id}
+		if err := s.DB.Model(&model.ConfigBarnType{}).First(barn).Error; err != nil {
+			if !errors.Is(err, gorm.ErrRecordNotFound) {
+				return xerr.WithStack(err)
+			}
+		}
+	}
+
+	if err := s.DB.Model(&model.ConfigBarnType{}).Where(map[string]interface{}{
+		"id": req.Id,
+	}).Assign(map[string]interface{}{
+		"name":    req.Name,
+		"remarks": req.Remarks,
+		"is_show": pasturePb.IsShow_Ok,
+	}).FirstOrCreate(&model.ConfigBarnType{}).Error; err != nil {
+		return xerr.WithStack(err)
+	}
+	return nil
+}