|
|
@@ -5,17 +5,20 @@ import (
|
|
|
"sort"
|
|
|
"tmr-watch/models"
|
|
|
"tmr-watch/module"
|
|
|
- "tmr-watch/pkg/logger/zaplog"
|
|
|
+
|
|
|
+ // "tmr-watch/pkg/logger/zaplog"
|
|
|
+
|
|
|
"tmr-watch/pkg/util"
|
|
|
|
|
|
operationPb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/operation"
|
|
|
+ "github.com/astaxie/beego/logs"
|
|
|
|
|
|
"go.uber.org/zap"
|
|
|
)
|
|
|
|
|
|
// DistributeFeedFormulaService 饲料配方下发牧场端
|
|
|
func DistributeFeedFormulaService(req *operationPb.DistributeDataRequest) error {
|
|
|
- zaplog.Info("DistributeFeedFormulaService", zap.Any("request", req))
|
|
|
+ logs.Info("DistributeFeedFormulaService", zap.Any("request", req))
|
|
|
feedTemplateList := make([]*models.FeedTemplate, 0)
|
|
|
for _, b := range req.FeedFormulaList {
|
|
|
feedTemplateList = append(feedTemplateList, models.NewFeedTemplateByGroup(int64(req.PastureId), b))
|
|
|
@@ -46,7 +49,7 @@ func FeedFormulaList(req *models.FeedListRequest) (*models.FeedFormulaData, erro
|
|
|
|
|
|
dataList, total, err := module.FeedTemplateList(req)
|
|
|
if err != nil {
|
|
|
- zaplog.Error("FeedFormulaList", zap.Any("dataList", dataList), zap.Any("err", err))
|
|
|
+ logs.Error("FeedFormulaList", zap.Any("dataList", dataList), zap.Any("err", err))
|
|
|
return nil, err
|
|
|
}
|
|
|
res.Total = int32(total)
|
|
|
@@ -65,7 +68,7 @@ func FeedList(req *models.FeedListRequest) (*models.FeedData, error) {
|
|
|
|
|
|
dataList, total, err := module.FeedList(req)
|
|
|
if err != nil {
|
|
|
- zaplog.Error("FeedList", zap.Any("dataList", dataList), zap.Any("err", err))
|
|
|
+ logs.Error("FeedList", zap.Any("dataList", dataList), zap.Any("err", err))
|
|
|
return nil, err
|
|
|
}
|
|
|
res.Total = int32(total)
|
|
|
@@ -84,7 +87,7 @@ func FeedTemplateDetailList(req *models.FeedListRequest) (*models.FeedDetailData
|
|
|
|
|
|
dataList, total, err := module.FeedTemplateDetailList(req)
|
|
|
if err != nil {
|
|
|
- zaplog.Error("FeedTemplateDetailList", zap.Any("dataList", dataList), zap.Any("err", err))
|
|
|
+ logs.Error("FeedTemplateDetailList", zap.Any("dataList", dataList), zap.Any("err", err))
|
|
|
return nil, err
|
|
|
}
|
|
|
res.Total = int32(total)
|
|
|
@@ -198,7 +201,7 @@ func ProcessAnalysisService(req *models.AnalysisAccuracyRequest) (*models.Proces
|
|
|
for _, v := range tmrList {
|
|
|
mixedProcessTimeList, err := module.MixedProcessTimeList(req.PastureId, v.Id)
|
|
|
if err != nil {
|
|
|
- zaplog.Error("ProcessAnalysisService", zap.Any("MixedProcessTimeList", err))
|
|
|
+ logs.Error("ProcessAnalysisService", zap.Any("MixedProcessTimeList", err))
|
|
|
} else {
|
|
|
tmrMixAllTime := 0
|
|
|
for _, t := range mixedProcessTimeList {
|
|
|
@@ -209,7 +212,7 @@ func ProcessAnalysisService(req *models.AnalysisAccuracyRequest) (*models.Proces
|
|
|
|
|
|
sprinkleProcessTimeList, err := module.SprinkleProcessTimeList(req.PastureId, v.Id)
|
|
|
if err != nil {
|
|
|
- zaplog.Error("ProcessAnalysisService", zap.Any("SprinkleProcessTimeList", err))
|
|
|
+ logs.Error("ProcessAnalysisService", zap.Any("SprinkleProcessTimeList", err))
|
|
|
} else {
|
|
|
tmrSprinkleAllTime := 0
|
|
|
for _, s := range sprinkleProcessTimeList {
|
