feed: 测试配方下发

conf/setting/setting.go

@@ -110,7 +110,7 @@ func Setup() {
 	} else {
 		CurrentPath = workDir
 	}
-
+	CurrentPath = "./"
 	appEnv = strings.ToLower(os.Getenv("APP_ENVIRONMENT"))
 	switch appEnv {
 	case "test":

http/handle/group/feed_formula.go

@@ -21,7 +21,9 @@ func DistributeFeedFormula(c *gin.Context) {
 
 	if len(req.Body) <= 0 {
 		appG.Response(http.StatusBadRequest, e.INVALID_PARAMS, nil)
+		return
 	}
+
 	if err := group.DistributeFeedFormulaService(&req); err != nil {
 		appG.Response(http.StatusBadRequest, e.ERROR_ADD_FAIL, nil)
 		return
@@ -42,6 +44,7 @@ func FeedFormulaIsModify(c *gin.Context) {
 
 	if req.PastureId <= 0 {
 		appG.Response(http.StatusBadRequest, e.INVALID_PARAMS, nil)
+		return
 	}
 
 	if err := group.FeedFormulaIsModifyService(&req); err != nil {

models/feed_templet.go

@@ -9,7 +9,7 @@ type FeedTemplate struct {
 	CCid         int64   `xorm:"ccid"`
 	CCName       string  `xorm:"ccname"`
 	FTType       string  `xorm:"fttype"`
-	FTTypeId     int32   `json:"fttypeid"`
+	FTTypeId     int32   `xorm:"fttypeid"`
 	Source       string  `xorm:"source"`
 	Remark       string  `xorm:"remark"`
 	Enable       int32   `xorm:"enable"`

module/group.go

@@ -2,6 +2,7 @@ package module
 
 import (
 	"errors"
+	"fmt"
 	"time"
 	"tmr-watch/http/handle/restful"
 	"tmr-watch/models"
@@ -14,7 +15,8 @@ const (
 
 // DistributeFeedFormula 集团饲料配方下发
 func DistributeFeedFormula(res []*models.FeedTemplate) error {
-	if _, err := restful.Engine.Insert(res); err != nil {
+	if _, err := restful.Engine.Table(new(models.FeedTemplate)).Insert(&res); err != nil {
+		fmt.Println("=========DistributeFeedFormula======", err, res)
 		return err
 	}
 	return nil

service/group/group.go

@@ -12,9 +12,13 @@ import (
 
 // DistributeFeedFormulaService 饲料配方下发牧场端
 func DistributeFeedFormulaService(req *models.PastureBodyRequest) error {
-	feedTemplateList := make([]*models.FeedTemplate, len(req.Body))
-	for i, b := range req.Body {
-		feedTemplateList[i] = &models.FeedTemplate{
+	if len(req.Body) <= 0 {
+		return nil
+	}
+
+	feedTemplateList := make([]*models.FeedTemplate, 0)
+	for _, b := range req.Body {
+		feedTemplateList = append(feedTemplateList, &models.FeedTemplate{
 			PastureId:    req.PastureId,
 			TCode:        b.EncodeNumber,
 			TName:        b.Name,
@@ -32,7 +36,7 @@ func DistributeFeedFormulaService(req *models.PastureBodyRequest) error {
 			IssueVersion: 0,
 			IssueId:      0,
 			IsModify:     b.IsModify,
-		}
+		})
 	}
 	return module.DistributeFeedFormula(feedTemplateList)
 }