|
|
@@ -169,7 +169,11 @@ func (s *StoreEntry) NeckRingWarningHealthCowList(ctx context.Context, req *past
|
|
|
for _, cow := range cowList {
|
|
|
cowMap[cow.Id] = cow
|
|
|
}
|
|
|
+
|
|
|
+ // 获取牛的牛当前脖环数据
|
|
|
+
|
|
|
}
|
|
|
+
|
|
|
return &pasturePb.HealthWarningResponse{
|
|
|
Code: http.StatusOK,
|
|
|
Msg: "ok",
|
|
|
@@ -177,7 +181,12 @@ func (s *StoreEntry) NeckRingWarningHealthCowList(ctx context.Context, req *past
|
|
|
Total: int32(count),
|
|
|
Page: pagination.Page,
|
|
|
PageSize: pagination.PageSize,
|
|
|
- List: model.NeckRingHealthWarningSlice(neckWaringHealthList).ToPB(warningHealthLevelMap, cowMap, eventLogMap, healthStatusMap),
|
|
|
+ List: model.NeckRingHealthWarningSlice(neckWaringHealthList).ToPB(
|
|
|
+ warningHealthLevelMap,
|
|
|
+ cowMap,
|
|
|
+ eventLogMap,
|
|
|
+ healthStatusMap,
|
|
|
+ ),
|
|
|
},
|
|
|
}, nil
|
|
|
|
Yi