group: 调整代码结构

module/backend/dashboard_service.go

@@ -4,16 +4,17 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	operationPb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/operation"
-	"gitee.com/xuyiping_admin/pkg/logger/zaplog"
-	"gitee.com/xuyiping_admin/pkg/tool"
-	"gitee.com/xuyiping_admin/pkg/xerr"
 	"kpt-tmr-group/model"
 	"net/http"
 	"sort"
 	"sync"
 	"time"
 
+	operationPb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/operation"
+	"gitee.com/xuyiping_admin/pkg/logger/zaplog"
+	"gitee.com/xuyiping_admin/pkg/tool"
+	"gitee.com/xuyiping_admin/pkg/xerr"
+
 	"go.uber.org/multierr"
 	"go.uber.org/zap"
 )
@@ -47,8 +48,7 @@ func (s *StoreEntry) PasturePrefAnalysisData(ctx context.Context, req *operation
 				StartDate:              req.StartDate,
 				EndDate:                req.EndDate,
 			}
-			_, err = s.PastureHttpClient(ctx, model.DashboardAccuracyUrl, int64(pId), body, response)
-			if err != nil {
+			if err = s.PastureHttpClient(ctx, model.DashboardAccuracyUrl, int64(pId), body, response); err != nil {
 				zaplog.Error("PasturePrefAnalysisData",
 					zap.String("url", model.DashboardAccuracyUrl),
 					zap.Any("pasture", groupPasture), zap.Any("body", body),
@@ -97,7 +97,7 @@ func (s *StoreEntry) PasturePrefExecTimeData(ctx context.Context, req *operation
 				StartDate:              req.StartDate,
 				EndDate:                req.EndDate,
 			}
-			if _, err = s.PastureHttpClient(ctx, model.DashboardExecTimeUrl, int64(pId), body, response); err != nil {
+			if err = s.PastureHttpClient(ctx, model.DashboardExecTimeUrl, int64(pId), body, response); err != nil {
 				zaplog.Error("PasturePrefExecTimeData",
 					zap.String("url", model.DashboardExecTimeUrl),
 					zap.Any("pasture", groupPasture), zap.Any("body", body),
@@ -146,7 +146,7 @@ func (s *StoreEntry) PastureSprinkleFeedTime(ctx context.Context, req *operation
 				StartDate:     req.StartDate,
 				EndDate:       req.EndDate,
 			}
-			if _, err = s.PastureHttpClient(ctx, model.DashboardSprinkleFeedTimeUrl, int64(pId), body, response); err != nil {
+			if err = s.PastureHttpClient(ctx, model.DashboardSprinkleFeedTimeUrl, int64(pId), body, response); err != nil {
 				muError = multierr.Append(muError, err)
 				zaplog.Error("PastureSprinkleFeedTime",
 					zap.String("url", model.DashboardSprinkleFeedTimeUrl),
@@ -590,7 +590,7 @@ func (s *StoreEntry) FeedMixedAndTmrName(ctx context.Context, req *operationPb.M
 		},
 	}
 	response := &model.PastureCommonResponse{Data: &model.PastureCommonData{}}
-	if _, err := s.PastureHttpClient(ctx, model.UrlDataByName, int64(req.PastureId), body, response); err != nil {
+	if err := s.PastureHttpClient(ctx, model.UrlDataByName, int64(req.PastureId), body, response); err != nil {
 		return nil, xerr.WithStack(err)
 	}
 	return response, nil

module/backend/feed_service.go

@@ -720,6 +720,10 @@ func (s *StoreEntry) DistributeFeedFormula(ctx context.Context, req *operationPb
 				}
 			}
 
+			if len(newDistributeFeedRequest) <= 0 {
+				return
+			}
+
 			// 过滤掉已经下发过配方
 			putDistributeFeedRequest := make([]*operationPb.DistributeFeedRequest, 0)
 			for _, v := range newDistributeFeedRequest {
@@ -728,9 +732,13 @@ func (s *StoreEntry) DistributeFeedFormula(ctx context.Context, req *operationPb
 				}
 			}
 
+			if len(putDistributeFeedRequest) <= 0 {
+				return
+			}
+
 			// 请求参数
 			request, response := &operationPb.DistributeDataRequest{
-				PastureId:       p.Id,
+				PastureId:       p.PastureId,
 				FeedFormulaList: newDistributeFeedRequest,
 			}, &model.PastureResponse{
 				Code: 0,
@@ -747,7 +755,7 @@ func (s *StoreEntry) DistributeFeedFormula(ctx context.Context, req *operationPb
 				}
 			}()
 
-			if _, err = s.PastureHttpClient(ctx, model.FeedFormulaDistributeUrl, int64(p.Id), request, response); err != nil {
+			if err = s.PastureHttpClient(ctx, model.FeedFormulaDistributeUrl, int64(p.Id), request, response); err != nil {
 				muError = multierr.Append(muError, err)
 				zaplog.Error("DistributeFeedFormula",
 					zap.Any("pasture", p),
@@ -800,7 +808,7 @@ func (s *StoreEntry) CancelDistributeFeedFormula(ctx context.Context, req *opera
 			}
 			response := &model.PastureResponse{}
 
-			if _, err = s.PastureHttpClient(ctx, model.FeedFormulaCancelDistributeUrl, int64(p.Id), request, response); err != nil {
+			if err = s.PastureHttpClient(ctx, model.FeedFormulaCancelDistributeUrl, int64(p.Id), request, response); err != nil {
 				zaplog.Error("DistributeFeedFormula",
 					zap.String("url", model.FeedFormulaCancelDistributeUrl),
 					zap.Any("pasture", p),
@@ -951,7 +959,7 @@ func (s *StoreEntry) FeedFormulaUsage(ctx context.Context, req *operationPb.Feed
 
 			req.PastureId = int32(groupDetail.PastureId)
 			response := &operationPb.PastureFeedFormulaUsageResponse{}
-			if _, err = s.PastureHttpClient(ctx, model.FeedUsageURl, groupDetail.Id, req, response); err != nil {
+			if err = s.PastureHttpClient(ctx, model.FeedUsageURl, groupDetail.Id, req, response); err != nil {
 				zaplog.Error("FeedFormulaUsage", zap.Any("PastureDetailById", err))
 				return
 			}
@@ -996,7 +1004,7 @@ func (s *StoreEntry) PastureFeedFormulaIsModify(ctx context.Context, feedFormula
 			FeedFormulaId: v.FeedFormulaId,
 			IsModify:      int32(isModify),
 		}
-		if _, err := s.PastureHttpClient(ctx, model.FeedFormulaIsModifyUrl, v.Id, request, response); err != nil {
+		if err := s.PastureHttpClient(ctx, model.FeedFormulaIsModifyUrl, v.Id, request, response); err != nil {
 			zaplog.Error("PastureFeedFormulaIsModify", zap.Any("request", request), zap.Any("err", err), zap.Any("response", response))
 			b, _ := json.Marshal(request)
 			res, _ := json.Marshal(response)
@@ -1138,7 +1146,7 @@ func (s *StoreEntry) UpdatePastureFeedDetailVersionLog(ctx context.Context, dist
 	}
 
 	zaplog.Info("UpdateFeedFormalVersion", zap.Any("body", body))
-	if _, err = s.PastureHttpClient(ctx, model.FeedFormulaVersionUpdateUrl, pastureId, body, response); err != nil {
+	if err = s.PastureHttpClient(ctx, model.FeedFormulaVersionUpdateUrl, pastureId, body, response); err != nil {
 		zaplog.Error("UpdateFeedFormalVersion-http",
 			zap.String("url", model.FeedFormulaVersionUpdateUrl),
 			zap.Any("pasture", groupPasture), zap.Any("body", body),

module/backend/pasture_service.go

@@ -5,16 +5,17 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	operationPb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/operation"
-	"gitee.com/xuyiping_admin/pkg/logger/zaplog"
-	"gitee.com/xuyiping_admin/pkg/tool"
-	"gitee.com/xuyiping_admin/pkg/xerr"
 	"io"
 	"kpt-tmr-group/model"
 	"net/http"
 	"strconv"
 	"sync"
 
+	operationPb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/operation"
+	"gitee.com/xuyiping_admin/pkg/logger/zaplog"
+	"gitee.com/xuyiping_admin/pkg/tool"
+	"gitee.com/xuyiping_admin/pkg/xerr"
+
 	"go.uber.org/zap"
 
 	"github.com/xuri/excelize/v2"
@@ -56,7 +57,7 @@ func (s *StoreEntry) PastureAccountDistribution(ctx context.Context, groupPastur
 		Address:     groupPasture.Address,
 	}
 	res := &model.PastureCommonResponse{}
-	if _, err := s.PastureHttpClient(ctx, model.PastureAccountDistributionURl, groupPasture.Id, body, res); err != nil {
+	if err := s.PastureHttpClient(ctx, model.PastureAccountDistributionURl, groupPasture.Id, body, res); err != nil {
 		zaplog.Error("AccountDistribution", zap.Any("url", model.PastureAccountDistributionURl), zap.Any("err", err), zap.Any("body", body), zap.Any("res", res))
 		return xerr.WithStack(err)
 	}
@@ -538,7 +539,7 @@ func (s *StoreEntry) CategoryDistribution(ctx context.Context, url string, req *
 			defer wg.Done()
 			res := &model.PastureCommonResponse{}
 			req.PastureId = int32(data.Id)
-			if _, err = s.PastureHttpClient(ctx, url, int64(data.Id), req, res); err != nil {
+			if err = s.PastureHttpClient(ctx, url, int64(data.Id), req, res); err != nil {
 				zaplog.Error("CategoryDistribution",
 					zap.Any("url", url),
 					zap.Any("err", err),
@@ -574,7 +575,7 @@ func (s *StoreEntry) CategoryDelete(ctx context.Context, url string, req *model.
 			defer wg.Done()
 			res := &model.PastureCommonResponse{}
 			req.PastureId = int32(data.Id)
-			if _, err = s.PastureHttpClient(ctx, url, int64(data.Id), req, res); err != nil {
+			if err = s.PastureHttpClient(ctx, url, int64(data.Id), req, res); err != nil {
 				zaplog.Error("CategoryDelete",
 					zap.Any("url", url),
 					zap.Any("err", err),
@@ -1135,7 +1136,7 @@ func (s *StoreEntry) SmallMaterial(ctx context.Context, req *operationPb.SmallMa
 		},
 	}
 	response := &model.PastureCommonResponse{Data: &model.PastureCommonData{}}
-	if _, err := s.PastureHttpClient(ctx, model.UrlDataByName, int64(req.PastureId), body, response); err != nil {
+	if err := s.PastureHttpClient(ctx, model.UrlDataByName, int64(req.PastureId), body, response); err != nil {
 		return nil, xerr.WithStack(err)
 	}
 	return response, nil

module/backend/pasture_sync_service.go

@@ -3,12 +3,13 @@ package backend
 import (
 	"context"
 	"errors"
-	operationPb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/operation"
-	"gitee.com/xuyiping_admin/pkg/xerr"
 	"kpt-tmr-group/model"
 	"math"
 	"net/http"
 
+	operationPb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/operation"
+	"gitee.com/xuyiping_admin/pkg/xerr"
+
 	"gorm.io/gorm"
 )
 
@@ -134,7 +135,7 @@ func (s *StoreEntry) FeedFormulaSyncData(ctx context.Context, req *operationPb.F
 				PageSize:  int32(pageSize),
 			}
 			response := &model.FeedFormulaListResponse{}
-			if _, err = s.PastureHttpClient(ctx, model.FeedFormulaAsyncUrl, int64(req.PastureId), body, response); err != nil {
+			if err = s.PastureHttpClient(ctx, model.FeedFormulaAsyncUrl, int64(req.PastureId), body, response); err != nil {
 				return xerr.WithStack(err)
 			}
 
@@ -216,7 +217,7 @@ func (s *StoreEntry) FeedSyncData(ctx context.Context, req *operationPb.FeedForm
 			PageSize:  req.PageSize,
 		}
 		response := &model.FeedListResponse{}
-		if _, err = s.PastureHttpClient(ctx, model.FeedAsyncUrl, int64(req.PastureId), body, response); err != nil {
+		if err = s.PastureHttpClient(ctx, model.FeedAsyncUrl, int64(req.PastureId), body, response); err != nil {
 			return xerr.WithStack(err)
 		}
 
@@ -278,7 +279,7 @@ func (s *StoreEntry) FeedFormulaDetailListSyncData(ctx context.Context, req *ope
 				PageSize:  int32(pageSize),
 			}
 			response := &model.FeedFormulaDetailListResponse{}
-			if _, err = s.PastureHttpClient(ctx, model.FeedFormulaDetailListAsyncUrl, int64(req.PastureId), body, response); err != nil {
+			if err = s.PastureHttpClient(ctx, model.FeedFormulaDetailListAsyncUrl, int64(req.PastureId), body, response); err != nil {
 				return xerr.WithStack(err)
 			}
 

module/backend/statistic_service.go

@@ -6,14 +6,15 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	operationPb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/operation"
-	"gitee.com/xuyiping_admin/pkg/logger/zaplog"
-	"gitee.com/xuyiping_admin/pkg/xerr"
 	"kpt-tmr-group/model"
 	"net/http"
 	"sort"
 	"sync"
 
+	operationPb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/operation"
+	"gitee.com/xuyiping_admin/pkg/logger/zaplog"
+	"gitee.com/xuyiping_admin/pkg/xerr"
+
 	"gorm.io/gorm"
 
 	"github.com/xuri/excelize/v2"
@@ -32,27 +33,27 @@ func (s *StoreEntry) PastureDetailById(ctx context.Context, pastureId int64) (*m
 	return result, nil
 }
 
-func (s *StoreEntry) PastureHttpClient(ctx context.Context, apiUrl string, pastureId int64, body, response interface{}) (*model.GroupPasture, error) {
+func (s *StoreEntry) PastureHttpClient(ctx context.Context, apiUrl string, pastureId int64, body, response interface{}) error {
 	pastureDetail, err := s.PastureDetailById(ctx, pastureId)
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, xerr.Customf("该牧场不存在")
+			return xerr.Customf("该牧场不存在")
 		}
 		zaplog.Error("PastureHttpClient", zap.Any("Err", err), zap.Int64("pastureId", pastureId))
-		return nil, xerr.Customf("该牧场数据错误,Err:%s", err)
+		return xerr.Customf("该牧场数据错误,Err:%s", err)
 	}
 	pastureClient := model.NewPastureClient(pastureDetail)
 	url := fmt.Sprintf("%s/%s", pastureDetail.Domain, apiUrl)
 	result, err := pastureClient.DoPost(url, body)
 	if err != nil {
-		return pastureDetail, xerr.WithStack(err)
+		return xerr.WithStack(err)
 	}
 
 	zaplog.Info("PastureHttpClient", zap.String("url", url), zap.Any("request", body), zap.String("response", string(result)))
 	if err = json.Unmarshal(result, response); err != nil {
-		return pastureDetail, xerr.WithStack(err)
+		return xerr.WithStack(err)
 	}
-	return pastureDetail, nil
+	return nil
 }
 
 // SearchFormulaEstimateList 配方评估
@@ -82,7 +83,7 @@ func (s *StoreEntry) SearchFormulaEstimateList(ctx context.Context, req *operati
 		},
 	}
 	response := &model.PastureCommonResponse{Data: &model.PastureCommonData{}}
-	if _, err = s.PastureHttpClient(ctx, model.UrlDataByName, int64(req.PastureId), body, response); err != nil {
+	if err = s.PastureHttpClient(ctx, model.UrlDataByName, int64(req.PastureId), body, response); err != nil {
 		return nil, xerr.WithStack(err)
 	}
 	return response, nil
@@ -117,7 +118,7 @@ func (s *StoreEntry) SearchInventoryStatistics(ctx context.Context, req *operati
 			List: make([]*model.InventoryStatisticsList, 0),
 		},
 	}
-	if _, err := s.PastureHttpClient(ctx, model.UrlDataByName, int64(req.PastureId), body, response); err != nil {
+	if err = s.PastureHttpClient(ctx, model.UrlDataByName, int64(req.PastureId), body, response); err != nil {
 		return nil, xerr.WithStack(err)
 	}
 	return response, nil
@@ -239,7 +240,7 @@ func (s *StoreEntry) SearchUserMaterialsStatistics(ctx context.Context, req *ope
 	response := &model.PastureCommonResponse{Data: &model.PastureCommonData{
 		List: &model.UserMaterialsList{},
 	}}
-	if _, err = s.PastureHttpClient(ctx, model.UrlReportForm, int64(req.PastureId), body, response); err != nil {
+	if err = s.PastureHttpClient(ctx, model.UrlReportForm, int64(req.PastureId), body, response); err != nil {
 		return nil, xerr.WithStack(err)
 	}
 	return response, nil
@@ -349,7 +350,7 @@ func (s *StoreEntry) SearchPriceStatistics(ctx context.Context, req *operationPb
 		},
 	}
 	response := &model.PastureCommonResponse{Data: &model.PastureCommonData{}}
-	if _, err = s.PastureHttpClient(ctx, model.UrlReportForm, int64(req.PastureId), body, response); err != nil {
+	if err = s.PastureHttpClient(ctx, model.UrlReportForm, int64(req.PastureId), body, response); err != nil {
 		return nil, xerr.WithStack(err)
 	}
 	return response, nil
@@ -406,7 +407,7 @@ func (s *StoreEntry) SearchFeedStatistics(ctx context.Context, req *operationPb.
 				Data: &model.PastureCommonData{},
 			}
 
-			if _, err = s.PastureHttpClient(ctx, model.UrlDataByName, int64(pastureId), body, response); err != nil {
+			if err = s.PastureHttpClient(ctx, model.UrlDataByName, int64(pastureId), body, response); err != nil {
 				zaplog.Error("SearchFeedStatistics",
 					zap.Any("pastureId", pastureId),
 					zap.Any("url", model.UrlDataByName),
@@ -525,7 +526,7 @@ func (s *StoreEntry) FeedChartStatistics(ctx context.Context, req *operationPb.F
 		return nil, xerr.Customf("错误的接口类型:%s", req.ApiType)
 	}
 	response := &model.PastureCommonResponse{Data: &model.PastureCommonData{}}
-	if _, err = s.PastureHttpClient(ctx, url, int64(req.PastureId), body, response); err != nil {
+	if err = s.PastureHttpClient(ctx, url, int64(req.PastureId), body, response); err != nil {
 		return nil, xerr.WithStack(err)
 	}
 	return response, nil
@@ -555,7 +556,7 @@ func (s *StoreEntry) CowsAnalysis(ctx context.Context, req *operationPb.CowsAnal
 		},
 	}
 	response := &model.PastureCommonResponse{Data: &model.PastureCommonData{}}
-	if _, err = s.PastureHttpClient(ctx, model.UrlDataByName, int64(req.PastureId), body, response); err != nil {
+	if err = s.PastureHttpClient(ctx, model.UrlDataByName, int64(req.PastureId), body, response); err != nil {
 		return nil, xerr.WithStack(err)
 	}
 	return response, nil
@@ -577,7 +578,7 @@ func (s *StoreEntry) SearchAccuracyAggStatistics(ctx context.Context, req *opera
 	}
 
 	response := &model.PastureCommonResponse{Data: &model.PastureCommonData{}}
-	if _, err = s.PastureHttpClient(ctx, model.UrlSummary, int64(req.PastureId), body, response); err != nil {
+	if err = s.PastureHttpClient(ctx, model.UrlSummary, int64(req.PastureId), body, response); err != nil {
 		return nil, xerr.WithStack(err)
 	}
 	return response, nil
@@ -603,7 +604,7 @@ func (s *StoreEntry) SearchMixFeedStatistics(ctx context.Context, req *operation
 		ParamMaps:  model.NewMixFeedStatisticsParams(int64(pastureId), req),
 	}
 	response := &model.PastureCommonResponse{Data: &model.PastureCommonData{}}
-	if _, err = s.PastureHttpClient(ctx, model.UrlDataByName, int64(req.PastureId), body, response); err != nil {
+	if err = s.PastureHttpClient(ctx, model.UrlDataByName, int64(req.PastureId), body, response); err != nil {
 		return nil, xerr.WithStack(err)
 	}
 	return response, nil
@@ -629,7 +630,7 @@ func (s *StoreEntry) SearchSprinkleStatistics(ctx context.Context, req *operatio
 		ParamMaps:  model.NewSprinkleStatisticsParams(int64(pastureId), req),
 	}
 	response := &model.PastureCommonResponse{Data: &model.PastureCommonData{}}
-	if _, err := s.PastureHttpClient(ctx, model.UrlDataByName, int64(req.PastureId), body, response); err != nil {
+	if err = s.PastureHttpClient(ctx, model.UrlDataByName, int64(req.PastureId), body, response); err != nil {
 		return nil, xerr.WithStack(err)
 	}
 	return response, nil
@@ -655,7 +656,7 @@ func (s *StoreEntry) SearchProcessAnalysis(ctx context.Context, req *operationPb
 		ParamMaps:  model.NewProcessAnalysisParams(int64(pastureId), req),
 	}
 	response := &model.PastureCommonResponse{Data: &model.PastureCommonData{}}
-	if _, err = s.PastureHttpClient(ctx, model.UrlProcess, int64(req.PastureId), body, response); err != nil {
+	if err = s.PastureHttpClient(ctx, model.UrlProcess, int64(req.PastureId), body, response); err != nil {
 		return nil, xerr.WithStack(err)
 	}
 
@@ -688,7 +689,7 @@ func (s *StoreEntry) AnalysisMixedSprinkleDetail(ctx context.Context, req *opera
 	if req.ApiName == "getprocessAnalysisTB" {
 		apiURl = model.UrlReportForm
 	}
-	if _, err = s.PastureHttpClient(ctx, apiURl, int64(req.PastureId), body, response); err != nil {
+	if err = s.PastureHttpClient(ctx, apiURl, int64(req.PastureId), body, response); err != nil {
 		return nil, xerr.WithStack(err)
 	}
 	return response, nil
@@ -714,7 +715,7 @@ func (s *StoreEntry) GetDataByName(ctx context.Context, req *operationPb.GetData
 		},
 	}
 	response := &model.PastureCommonResponse{Data: &model.PastureCommonData{}}
-	if _, err = s.PastureHttpClient(ctx, model.UrlDataByName, int64(req.PastureId), body, response); err != nil {
+	if err = s.PastureHttpClient(ctx, model.UrlDataByName, int64(req.PastureId), body, response); err != nil {
 		return nil, xerr.WithStack(err)
 	}
 	return response, nil
@@ -743,7 +744,7 @@ func (s *StoreEntry) GetTrainNumber(ctx context.Context, req *operationPb.TrainN
 		},
 	}
 	response := &model.PastureCommonResponse{Data: &model.PastureCommonData{}}
-	if _, err := s.PastureHttpClient(ctx, model.UrlDataByName, int64(req.PastureId), body, response); err != nil {
+	if err = s.PastureHttpClient(ctx, model.UrlDataByName, int64(req.PastureId), body, response); err != nil {
 		return nil, xerr.WithStack(err)
 	}