feed_template: 饲料配方最新版本

go.mod

@@ -3,7 +3,7 @@ module tmr-watch
 go 1.17
 
 require (
-	gitee.com/xuyiping_admin/go_proto v0.0.0-20231018084013-d0e29bb3008f
+	gitee.com/xuyiping_admin/go_proto v0.0.0-20231020013852-ef9fae121231
 	gitee.com/xuyiping_admin/pkg v0.0.0-20230816061144-c1f079802584
 	github.com/360EntSecGroup-Skylar/excelize v1.4.1
 	github.com/Anderson-Lu/gofasion v0.0.0-20190530065914-6a05b679ee48

go.sum

@@ -11,6 +11,8 @@ gitee.com/xuyiping_admin/go_proto v0.0.0-20231018071345-6ac61c4e4fd2 h1:wwzYo7Wb
 gitee.com/xuyiping_admin/go_proto v0.0.0-20231018071345-6ac61c4e4fd2/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20231018084013-d0e29bb3008f h1:Nk4irm5KOfOnO1KT21/1elo3VtKNZnFGh0/4tf96cNg=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20231018084013-d0e29bb3008f/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20231020013852-ef9fae121231 h1:4GeaRjSIwoUaW0iIaceCr+6QXUHI958qkDlosYM91Pw=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20231020013852-ef9fae121231/go.mod h1:x47UOU+lOkZnrtAENAsOGd7mZ5I8D2JRkMKMqLLRlVw=
 gitee.com/xuyiping_admin/pkg v0.0.0-20230816061144-c1f079802584 h1:5RE5yrMMvnDITrnoX821mFl7dNYfsFA1osDobUV/TDo=
 gitee.com/xuyiping_admin/pkg v0.0.0-20230816061144-c1f079802584/go.mod h1:VQ7WztVDQRlXE1dUu/Yqo3ZdhKsfv7IGJtV+vqNqJVw=
 github.com/360EntSecGroup-Skylar/excelize v1.4.1 h1:l55mJb6rkkaUzOpSsgEeKYtS6/0gHwBYyfo5Jcjv/Ks=

http/handle/api/new_api.go

@@ -7,7 +7,6 @@ import (
 	"tmr-watch/service/group"
 
 	operationPb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/operation"
-
 	feedPb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/pasture"
 	"gitee.com/xuyiping_admin/pkg/apierr"
 	"gitee.com/xuyiping_admin/pkg/ginutil"
@@ -23,11 +22,6 @@ func SearchFeetTemplateList(c *gin.Context) {
 		return
 	}
 
-	if err := valid.ValidateStruct(&req); err != nil {
-		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
-		return
-	}
-
 	req.Pagination = &feedPb.PaginationModel{
 		Page:       int32(c.GetInt(middleware.Page)),
 		PageSize:   int32(c.GetInt(middleware.PageSize)),
@@ -44,15 +38,22 @@ func SearchFeetTemplateList(c *gin.Context) {
 
 // GetFeetTemplateVersion 获取配方最新版本详情
 func GetFeetTemplateVersion(c *gin.Context) {
-	feetTemplateIdStr := c.Param("feet_template_id")
-	feetTemplateId, _ := strconv.Atoi(feetTemplateIdStr)
+	var req feedPb.FeetTemplateVersionRequest
+	if err := ginutil.BindProto(c, &req); err != nil {
+		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
+		return
+	}
 
-	if err := valid.Validate(feetTemplateId, valid.Required, valid.Min(1)); err != nil {
+	if err := valid.ValidateStruct(&req,
+		valid.Field(&req.FeetTemplateId, valid.Required, valid.Length(1, 100)),
+		valid.Field(&req.PastureId, valid.Required, valid.Min(1)),
+	); err != nil {
 		apierr.ClassifiedAbort(c, err)
 		return
 	}
 
-	list, err := group.GetFeetTemplateVersion(c, c.GetInt(middleware.PastureId), feetTemplateId)
+	feetTemplateId, _ := strconv.Atoi(req.GetFeetTemplateId())
+	list, err := group.GetFeetTemplateVersion(c, int(req.GetPastureId()), feetTemplateId)
 	if err != nil {
 		apierr.ClassifiedAbort(c, err)
 		return
@@ -62,15 +63,22 @@ func GetFeetTemplateVersion(c *gin.Context) {
 
 // FeetTemplateUpgradeNewVersion 配方更新至最新版本
 func FeetTemplateUpgradeNewVersion(c *gin.Context) {
-	feetTemplateIdStr := c.Param("feet_template_id")
-	feetTemplateId, _ := strconv.Atoi(feetTemplateIdStr)
+	var req feedPb.FeetTemplateVersionRequest
+	if err := ginutil.BindProto(c, &req); err != nil {
+		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
+		return
+	}
 
-	if err := valid.Validate(feetTemplateId, valid.Required, valid.Min(1)); err != nil {
+	if err := valid.ValidateStruct(&req,
+		valid.Field(&req.FeetTemplateId, valid.Required, valid.Length(1, 100)),
+		valid.Field(&req.PastureId, valid.Required, valid.Min(1)),
+	); err != nil {
 		apierr.ClassifiedAbort(c, err)
 		return
 	}
 
-	if err := group.FeetTemplateUpgradeNewVersion(c, c.GetInt(middleware.PastureId), feetTemplateId); err != nil {
+	feetTemplateId, _ := strconv.Atoi(req.GetFeetTemplateId())
+	if err := group.FeetTemplateUpgradeNewVersion(c, int(req.GetPastureId()), feetTemplateId); err != nil {
 		apierr.ClassifiedAbort(c, err)
 		return
 	}