Merge branch 'feature/bug-list' of xuyiping/kpt-tmr-group into develop

config/app.develop.yaml

@@ -7,8 +7,10 @@ http_metrics_addr: ':23332'
 store:
   show_sql: true
   driver_name: mysql
-  kpt_tmr_group_rw: "root:123456@tcp(127.0.0.1:3306)/kpt_tmr_group?charset=utf8mb4&parseTime=true&loc=Local&allowNativePasswords=true&timeout=300s&readTimeout=300s&writeTimeout=300s"
-  kpt_tmr_group_migr: "root:123456@tcp(127.0.0.1:3306)/kpt_tmr_group?charset=utf8mb4&parseTime=true&loc=Local&allowNativePasswords=true&timeout=300s&readTimeout=300s&writeTimeout=300s"
+  #kpt_tmr_group_rw: "root:123456@tcp(127.0.0.1:3306)/kpt_tmr_group?charset=utf8mb4&parseTime=true&loc=Local&allowNativePasswords=true&timeout=300s&readTimeout=300s&writeTimeout=300s"
+  #kpt_tmr_group_migr: "root:123456@tcp(127.0.0.1:3306)/kpt_tmr_group?charset=utf8mb4&parseTime=true&loc=Local&allowNativePasswords=true&timeout=300s&readTimeout=300s&writeTimeout=300s"
+  kpt_tmr_group_rw: "root:123456@tcp(192.168.1.70:3306)/kpt_tmr_group?charset=utf8mb4&parseTime=true&loc=Local&allowNativePasswords=true&timeout=300s&readTimeout=300s&writeTimeout=300s"
+  kpt_tmr_group_migr: "root:123456@tcp(192.168.1.70:3306)/kpt_tmr_group?charset=utf8mb4&parseTime=true&loc=Local&allowNativePasswords=true&timeout=300s&readTimeout=300s&writeTimeout=300s"
 
 redis_setting:
   sso_cache:

http/handler/feed/feed_formula.go

@@ -283,6 +283,15 @@ func Usage(c *gin.Context) {
 		return
 	}
 
+	if err := valid.ValidateStruct(&req,
+		valid.Field(&req.FeedFormulaId, valid.Required, valid.Min(1)),
+		valid.Field(&req.StartTime, valid.Required),
+		valid.Field(&req.EndTime, valid.Required),
+	); err != nil {
+		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
+		return
+	}
+
 	if err := middleware.BackendOperation(c).OpsService.FeedFormulaUsage(c, req); err != nil {
 		apierr.ClassifiedAbort(c, err)
 		return

model/feed_formula.go

@@ -20,6 +20,7 @@ type FeedFormula struct {
 	Version            int64                                 `json:"version"`
 	PastureId          int64                                 `json:"pasture_id"`
 	PastureName        string                                `json:"pasture_name"`
+	PastureDataId      int64                                 `json:"pasture_data_id"`
 	IsShow             operationPb.IsShow_Kind               `json:"is_show"`
 	IsModify           operationPb.IsShow_Kind               `json:"is_modify"`
 	IsDelete           operationPb.IsShow_Kind               `json:"is_delete"`

model/pasture_data.go

@@ -89,31 +89,31 @@ type FeedFormulaData struct {
 }
 
 type FeedTemplate struct {
-	Id           int64   `xorm:"id"`
-	PastureId    int64   `xorm:"pastureid"`
-	TCode        string  `xorm:"tcode"`
-	TName        string  `xorm:"tname"`
-	TColor       string  `xorm:"tcolor"`
-	CCid         int64   `xorm:"ccid"`
-	CCName       string  `xorm:"ccname"`
-	FTType       string  `xorm:"fttype"`
-	FTTypeId     int32   `xorm:"fttypeid"`
-	Source       string  `xorm:"source"`
-	Remark       string  `xorm:"remark"`
-	Enable       int32   `xorm:"enable"`
-	Sort         int64   `xorm:"sort"`
-	Owner        string  `xorm:"owner"`
-	Weight       float64 `xorm:"weight"`
-	DryWeight    float64 `xorm:"dryweight"`
-	IsDelete     int32   `xorm:"isdelete"`
-	Version      int64   `xorm:"version"`
-	SaveTime     string  `xorm:"savetime"`
-	IsIssue      int32   `xorm:"isissue"`
-	IssueVersion int32   `xorm:"issueversion"`
-	IssueId      int64   `xorm:"issueid"`
-	Backup1      string  `xorm:"backup1"`
-	Backup2      string  `xorm:"backup2"`
-	IsModify     int32   `xorm:"is_modify"`
+	Id           int64   `json:"id"`
+	PastureId    int64   `json:"pasture_id"`
+	TCode        string  `json:"t_code"`
+	TName        string  `json:"t_name"`
+	TColor       string  `json:"t_color"`
+	CCid         int64   `json:"c_cid"`
+	CCName       string  `json:"cc_name"`
+	FTType       string  `json:"ft_type"`
+	FTTypeId     int32   `json:"ft_type_id"`
+	Source       string  `json:"source"`
+	Remark       string  `json:"remark"`
+	Enable       int32   `json:"enable"`
+	Sort         int64   `json:"sort"`
+	Owner        string  `json:"owner"`
+	Weight       float64 `json:"weight"`
+	DryWeight    float64 `json:"dry_weight"`
+	IsDelete     int32   `json:"is_delete"`
+	Version      int64   `json:"version"`
+	SaveTime     string  `json:"save_time"`
+	IsIssue      int32   `json:"is_issue"`
+	IssueVersion int32   `json:"issue_version"`
+	IssueId      int64   `json:"issue_id"`
+	Backup1      string  `json:"backup1"`
+	Backup2      string  `json:"backup2"`
+	IsModify     int32   `json:"is_modify"`
 }
 
 // MixedCategoryTmrNameParams tmr名称和混料类别

module/backend/pasture_sync_service.go

@@ -129,7 +129,7 @@ func (s *StoreEntry) FeedFormulaSyncData(ctx context.Context, req *operationPb.F
 		pageSize := 100
 		for i := 0; i <= total; i++ {
 			body := &model.FeedFormulaListRequest{
-				PastureId: req.PastureId,
+				PastureId: int32(groupPasture.PastureId),
 				Page:      int32(page),
 				PageSize:  int32(pageSize),
 			}
@@ -141,14 +141,12 @@ func (s *StoreEntry) FeedFormulaSyncData(ctx context.Context, req *operationPb.F
 			if response.Code != http.StatusOK {
 				return xerr.Customf("%s", response.Msg)
 			}
-			if response.Data.Total > 0 {
+			if response.Data.Total > 0 && response.Data.List != nil {
 				total = int(math.Ceil(float64(response.Data.Total) / float64(pageSize)))
 			}
-
 			if err = s.FeedFormulaInsert(ctx, groupPasture, response.Data.List); err != nil {
 				return xerr.WithStack(err)
 			}
-
 		}
 
 	}
@@ -172,6 +170,7 @@ func (s *StoreEntry) FeedFormulaInsert(ctx context.Context, groupPasture *model.
 			Version:            data.Version,
 			PastureId:          groupPasture.PastureId,
 			PastureName:        groupPasture.Name,
+			PastureDataId:      data.Id,
 			IsShow:             operationPb.IsShow_Kind(data.Enable),
 			IsModify:           operationPb.IsShow_Kind(data.IsModify),
 			IsDelete:           operationPb.IsShow_OK,