event: update

go.mod

@@ -3,7 +3,7 @@ module kpt-pasture
 go 1.17
 
 require (
-	gitee.com/xuyiping_admin/go_proto v0.0.0-20250306060531-dfa1b97a964b
+	gitee.com/xuyiping_admin/go_proto v0.0.0-20250309141840-4e483354df00
 	gitee.com/xuyiping_admin/pkg v0.0.0-20241108060137-caea58c59f5b
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/eclipse/paho.mqtt.golang v1.4.3

go.sum

@@ -36,16 +36,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250305125910-0c6e47c2e274 h1:zbGuv1f9ZimRe8ViLJc16Pdvow7OV03itkuo7p/LDzM=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250305125910-0c6e47c2e274/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250306013635-4cf08c9620eb h1:Py16cQzWd5G1m86qGUd/xAjI9f3pshaQv8QwacNiHe4=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250306013635-4cf08c9620eb/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250306025059-d5af4673e2ff h1:hpjGfL/IH3p+hArgoZBvS8K221zxLCmUexicN/me6Rc=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250306025059-d5af4673e2ff/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250306030727-9cd4d60bdaa7 h1:s3qKKeNDVEKzUP8UjYyl46awP0JUj8vv5hEVHpy19hM=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250306030727-9cd4d60bdaa7/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250306060531-dfa1b97a964b h1:KBCoYhktN5Hm2aeYudrU1Qgq3g4GrI7Dnng/aoy+pR0=
-gitee.com/xuyiping_admin/go_proto v0.0.0-20250306060531-dfa1b97a964b/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20250309141840-4e483354df00 h1:ejRZ6U1vTFjo1VzcHpnraCrqZ6IhkqxM7iMgof2jE90=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20250309141840-4e483354df00/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
 gitee.com/xuyiping_admin/pkg v0.0.0-20241108060137-caea58c59f5b h1:w05MxH7yqveRlaRbxHhbif5YjPrJFodRPfOjYhXn7Zk=
 gitee.com/xuyiping_admin/pkg v0.0.0-20241108060137-caea58c59f5b/go.mod h1:8tF25X6pE9WkFCczlNAC0K2mrjwKvhhp02I7o0HtDxY=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -180,7 +172,6 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
@@ -618,7 +609,6 @@ go.uber.org/dig v1.15.0/go.mod h1:pKHs0wMynzL6brANhB2hLMro+zalv1osARTviTcqHLM=
 go.uber.org/goleak v0.10.0/go.mod h1:VCZuO8V8mFPlL0F5J5GK1rtHV3DrFcQ1R8ryq7FK0aI=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
-go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=

model/neck_ring_original.go

@@ -94,6 +94,9 @@ type NeckRingOriginalMerge struct {
 }
 
 func (n *NeckRingOriginalMerge) IsMageData(data *NeckRingOriginal, xframeId int32) {
+	if n.RecordCount == 6 {
+		return
+	}
 	avgParam := int32(1)
 	if n.ActiveDateType == pasturePb.ActiveTimeType_Two_Hours {
 		n.RecordCount = AvgHours

module/backend/event_base.go

@@ -54,6 +54,10 @@ func (s *StoreEntry) EnterList(ctx context.Context, req *pasturePb.SearchEventRe
 		pref.Where("ear_number = ?", req.EarNumber)
 	}
 
+	if req.StartDayAt > 0 && req.EndDayAt > 0 && req.EndDayAt >= req.StartDayAt {
+		pref.Where("enter_at BETWEEN ? AND ?", req.StartDayAt, req.EndDayAt)
+	}
+
 	if err = pref.Order("id desc").
 		Count(&count).Limit(int(pagination.PageSize)).
 		Offset(int(pagination.PageOffset)).

module/crontab/model.go

@@ -1,20 +1,5 @@
 package crontab
 
-/*
-	type XToday struct {
-		XBegDate       string
-		XEndDate       string
-		LastMaxHabitId int64
-		CurrMaxHabitId int64
-		XMin2Id        int64
-		XMin7Id        int64
-		ActiveLowest   int64
-		RuminaLowest   int64
-		ActiveLow      int64
-		ActiveMiddle   int64
-		ActiveHigh     int64
-	}
-*/
 type WeekHabit struct {
 	NeckRingNumber    string
 	WeekHighHabit     int32
@@ -25,18 +10,6 @@ type WeekHabit struct {
 	WeekOtherHabit    int32
 }
 
-/*
-	type SumHabit struct {
-		NeckRingNumber string
-		SumRumina      int32
-		SumIntake      int32
-		SumInactive    int32
-		SumActive      int32
-		SumMaxHigh     int32
-		SumMinHigh     int32
-		SumMinChew     int32
-	}
-*/
 type ActivityVolume struct {
 	NeckRingNumber string
 	AvgFilter      float64

module/crontab/neck_ring_estus_test.go

@@ -1,7 +1,11 @@
 package crontab
 
 import (
+	"encoding/json"
+	"fmt"
 	"kpt-pasture/model"
+	"kpt-pasture/util"
+	"sort"
 	"testing"
 	"time"
 )
@@ -3237,3 +3241,2858 @@ func TestCalculateCFT(t *testing.T) {
 	activeTimeParse, _ := time.Parse(model.LayoutTime, "2025-03-04 01:00:00")
 	println(activeTimeParse.Format(model.LayoutTime))
 }
+
+func recalculate(neckRingList []*model.NeckRingOriginal) []*model.NeckActiveHabit {
+	originalMapData := make(map[string]*model.NeckRingOriginalMerge)
+	// 合并成2个小时的
+	for _, v := range neckRingList {
+		xframeId := util.XFrameId(v.Frameid)
+		mapKey := fmt.Sprintf("%s%s%s%s%d", v.NeckRingNumber, model.JoinKey, v.ActiveDate, model.JoinKey, xframeId) // 0001/2023-12-04/0 0001/2023-12-03/4
+		if originalMapData[mapKey] == nil {
+			originalMapData[mapKey] = new(model.NeckRingOriginalMerge)
+		}
+		originalMapData[mapKey].IsMageData(v, xframeId)
+	}
+
+	currTime := time.Now()
+	res := make([]*model.NeckActiveHabit, 0)
+	// 算平均值
+	for k, v := range originalMapData {
+		// 过滤掉合并后不等于6条数据
+		if v.RecordCount > model.DefaultRecordCount {
+			delete(originalMapData, k)
+			continue
+		} else if v.RecordCount < model.DefaultRecordCount {
+			currMaxXframeId := util.FrameIdMapReverse[int32(currTime.Hour())]
+			activeDateString := fmt.Sprintf("%s %02d:00:00", v.ActiveDate, v.XframeId*2+1)
+			activeDate, _ := time.Parse(model.LayoutTime, activeDateString)
+			if currMaxXframeId-v.XframeId <= 1 && currTime.Add(-1*time.Hour).Unix() < activeDate.Unix() {
+				delete(originalMapData, k)
+				continue
+			}
+		}
+		v.SumAvg()
+	}
+
+	if len(originalMapData) <= 0 {
+		return res
+	}
+	res = model.NeckRingOriginalMap(originalMapData).ForMatData()
+	sort.Sort(model.NeckActiveHabitSlice(res))
+	return res
+}
+
+func TestRecalculate(t *testing.T) {
+	str := `[
+    {
+        "id": 39746398,
+        "pastureId": 1,
+        "uuid": "321434420250303101",
+        "neckRingNumber": "3214344",
+        "activeDate": "2025-03-03",
+        "hours": 20,
+        "frameid": 101,
+        "rumina": 0,
+        "intake": 18,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 669,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 59,
+        "voltage": 297,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190705",
+        "receiveNumber": "869701075190705",
+        "createdAt": 1741074907,
+        "updatedAt": 1741074907
+    },
+    {
+        "id": 39746815,
+        "pastureId": 1,
+        "uuid": "321434420250303102",
+        "neckRingNumber": "3214344",
+        "activeDate": "2025-03-03",
+        "hours": 20,
+        "frameid": 102,
+        "rumina": 0,
+        "intake": 16,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 710,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 58,
+        "voltage": 297,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190705",
+        "receiveNumber": "869701075190705",
+        "createdAt": 1741075214,
+        "updatedAt": 1741075214
+    },
+    {
+        "id": 39755830,
+        "pastureId": 1,
+        "uuid": "321434420250303103",
+        "neckRingNumber": "3214344",
+        "activeDate": "2025-03-03",
+        "hours": 21,
+        "frameid": 103,
+        "rumina": 0,
+        "intake": 15,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 681,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 58,
+        "voltage": 297,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190705",
+        "receiveNumber": "869701075190705",
+        "createdAt": 1741075500,
+        "updatedAt": 1741075500
+    },
+    {
+        "id": 39757863,
+        "pastureId": 1,
+        "uuid": "321434420250303104",
+        "neckRingNumber": "3214344",
+        "activeDate": "2025-03-03",
+        "hours": 21,
+        "frameid": 104,
+        "rumina": 2,
+        "intake": 13,
+        "inactive": 4,
+        "gasp": 0,
+        "high": 547,
+        "active": 15,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 57,
+        "voltage": 297,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190705",
+        "receiveNumber": "869701075190705",
+        "createdAt": 1741075778,
+        "updatedAt": 1741075778
+    },
+    {
+        "id": 39758419,
+        "pastureId": 1,
+        "uuid": "321434420250303105",
+        "neckRingNumber": "3214344",
+        "activeDate": "2025-03-03",
+        "hours": 21,
+        "frameid": 105,
+        "rumina": 19,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 0,
+        "high": 8,
+        "active": 0,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 56,
+        "voltage": 297,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190705",
+        "receiveNumber": "869701075190705",
+        "createdAt": 1741076414,
+        "updatedAt": 1741076414
+    },
+    {
+        "id": 39764857,
+        "pastureId": 1,
+        "uuid": "321434420250303105",
+        "neckRingNumber": "3214344",
+        "activeDate": "2025-03-03",
+        "hours": 21,
+        "frameid": 105,
+        "rumina": 19,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 0,
+        "high": 8,
+        "active": 0,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 57,
+        "voltage": 297,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190705",
+        "receiveNumber": "869701075190705",
+        "createdAt": 1741076699,
+        "updatedAt": 1741076699
+    },
+    {
+        "id": 39775243,
+        "pastureId": 1,
+        "uuid": "321434420250303106",
+        "neckRingNumber": "3214344",
+        "activeDate": "2025-03-03",
+        "hours": 22,
+        "frameid": 106,
+        "rumina": 20,
+        "intake": 0,
+        "inactive": 13,
+        "gasp": 0,
+        "high": 44,
+        "active": 7,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 57,
+        "voltage": 297,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190705",
+        "receiveNumber": "869701075190705",
+        "createdAt": 1741078780,
+        "updatedAt": 1741078780
+    },
+    {
+        "id": 39712376,
+        "pastureId": 1,
+        "uuid": "105622025030471",
+        "neckRingNumber": "10562",
+        "activeDate": "2025-03-04",
+        "hours": 14,
+        "frameid": 71,
+        "rumina": 7,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 0,
+        "high": 6,
+        "active": 0,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 301,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741070601,
+        "updatedAt": 1741070601
+    },
+    {
+        "id": 39712377,
+        "pastureId": 1,
+        "uuid": "105622025030472",
+        "neckRingNumber": "10562",
+        "activeDate": "2025-03-04",
+        "hours": 14,
+        "frameid": 72,
+        "rumina": 17,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 0,
+        "high": 8,
+        "active": 0,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 301,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741070601,
+        "updatedAt": 1741070601
+    },
+    {
+        "id": 39741114,
+        "pastureId": 1,
+        "uuid": "105622025030473",
+        "neckRingNumber": "10562",
+        "activeDate": "2025-03-04",
+        "hours": 15,
+        "frameid": 73,
+        "rumina": 14,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 0,
+        "high": 6,
+        "active": 0,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 301,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741074193,
+        "updatedAt": 1741074193
+    },
+    {
+        "id": 39741115,
+        "pastureId": 1,
+        "uuid": "105622025030474",
+        "neckRingNumber": "10562",
+        "activeDate": "2025-03-04",
+        "hours": 15,
+        "frameid": 74,
+        "rumina": 16,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 0,
+        "high": 18,
+        "active": 1,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 301,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741074193,
+        "updatedAt": 1741074193
+    },
+    {
+        "id": 39741116,
+        "pastureId": 1,
+        "uuid": "105622025030475",
+        "neckRingNumber": "10562",
+        "activeDate": "2025-03-04",
+        "hours": 15,
+        "frameid": 75,
+        "rumina": 0,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 0,
+        "high": 16,
+        "active": 1,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 301,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741074193,
+        "updatedAt": 1741074193
+    },
+    {
+        "id": 39770269,
+        "pastureId": 1,
+        "uuid": "105622025030476",
+        "neckRingNumber": "10562",
+        "activeDate": "2025-03-04",
+        "hours": 16,
+        "frameid": 76,
+        "rumina": 0,
+        "intake": 2,
+        "inactive": 3,
+        "gasp": 0,
+        "high": 386,
+        "active": 13,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 301,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741077796,
+        "updatedAt": 1741077796
+    },
+    {
+        "id": 39774441,
+        "pastureId": 1,
+        "uuid": "105622025030476",
+        "neckRingNumber": "10562",
+        "activeDate": "2025-03-04",
+        "hours": 16,
+        "frameid": 76,
+        "rumina": 0,
+        "intake": 2,
+        "inactive": 3,
+        "gasp": 0,
+        "high": 386,
+        "active": 13,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 301,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741078112,
+        "updatedAt": 1741078112
+    },
+    {
+        "id": 39770270,
+        "pastureId": 1,
+        "uuid": "105622025030481",
+        "neckRingNumber": "10562",
+        "activeDate": "2025-03-04",
+        "hours": 16,
+        "frameid": 81,
+        "rumina": 0,
+        "intake": 1,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 374,
+        "active": 13,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 301,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741077796,
+        "updatedAt": 1741077796
+    },
+    {
+        "id": 39774442,
+        "pastureId": 1,
+        "uuid": "105622025030481",
+        "neckRingNumber": "10562",
+        "activeDate": "2025-03-04",
+        "hours": 16,
+        "frameid": 81,
+        "rumina": 0,
+        "intake": 1,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 374,
+        "active": 13,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 301,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741078112,
+        "updatedAt": 1741078112
+    },
+    {
+        "id": 39770271,
+        "pastureId": 1,
+        "uuid": "105622025030482",
+        "neckRingNumber": "10562",
+        "activeDate": "2025-03-04",
+        "hours": 16,
+        "frameid": 82,
+        "rumina": 1,
+        "intake": 2,
+        "inactive": 3,
+        "gasp": 0,
+        "high": 440,
+        "active": 17,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 301,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741077796,
+        "updatedAt": 1741077796
+    },
+    {
+        "id": 39774443,
+        "pastureId": 1,
+        "uuid": "105622025030482",
+        "neckRingNumber": "10562",
+        "activeDate": "2025-03-04",
+        "hours": 16,
+        "frameid": 82,
+        "rumina": 1,
+        "intake": 2,
+        "inactive": 3,
+        "gasp": 0,
+        "high": 440,
+        "active": 17,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 301,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741078112,
+        "updatedAt": 1741078112
+    },
+    {
+        "id": 39798900,
+        "pastureId": 1,
+        "uuid": "105622025030483",
+        "neckRingNumber": "10562",
+        "activeDate": "2025-03-04",
+        "hours": 17,
+        "frameid": 83,
+        "rumina": 4,
+        "intake": 3,
+        "inactive": 2,
+        "gasp": 0,
+        "high": 691,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 301,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741081392,
+        "updatedAt": 1741081392
+    },
+    {
+        "id": 39798901,
+        "pastureId": 1,
+        "uuid": "105622025030484",
+        "neckRingNumber": "10562",
+        "activeDate": "2025-03-04",
+        "hours": 17,
+        "frameid": 84,
+        "rumina": 2,
+        "intake": 3,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 468,
+        "active": 17,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 301,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741081392,
+        "updatedAt": 1741081392
+    },
+    {
+        "id": 39798949,
+        "pastureId": 1,
+        "uuid": "105622025030485",
+        "neckRingNumber": "10562",
+        "activeDate": "2025-03-04",
+        "hours": 17,
+        "frameid": 85,
+        "rumina": 1,
+        "intake": 6,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 549,
+        "active": 17,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 301,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741081395,
+        "updatedAt": 1741081395
+    },
+    {
+        "id": 39832313,
+        "pastureId": 1,
+        "uuid": "105622025030486",
+        "neckRingNumber": "10562",
+        "activeDate": "2025-03-04",
+        "hours": 18,
+        "frameid": 86,
+        "rumina": 0,
+        "intake": 16,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 674,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 301,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741085617,
+        "updatedAt": 1741085617
+    },
+    {
+        "id": 39712469,
+        "pastureId": 1,
+        "uuid": "105742025030471",
+        "neckRingNumber": "10574",
+        "activeDate": "2025-03-04",
+        "hours": 14,
+        "frameid": 71,
+        "rumina": 0,
+        "intake": 15,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 564,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 306,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741070601,
+        "updatedAt": 1741070601
+    },
+    {
+        "id": 39712470,
+        "pastureId": 1,
+        "uuid": "105742025030472",
+        "neckRingNumber": "10574",
+        "activeDate": "2025-03-04",
+        "hours": 14,
+        "frameid": 72,
+        "rumina": 0,
+        "intake": 0,
+        "inactive": 13,
+        "gasp": 0,
+        "high": 190,
+        "active": 7,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 306,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741070601,
+        "updatedAt": 1741070601
+    },
+    {
+        "id": 39741207,
+        "pastureId": 1,
+        "uuid": "105742025030473",
+        "neckRingNumber": "10574",
+        "activeDate": "2025-03-04",
+        "hours": 15,
+        "frameid": 73,
+        "rumina": 18,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 0,
+        "high": 29,
+        "active": 1,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 306,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741074196,
+        "updatedAt": 1741074196
+    },
+    {
+        "id": 39741208,
+        "pastureId": 1,
+        "uuid": "105742025030474",
+        "neckRingNumber": "10574",
+        "activeDate": "2025-03-04",
+        "hours": 15,
+        "frameid": 74,
+        "rumina": 20,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 0,
+        "high": 31,
+        "active": 0,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 306,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741074196,
+        "updatedAt": 1741074196
+    },
+    {
+        "id": 39741209,
+        "pastureId": 1,
+        "uuid": "105742025030475",
+        "neckRingNumber": "10574",
+        "activeDate": "2025-03-04",
+        "hours": 15,
+        "frameid": 75,
+        "rumina": 11,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 0,
+        "high": 58,
+        "active": 3,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 306,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741074196,
+        "updatedAt": 1741074196
+    },
+    {
+        "id": 39774444,
+        "pastureId": 1,
+        "uuid": "105742025030476",
+        "neckRingNumber": "10574",
+        "activeDate": "2025-03-04",
+        "hours": 16,
+        "frameid": 76,
+        "rumina": 1,
+        "intake": 0,
+        "inactive": 15,
+        "gasp": 0,
+        "high": 391,
+        "active": 9,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 306,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741078112,
+        "updatedAt": 1741078112
+    },
+    {
+        "id": 39770362,
+        "pastureId": 1,
+        "uuid": "105742025030476",
+        "neckRingNumber": "10574",
+        "activeDate": "2025-03-04",
+        "hours": 16,
+        "frameid": 76,
+        "rumina": 1,
+        "intake": 0,
+        "inactive": 15,
+        "gasp": 0,
+        "high": 391,
+        "active": 9,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 306,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741077796,
+        "updatedAt": 1741077796
+    },
+    {
+        "id": 39774445,
+        "pastureId": 1,
+        "uuid": "105742025030481",
+        "neckRingNumber": "10574",
+        "activeDate": "2025-03-04",
+        "hours": 16,
+        "frameid": 81,
+        "rumina": 0,
+        "intake": 0,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 391,
+        "active": 13,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 306,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741078112,
+        "updatedAt": 1741078112
+    },
+    {
+        "id": 39770363,
+        "pastureId": 1,
+        "uuid": "105742025030481",
+        "neckRingNumber": "10574",
+        "activeDate": "2025-03-04",
+        "hours": 16,
+        "frameid": 81,
+        "rumina": 0,
+        "intake": 0,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 391,
+        "active": 13,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 306,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741077796,
+        "updatedAt": 1741077796
+    },
+    {
+        "id": 39774446,
+        "pastureId": 1,
+        "uuid": "105742025030482",
+        "neckRingNumber": "10574",
+        "activeDate": "2025-03-04",
+        "hours": 16,
+        "frameid": 82,
+        "rumina": 0,
+        "intake": 0,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 323,
+        "active": 13,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 306,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741078112,
+        "updatedAt": 1741078112
+    },
+    {
+        "id": 39770364,
+        "pastureId": 1,
+        "uuid": "105742025030482",
+        "neckRingNumber": "10574",
+        "activeDate": "2025-03-04",
+        "hours": 16,
+        "frameid": 82,
+        "rumina": 0,
+        "intake": 0,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 323,
+        "active": 13,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 306,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741077796,
+        "updatedAt": 1741077796
+    },
+    {
+        "id": 39799040,
+        "pastureId": 1,
+        "uuid": "105742025030483",
+        "neckRingNumber": "10574",
+        "activeDate": "2025-03-04",
+        "hours": 17,
+        "frameid": 83,
+        "rumina": 0,
+        "intake": 1,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 691,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 306,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741081395,
+        "updatedAt": 1741081395
+    },
+    {
+        "id": 39799041,
+        "pastureId": 1,
+        "uuid": "105742025030484",
+        "neckRingNumber": "10574",
+        "activeDate": "2025-03-04",
+        "hours": 17,
+        "frameid": 84,
+        "rumina": 1,
+        "intake": 0,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 621,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 306,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741081395,
+        "updatedAt": 1741081395
+    },
+    {
+        "id": 39799042,
+        "pastureId": 1,
+        "uuid": "105742025030485",
+        "neckRingNumber": "10574",
+        "activeDate": "2025-03-04",
+        "hours": 17,
+        "frameid": 85,
+        "rumina": 6,
+        "intake": 0,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 518,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 306,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741081395,
+        "updatedAt": 1741081395
+    },
+    {
+        "id": 39827555,
+        "pastureId": 1,
+        "uuid": "105742025030486",
+        "neckRingNumber": "10574",
+        "activeDate": "2025-03-04",
+        "hours": 18,
+        "frameid": 86,
+        "rumina": 0,
+        "intake": 13,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 707,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 57,
+        "hardwareVersion": 10,
+        "remain": 6,
+        "voltage": 306,
+        "restartReason": 0,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075191117",
+        "receiveNumber": "869701075191117",
+        "createdAt": 1741085005,
+        "updatedAt": 1741085005
+    },
+    {
+        "id": 39861751,
+        "pastureId": 1,
+        "uuid": "1070420250304101",
+        "neckRingNumber": "10704",
+        "activeDate": "2025-03-04",
+        "hours": 20,
+        "frameid": 101,
+        "rumina": 2,
+        "intake": 5,
+        "inactive": 11,
+        "gasp": 0,
+        "high": 228,
+        "active": 9,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741090446,
+        "updatedAt": 1741090446
+    },
+    {
+        "id": 39870079,
+        "pastureId": 1,
+        "uuid": "1070420250304102",
+        "neckRingNumber": "10704",
+        "activeDate": "2025-03-04",
+        "hours": 20,
+        "frameid": 102,
+        "rumina": 20,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 0,
+        "high": 74,
+        "active": 14,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741091644,
+        "updatedAt": 1741091644
+    },
+    {
+        "id": 39870180,
+        "pastureId": 1,
+        "uuid": "1070420250304102",
+        "neckRingNumber": "10704",
+        "activeDate": "2025-03-04",
+        "hours": 20,
+        "frameid": 102,
+        "rumina": 20,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 0,
+        "high": 74,
+        "active": 14,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741091886,
+        "updatedAt": 1741091886
+    },
+    {
+        "id": 39878730,
+        "pastureId": 1,
+        "uuid": "1070420250304103",
+        "neckRingNumber": "10704",
+        "activeDate": "2025-03-04",
+        "hours": 21,
+        "frameid": 103,
+        "rumina": 15,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 0,
+        "high": 53,
+        "active": 13,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741092840,
+        "updatedAt": 1741092840
+    },
+    {
+        "id": 39890324,
+        "pastureId": 1,
+        "uuid": "1070420250304104",
+        "neckRingNumber": "10704",
+        "activeDate": "2025-03-04",
+        "hours": 21,
+        "frameid": 104,
+        "rumina": 0,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 0,
+        "high": 15,
+        "active": 1,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741094041,
+        "updatedAt": 1741094041
+    },
+    {
+        "id": 39898562,
+        "pastureId": 1,
+        "uuid": "1070420250304105",
+        "neckRingNumber": "10704",
+        "activeDate": "2025-03-04",
+        "hours": 21,
+        "frameid": 105,
+        "rumina": 13,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 5,
+        "high": 9,
+        "active": 0,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741095241,
+        "updatedAt": 1741095241
+    },
+    {
+        "id": 39907240,
+        "pastureId": 1,
+        "uuid": "1070420250304106",
+        "neckRingNumber": "10704",
+        "activeDate": "2025-03-04",
+        "hours": 22,
+        "frameid": 106,
+        "rumina": 20,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 3,
+        "high": 29,
+        "active": 1,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741096444,
+        "updatedAt": 1741096444
+    },
+    {
+        "id": 39765983,
+        "pastureId": 1,
+        "uuid": "107092025030481",
+        "neckRingNumber": "10709",
+        "activeDate": "2025-03-04",
+        "hours": 16,
+        "frameid": 81,
+        "rumina": 14,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 0,
+        "high": 7,
+        "active": 0,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 305,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741076914,
+        "updatedAt": 1741076914
+    },
+    {
+        "id": 39766488,
+        "pastureId": 1,
+        "uuid": "107092025030482",
+        "neckRingNumber": "10709",
+        "activeDate": "2025-03-04",
+        "hours": 16,
+        "frameid": 82,
+        "rumina": 13,
+        "intake": 0,
+        "inactive": 12,
+        "gasp": 0,
+        "high": 119,
+        "active": 5,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 305,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741077242,
+        "updatedAt": 1741077242
+    },
+    {
+        "id": 39775232,
+        "pastureId": 1,
+        "uuid": "107092025030483",
+        "neckRingNumber": "10709",
+        "activeDate": "2025-03-04",
+        "hours": 17,
+        "frameid": 83,
+        "rumina": 1,
+        "intake": 10,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 412,
+        "active": 18,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 305,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741078688,
+        "updatedAt": 1741078688
+    },
+    {
+        "id": 39794774,
+        "pastureId": 1,
+        "uuid": "107092025030484",
+        "neckRingNumber": "10709",
+        "activeDate": "2025-03-04",
+        "hours": 17,
+        "frameid": 84,
+        "rumina": 0,
+        "intake": 0,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 372,
+        "active": 15,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 305,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741080504,
+        "updatedAt": 1741080504
+    },
+    {
+        "id": 39786688,
+        "pastureId": 1,
+        "uuid": "107092025030484",
+        "neckRingNumber": "10709",
+        "activeDate": "2025-03-04",
+        "hours": 17,
+        "frameid": 84,
+        "rumina": 0,
+        "intake": 0,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 372,
+        "active": 15,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 305,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741079623,
+        "updatedAt": 1741079623
+    },
+    {
+        "id": 39795227,
+        "pastureId": 1,
+        "uuid": "107092025030485",
+        "neckRingNumber": "10709",
+        "activeDate": "2025-03-04",
+        "hours": 17,
+        "frameid": 85,
+        "rumina": 0,
+        "intake": 0,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 563,
+        "active": 18,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 305,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741080842,
+        "updatedAt": 1741080842
+    },
+    {
+        "id": 39803763,
+        "pastureId": 1,
+        "uuid": "107092025030486",
+        "neckRingNumber": "10709",
+        "activeDate": "2025-03-04",
+        "hours": 18,
+        "frameid": 86,
+        "rumina": 7,
+        "intake": 0,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 124,
+        "active": 6,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 305,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741081979,
+        "updatedAt": 1741081979
+    },
+    {
+        "id": 39585880,
+        "pastureId": 1,
+        "uuid": "107102025030451",
+        "neckRingNumber": "10710",
+        "activeDate": "2025-03-04",
+        "hours": 10,
+        "frameid": 51,
+        "rumina": 15,
+        "intake": 0,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 139,
+        "active": 14,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741054411,
+        "updatedAt": 1741054411
+    },
+    {
+        "id": 39593663,
+        "pastureId": 1,
+        "uuid": "107102025030452",
+        "neckRingNumber": "10710",
+        "activeDate": "2025-03-04",
+        "hours": 10,
+        "frameid": 52,
+        "rumina": 9,
+        "intake": 7,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 346,
+        "active": 15,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741055643,
+        "updatedAt": 1741055643
+    },
+    {
+        "id": 39602483,
+        "pastureId": 1,
+        "uuid": "107102025030453",
+        "neckRingNumber": "10710",
+        "activeDate": "2025-03-04",
+        "hours": 11,
+        "frameid": 53,
+        "rumina": 0,
+        "intake": 16,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 524,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741056836,
+        "updatedAt": 1741056836
+    },
+    {
+        "id": 39614495,
+        "pastureId": 1,
+        "uuid": "107102025030454",
+        "neckRingNumber": "10710",
+        "activeDate": "2025-03-04",
+        "hours": 11,
+        "frameid": 54,
+        "rumina": 0,
+        "intake": 17,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 558,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741058260,
+        "updatedAt": 1741058260
+    },
+    {
+        "id": 39614198,
+        "pastureId": 1,
+        "uuid": "107102025030454",
+        "neckRingNumber": "10710",
+        "activeDate": "2025-03-04",
+        "hours": 11,
+        "frameid": 54,
+        "rumina": 0,
+        "intake": 17,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 558,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741058020,
+        "updatedAt": 1741058020
+    },
+    {
+        "id": 39621998,
+        "pastureId": 1,
+        "uuid": "107102025030455",
+        "neckRingNumber": "10710",
+        "activeDate": "2025-03-04",
+        "hours": 11,
+        "frameid": 55,
+        "rumina": 0,
+        "intake": 3,
+        "inactive": 6,
+        "gasp": 0,
+        "high": 141,
+        "active": 7,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741059237,
+        "updatedAt": 1741059237
+    },
+    {
+        "id": 39631255,
+        "pastureId": 1,
+        "uuid": "107102025030456",
+        "neckRingNumber": "10710",
+        "activeDate": "2025-03-04",
+        "hours": 12,
+        "frameid": 56,
+        "rumina": 0,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 0,
+        "high": 4,
+        "active": 0,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741060691,
+        "updatedAt": 1741060691
+    },
+    {
+        "id": 39919093,
+        "pastureId": 1,
+        "uuid": "1071820250304111",
+        "neckRingNumber": "10718",
+        "activeDate": "2025-03-04",
+        "hours": 22,
+        "frameid": 111,
+        "rumina": 19,
+        "intake": 0,
+        "inactive": 15,
+        "gasp": 0,
+        "high": 108,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741097888,
+        "updatedAt": 1741097888
+    },
+    {
+        "id": 39926993,
+        "pastureId": 1,
+        "uuid": "1071820250304112",
+        "neckRingNumber": "10718",
+        "activeDate": "2025-03-04",
+        "hours": 22,
+        "frameid": 112,
+        "rumina": 15,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 0,
+        "high": 48,
+        "active": 8,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741098765,
+        "updatedAt": 1741098765
+    },
+    {
+        "id": 39936309,
+        "pastureId": 1,
+        "uuid": "1071820250304113",
+        "neckRingNumber": "10718",
+        "activeDate": "2025-03-04",
+        "hours": 23,
+        "frameid": 113,
+        "rumina": 0,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 0,
+        "high": 25,
+        "active": 0,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741100289,
+        "updatedAt": 1741100289
+    },
+    {
+        "id": 39935620,
+        "pastureId": 1,
+        "uuid": "1071820250304113",
+        "neckRingNumber": "10718",
+        "activeDate": "2025-03-04",
+        "hours": 23,
+        "frameid": 113,
+        "rumina": 0,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 0,
+        "high": 25,
+        "active": 0,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741099964,
+        "updatedAt": 1741099964
+    },
+    {
+        "id": 39947890,
+        "pastureId": 1,
+        "uuid": "1071820250304114",
+        "neckRingNumber": "10718",
+        "activeDate": "2025-03-04",
+        "hours": 23,
+        "frameid": 114,
+        "rumina": 0,
+        "intake": 1,
+        "inactive": 19,
+        "gasp": 0,
+        "high": 96,
+        "active": 6,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741101165,
+        "updatedAt": 1741101165
+    },
+    {
+        "id": 39956178,
+        "pastureId": 1,
+        "uuid": "1071820250304115",
+        "neckRingNumber": "10718",
+        "activeDate": "2025-03-04",
+        "hours": 23,
+        "frameid": 115,
+        "rumina": 0,
+        "intake": 18,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 433,
+        "active": 19,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741102365,
+        "updatedAt": 1741102365
+    },
+    {
+        "id": 39964758,
+        "pastureId": 1,
+        "uuid": "1071820250304116",
+        "neckRingNumber": "10718",
+        "activeDate": "2025-03-04",
+        "hours": 24,
+        "frameid": 116,
+        "rumina": 0,
+        "intake": 14,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 448,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741103565,
+        "updatedAt": 1741103565
+    },
+    {
+        "id": 39918690,
+        "pastureId": 1,
+        "uuid": "1072320250304111",
+        "neckRingNumber": "10723",
+        "activeDate": "2025-03-04",
+        "hours": 22,
+        "frameid": 111,
+        "rumina": 0,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 0,
+        "high": 7,
+        "active": 0,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 174,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741097565,
+        "updatedAt": 1741097565
+    },
+    {
+        "id": 39927106,
+        "pastureId": 1,
+        "uuid": "1072320250304112",
+        "neckRingNumber": "10723",
+        "activeDate": "2025-03-04",
+        "hours": 22,
+        "frameid": 112,
+        "rumina": 3,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 0,
+        "high": 23,
+        "active": 2,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 174,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741098781,
+        "updatedAt": 1741098781
+    },
+    {
+        "id": 39927434,
+        "pastureId": 1,
+        "uuid": "1072320250304112",
+        "neckRingNumber": "10723",
+        "activeDate": "2025-03-04",
+        "hours": 22,
+        "frameid": 112,
+        "rumina": 3,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 0,
+        "high": 23,
+        "active": 2,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 174,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741099092,
+        "updatedAt": 1741099092
+    },
+    {
+        "id": 39935746,
+        "pastureId": 1,
+        "uuid": "1072320250304113",
+        "neckRingNumber": "10723",
+        "activeDate": "2025-03-04",
+        "hours": 23,
+        "frameid": 113,
+        "rumina": 15,
+        "intake": 4,
+        "inactive": 16,
+        "gasp": 0,
+        "high": 178,
+        "active": 5,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 174,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741099983,
+        "updatedAt": 1741099983
+    },
+    {
+        "id": 39951142,
+        "pastureId": 1,
+        "uuid": "1072320250304114",
+        "neckRingNumber": "10723",
+        "activeDate": "2025-03-04",
+        "hours": 23,
+        "frameid": 114,
+        "rumina": 2,
+        "intake": 17,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 614,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 174,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741101771,
+        "updatedAt": 1741101771
+    },
+    {
+        "id": 39956291,
+        "pastureId": 1,
+        "uuid": "1072320250304115",
+        "neckRingNumber": "10723",
+        "activeDate": "2025-03-04",
+        "hours": 23,
+        "frameid": 115,
+        "rumina": 0,
+        "intake": 20,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 628,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 174,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741102387,
+        "updatedAt": 1741102387
+    },
+    {
+        "id": 39964870,
+        "pastureId": 1,
+        "uuid": "1072320250304116",
+        "neckRingNumber": "10723",
+        "activeDate": "2025-03-04",
+        "hours": 24,
+        "frameid": 116,
+        "rumina": 0,
+        "intake": 9,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 452,
+        "active": 19,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 174,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741103582,
+        "updatedAt": 1741103582
+    },
+    {
+        "id": 39643327,
+        "pastureId": 1,
+        "uuid": "107252025030461",
+        "neckRingNumber": "10725",
+        "activeDate": "2025-03-04",
+        "hours": 12,
+        "frameid": 61,
+        "rumina": 0,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 0,
+        "high": 18,
+        "active": 0,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741061861,
+        "updatedAt": 1741061861
+    },
+    {
+        "id": 39651606,
+        "pastureId": 1,
+        "uuid": "107252025030462",
+        "neckRingNumber": "10725",
+        "activeDate": "2025-03-04",
+        "hours": 12,
+        "frameid": 62,
+        "rumina": 0,
+        "intake": 2,
+        "inactive": 17,
+        "gasp": 0,
+        "high": 115,
+        "active": 3,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741063089,
+        "updatedAt": 1741063089
+    },
+    {
+        "id": 39660185,
+        "pastureId": 1,
+        "uuid": "107252025030463",
+        "neckRingNumber": "10725",
+        "activeDate": "2025-03-04",
+        "hours": 13,
+        "frameid": 63,
+        "rumina": 0,
+        "intake": 15,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 734,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741064294,
+        "updatedAt": 1741064294
+    },
+    {
+        "id": 39659988,
+        "pastureId": 1,
+        "uuid": "107252025030463",
+        "neckRingNumber": "10725",
+        "activeDate": "2025-03-04",
+        "hours": 13,
+        "frameid": 63,
+        "rumina": 0,
+        "intake": 15,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 734,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741064041,
+        "updatedAt": 1741064041
+    },
+    {
+        "id": 39671876,
+        "pastureId": 1,
+        "uuid": "107252025030464",
+        "neckRingNumber": "10725",
+        "activeDate": "2025-03-04",
+        "hours": 13,
+        "frameid": 64,
+        "rumina": 2,
+        "intake": 17,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 589,
+        "active": 19,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741065521,
+        "updatedAt": 1741065521
+    },
+    {
+        "id": 39679662,
+        "pastureId": 1,
+        "uuid": "107252025030465",
+        "neckRingNumber": "10725",
+        "activeDate": "2025-03-04",
+        "hours": 13,
+        "frameid": 65,
+        "rumina": 0,
+        "intake": 20,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 607,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741066422,
+        "updatedAt": 1741066422
+    },
+    {
+        "id": 39688282,
+        "pastureId": 1,
+        "uuid": "107252025030466",
+        "neckRingNumber": "10725",
+        "activeDate": "2025-03-04",
+        "hours": 14,
+        "frameid": 66,
+        "rumina": 4,
+        "intake": 7,
+        "inactive": 1,
+        "gasp": 0,
+        "high": 470,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741067578,
+        "updatedAt": 1741067578
+    },
+    {
+        "id": 39699766,
+        "pastureId": 1,
+        "uuid": "107672025030471",
+        "neckRingNumber": "10767",
+        "activeDate": "2025-03-04",
+        "hours": 14,
+        "frameid": 71,
+        "rumina": 0,
+        "intake": 19,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 600,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741068766,
+        "updatedAt": 1741068766
+    },
+    {
+        "id": 39708539,
+        "pastureId": 1,
+        "uuid": "107672025030472",
+        "neckRingNumber": "10767",
+        "activeDate": "2025-03-04",
+        "hours": 14,
+        "frameid": 72,
+        "rumina": 0,
+        "intake": 2,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 337,
+        "active": 16,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741070036,
+        "updatedAt": 1741070036
+    },
+    {
+        "id": 39717751,
+        "pastureId": 1,
+        "uuid": "107672025030473",
+        "neckRingNumber": "10767",
+        "activeDate": "2025-03-04",
+        "hours": 15,
+        "frameid": 73,
+        "rumina": 4,
+        "intake": 8,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 45,
+        "active": 3,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741071486,
+        "updatedAt": 1741071486
+    },
+    {
+        "id": 39717511,
+        "pastureId": 1,
+        "uuid": "107672025030473",
+        "neckRingNumber": "10767",
+        "activeDate": "2025-03-04",
+        "hours": 15,
+        "frameid": 73,
+        "rumina": 4,
+        "intake": 8,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 45,
+        "active": 3,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741071239,
+        "updatedAt": 1741071239
+    },
+    {
+        "id": 39729605,
+        "pastureId": 1,
+        "uuid": "107672025030474",
+        "neckRingNumber": "10767",
+        "activeDate": "2025-03-04",
+        "hours": 15,
+        "frameid": 74,
+        "rumina": 14,
+        "intake": 5,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 241,
+        "active": 18,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741072723,
+        "updatedAt": 1741072723
+    },
+    {
+        "id": 39737760,
+        "pastureId": 1,
+        "uuid": "107672025030475",
+        "neckRingNumber": "10767",
+        "activeDate": "2025-03-04",
+        "hours": 15,
+        "frameid": 75,
+        "rumina": 15,
+        "intake": 0,
+        "inactive": 19,
+        "gasp": 0,
+        "high": 34,
+        "active": 1,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741073627,
+        "updatedAt": 1741073627
+    },
+    {
+        "id": 39746321,
+        "pastureId": 1,
+        "uuid": "107672025030476",
+        "neckRingNumber": "10767",
+        "activeDate": "2025-03-04",
+        "hours": 16,
+        "frameid": 76,
+        "rumina": 20,
+        "intake": 0,
+        "inactive": 18,
+        "gasp": 0,
+        "high": 94,
+        "active": 4,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741074841,
+        "updatedAt": 1741074841
+    },
+    {
+        "id": 39585903,
+        "pastureId": 1,
+        "uuid": "107682025030451",
+        "neckRingNumber": "10768",
+        "activeDate": "2025-03-04",
+        "hours": 10,
+        "frameid": 51,
+        "rumina": 2,
+        "intake": 11,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 542,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741054411,
+        "updatedAt": 1741054411
+    },
+    {
+        "id": 39593688,
+        "pastureId": 1,
+        "uuid": "107682025030452",
+        "neckRingNumber": "10768",
+        "activeDate": "2025-03-04",
+        "hours": 10,
+        "frameid": 52,
+        "rumina": 0,
+        "intake": 13,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 543,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741055643,
+        "updatedAt": 1741055643
+    },
+    {
+        "id": 39602507,
+        "pastureId": 1,
+        "uuid": "107682025030453",
+        "neckRingNumber": "10768",
+        "activeDate": "2025-03-04",
+        "hours": 11,
+        "frameid": 53,
+        "rumina": 12,
+        "intake": 3,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 227,
+        "active": 11,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741056836,
+        "updatedAt": 1741056836
+    },
+    {
+        "id": 39614221,
+        "pastureId": 1,
+        "uuid": "107682025030454",
+        "neckRingNumber": "10768",
+        "activeDate": "2025-03-04",
+        "hours": 11,
+        "frameid": 54,
+        "rumina": 16,
+        "intake": 0,
+        "inactive": 17,
+        "gasp": 1,
+        "high": 73,
+        "active": 4,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741058020,
+        "updatedAt": 1741058020
+    },
+    {
+        "id": 39614498,
+        "pastureId": 1,
+        "uuid": "107682025030454",
+        "neckRingNumber": "10768",
+        "activeDate": "2025-03-04",
+        "hours": 11,
+        "frameid": 54,
+        "rumina": 16,
+        "intake": 0,
+        "inactive": 17,
+        "gasp": 1,
+        "high": 73,
+        "active": 4,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741058260,
+        "updatedAt": 1741058260
+    },
+    {
+        "id": 39622024,
+        "pastureId": 1,
+        "uuid": "107682025030455",
+        "neckRingNumber": "10768",
+        "activeDate": "2025-03-04",
+        "hours": 11,
+        "frameid": 55,
+        "rumina": 20,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 0,
+        "high": 6,
+        "active": 1,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741059237,
+        "updatedAt": 1741059237
+    },
+    {
+        "id": 39631088,
+        "pastureId": 1,
+        "uuid": "107682025030456",
+        "neckRingNumber": "10768",
+        "activeDate": "2025-03-04",
+        "hours": 12,
+        "frameid": 56,
+        "rumina": 20,
+        "intake": 0,
+        "inactive": 20,
+        "gasp": 12,
+        "high": 0,
+        "active": 0,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 300,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741060454,
+        "updatedAt": 1741060454
+    },
+    {
+        "id": 39643330,
+        "pastureId": 1,
+        "uuid": "107902025030461",
+        "neckRingNumber": "10790",
+        "activeDate": "2025-03-04",
+        "hours": 12,
+        "frameid": 61,
+        "rumina": 6,
+        "intake": 5,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 157,
+        "active": 14,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741061861,
+        "updatedAt": 1741061861
+    },
+    {
+        "id": 39651445,
+        "pastureId": 1,
+        "uuid": "107902025030462",
+        "neckRingNumber": "10790",
+        "activeDate": "2025-03-04",
+        "hours": 12,
+        "frameid": 62,
+        "rumina": 16,
+        "intake": 4,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 45,
+        "active": 6,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741062766,
+        "updatedAt": 1741062766
+    },
+    {
+        "id": 39659991,
+        "pastureId": 1,
+        "uuid": "107902025030463",
+        "neckRingNumber": "10790",
+        "activeDate": "2025-03-04",
+        "hours": 13,
+        "frameid": 63,
+        "rumina": 7,
+        "intake": 4,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 355,
+        "active": 17,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741064041,
+        "updatedAt": 1741064041
+    },
+    {
+        "id": 39671879,
+        "pastureId": 1,
+        "uuid": "107902025030464",
+        "neckRingNumber": "10790",
+        "activeDate": "2025-03-04",
+        "hours": 13,
+        "frameid": 64,
+        "rumina": 0,
+        "intake": 20,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 495,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741065521,
+        "updatedAt": 1741065521
+    },
+    {
+        "id": 39675509,
+        "pastureId": 1,
+        "uuid": "107902025030464",
+        "neckRingNumber": "10790",
+        "activeDate": "2025-03-04",
+        "hours": 13,
+        "frameid": 64,
+        "rumina": 0,
+        "intake": 20,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 495,
+        "active": 20,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 1,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741065787,
+        "updatedAt": 1741065787
+    },
+    {
+        "id": 39710887,
+        "pastureId": 1,
+        "uuid": "107902025030465",
+        "neckRingNumber": "10790",
+        "activeDate": "2025-03-04",
+        "hours": 13,
+        "frameid": 65,
+        "rumina": 0,
+        "intake": 6,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 452,
+        "active": 19,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 4,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741070530,
+        "updatedAt": 1741070530
+    },
+    {
+        "id": 39712370,
+        "pastureId": 1,
+        "uuid": "107902025030466",
+        "neckRingNumber": "10790",
+        "activeDate": "2025-03-04",
+        "hours": 14,
+        "frameid": 66,
+        "rumina": 6,
+        "intake": 0,
+        "inactive": 0,
+        "gasp": 0,
+        "high": 209,
+        "active": 8,
+        "other": 0,
+        "firmwareVersion": 55,
+        "hardwareVersion": 0,
+        "remain": 3,
+        "voltage": 301,
+        "restartReason": 158,
+        "upper": 0,
+        "ActiveDateTimeType": 1,
+        "isShow": 2,
+        "imei": "869701075190853",
+        "receiveNumber": "869701075190853",
+        "createdAt": 1741070598,
+        "updatedAt": 1741070598
+    }
+]`
+
+	neckRingList := make([]*model.NeckRingOriginal, 0)
+	if err := json.Unmarshal([]byte(str), &neckRingList); err != nil {
+		panic(err)
+	}
+
+	neckRingList = RemoveDuplicates(neckRingList)
+	data := recalculate(neckRingList)
+	b, _ := json.Marshal(data)
+	fmt.Println(string(b))
+}

module/crontab/neck_ring_merge.go

@@ -6,6 +6,7 @@ import (
 	"kpt-pasture/util"
 	"math"
 	"sort"
+	"strings"
 	"time"
 
 	pasturePb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/cow"
@@ -62,78 +63,10 @@ func (e *Entry) OriginalMergeData(pastureId int64) error {
 		limit = defaultLimit
 	}
 
-	/*neckRingNumber := []string{
-		"10026", "10027", "10028", "10029", "10030",
-		"10031", "10032", "10033", "10034", "10035",
-		"10036", "10037", "10038", "10039", "10040",
-		"10041", "10042", "10043", "10044", "10046",
-		"10047", "10048", "10049", "10050", "10051",
-		"10052", "10053", "10054", "10055", "10056",
-		"9120007", "9120029", "9120040", "9120123", "9120164", "9120184", "9120219", "9120246", "9120321", "9120355",
-		"9120359", "9120375", "9120379", "9120391", "9120446", "9120493", "9120497", "9120512", "9120531", "9120533",
-		"9120540", "9120542", "9120612", "9120614", "9120615", "9120623", "9120625", "9120630", "9120653", "9120662",
-		"211670", "9121372", "3204736", "3212694", "3204532", "3214082", "9121667", "3212275", "3210345", "3217879",
-		"9422", "3206975", "9496", "3204907", "212194", "3211061", "9120840", "3207787", "3210201", "404", "3207104",
-		"3219173", "3216771", "3216872", "3209614", "3205455", "416", "9121026", "211622", "3207868", "3210340", "9120132",
-		"3207092", "3209390", "3205872", "3207367", "3219700", "9120022", "211246", "466", "3207565", "3208779", "3204863",
-		"3207963", "3204259", "3207966", "2640", "3214316", "3205778", "3206897", "3207745", "3209052", "3208045", "211627",
-		"3212873", "2100766", "9121950", "3206076", "3206438", "9466", "9121195", "9122044", "3209430", "3205599", "2100794",
-		"3048", "9467", "3207480", "3216011", "9121725", "9120340", "9121597", "427", "3209387", "3209490", "3214311",
-		"3206044", "211253", "3207553", "3215616", "211350", "3207551", "3205896", "417", "9121008", "3207694", "3209372",
-		"3217873", "3207227", "3207568", "3210615", "3204769", "3216095", "9121338", "3209124", "211340", "3219695",
-		"9121802", "3205517", "3210676", "9123325", "3204328", "9409", "211349", "3208860", "9121769", "3209221",
-		"3210916", "3205880", "438", "3205557", "9421", "211229", "444", "9123260", "9121464", "3212818", "3204834",
-		"3205408", "3207486", "498", "3206232", "3206315", "2100759", "9121955", "3204338", "3207606", "3208767", "450",
-		"9123330", "9121278", "9121011", "9122280", "479", "434", "3207614", "2355", "211644", "453", "9121308", "3209449",
-		"405", "3204240", "9120165", "9445", "9120456", "9123057", "471", "3206830", "464", "403", "2100749", "3218278",
-		"3218600", "212168", "9470", "428", "3205448", "3209790", "3208163", "213134", "3207603", "3206394", "3204476",
-		"9121569", "3206447", "3209456", "9120533", "3209044", "3214232", "3209337", "212193", "3216684", "3218450",
-		"3207194", "3204853", "3205858", "3207922", "3204645", "212157", "3214707", "213126", "3219468", "9120766",
-		"3218611", "3215948", "3211568", "9120227", "211348", "3212621", "3209898", "3207637", "9121071", "9123113",
-		"3206491", "3209922", "9440", "3207075", "423", "3204875", "9121888", "3210395", "9120630", "9120214", "3208166",
-		"211285", "3206880", "3209461", "3205597", "3216262", "3204942", "9123224", "3205918", "3204889", "3209047",
-		"3207024", "3207277", "3207699", "3205771", "9500", "3204450", "3205495", "9483", "3209876", "3205533", "3216075",
-		"9469", "3209827", "9122454", "413", "3216308", "3219301", "3210042", "3205064", "211390", "9121305", "3218596",
-		"3204955", "3215274", "212171", "3209460", "3211376", "3213812", "3205184", "3209287", "3211769", "3205926",
-		"3216585", "3213332", "3209340", "9123175", "3205843", "3207663", "3210829", "3209481", "9450", "9463",
-		"3209763", "3215627", "9121424", "3212746", "3218533", "3209072", "3207359", "3205888", "3214228", "3204884",
-		"3218613", "3209352", "3208192", "3216211", "3211454", "3217082", "3212728", "3206984", "3217750", "3213406",
-		"3206305", "9122130", "9121695", "9492", "3207856", "3218263", "9121058", "9123309", "9122466", "9122287",
-		"9120614", "3084", "3205559", "3205840", "9121444", "9121777", "3209308", "9122313", "9121672", "3210180",
-		"3207645", "3206419", "9413", "211576", "3209201", "2601", "3211708", "3206969", "3206871", "3210430",
-		"211674", "9122441", "3214386", "3206927", "3209332", "9462", "3206430", "3207485", "3204519", "3216214",
-		"9123371", "9120847", "9123355", "211690", "3210362", "3218862", "3213687", "3066", "3209787", "9120359",
-		"9468", "2315", "3207031", "211353", "211250", "3207688", "9122447", "3218688", "445", "3205848", "3214915",
-		"3208866", "1739", "3204990", "2100716", "212130", "3204214", "3208985", "211388", "9123166", "3208856", "211648",
-		"2311", "3204411", "3217860", "9523", "9524", "3209134", "3209212", "211630", "9123151", "3207375", "441", "9525",
-		"3205815", "3205527", "3215344", "3207185", "211332", "3217466", "9526", "1783", "9122414", "3207617", "212150",
-		"3204248", "3216316", "3209535", "3206873", "3208974", "9406", "9122407", "9121925", "2351", "3214481", "3204826",
-		"3205906", "3205109", "3209014", "211240", "3070", "474", "3204667", "3205511", "409", "3209061", "3205074", "3206009",
-		"9123010", "3207536", "3219231", "3207198", "9475", "9423", "9121871", "3204643", "3205471", "3206095", "9121981",
-		"9120835", "3206427", "3218217", "3207493", "2100732", "3204886", "3208174", "9486", "2100772", "3209419",
-		"3207087", "2328", "3207371", "3210597", "3206231", "3206931", "3204236", "3207411", "3206374", "3206452",
-		"3207472", "9429", "3218802", "211381", "9474", "3204420", "3207026", "3206124", "3209608", "3209330", "3209485",
-		"3216593", "3205921", "2375", "3204818", "3215544", "3213632", "3216924", "3204395", "3207111", "3206961", "212169",
-		"9123027", "2100744", "9520", "3208708", "3214104", "3206329", "9512", "3211187", "3207674", "3206004", "3207748",
-		"3209328", "3209033", "3205601", "3205776", "9438", "3205269", "3204664", "9514", "3204897", "9446", "3208827",
-		"3209611", "3208050", "9501", "9121120", "3213788", "9121699", "3204409", "3210073", "3207546", "2100758", "3206082",
-		"3208975", "9122051", "9518", "3207751", "9408", "3206437", "3207343", "3207021", "3216998", "3205349", "3214744",
-		"3205905", "3212646", "3209740", "3206239", "3207473", "3207236", "3209730", "3204360", "3206895", "9120696", "3204901",
-		"9508", "3207935", "3213977", "3214166", "448", "3205893", "3212052", "3205552", "3211112", "3213551", "3217077",
-		"3206322", "9465", "3208807", "3205211", "3215051", "3207121", "3215725", "3207229", "3219426", "3213345", "3217541",
-		"3216876", "3215675", "3214245", "3207012", "3218806", "3217024", "3212486", "3207620", "3211045", "3213712", "3215268",
-		"3215061", "3209099", "3218820", "3212817", "3204659", "3210976", "3213266", "3211716", "3207860", "3213350", "9517",
-		"3215001", "3217667", "3213039", "3207248", "9510", "3215056", "3218732", "3216053", "3209995", "3215773", "3211035",
-		"3213295", "3205725", "9464", "3205636",
-	}*/
 	neckRingList := make([]*model.NeckRingOriginal, 0)
 	if err := e.DB.Model(new(model.NeckRingOriginal)).
 		Where("is_show = ?", pasturePb.IsShow_No).
-		//Where("neck_ring_number IN (?)", neckRingNumber).
 		Where("pasture_id = ?", pastureId).
-		//Where("active_date = ?", time.Now().Format(model.LayoutDate2)).
-		//Where("created_at <= ?", createdAt.Unix()).
-		Order("active_date,neck_ring_number,frameid").
 		Limit(int(limit)).Find(&neckRingList).Error; err != nil {
 		return xerr.WithStack(err)
 	}
@@ -141,6 +74,8 @@ func (e *Entry) OriginalMergeData(pastureId int64) error {
 		return nil
 	}
 
+	// 去重
+	neckRingList = RemoveDuplicates(neckRingList)
 	// 计算合并
 	neckActiveHabitList := Recalculate(neckRingList)
 	if len(neckActiveHabitList) <= 0 {
@@ -410,6 +345,7 @@ func (e *Entry) FirstFilterUpdate(pastureId int64, xToDay *XToday) (processIds [
 	return processIds, nil
 }
 
+// WeeklyUpdateActiveHabit  时间点周平均值计算
 func (e *Entry) WeeklyUpdateActiveHabit(pastureId int64, processIds []int64, xToDay *XToday) (err error) {
 	newNeckActiveHabitList := make([]*model.NeckActiveHabit, 0)
 	if err = e.DB.Model(new(model.NeckActiveHabit)).
@@ -421,6 +357,123 @@ func (e *Entry) WeeklyUpdateActiveHabit(pastureId int64, processIds []int64, xTo
 	for _, v := range newNeckActiveHabitList {
 		// 前七天的
 		weekHabitData := e.FindWeekHabitData(pastureId, v.NeckRingNumber, v.HeatDate, v.Frameid, xToDay)
+		// 更新过滤值
+		if err = e.DB.Model(new(model.NeckActiveHabit)).
+			Select("week_high_habit", "week_rumina_habit", "week_chew_habit", "week_intake_habit", "week_inactive_habit").
+			Where("id = ?", v.Id).
+			Updates(map[string]interface{}{
+				"week_high_habit":     weekHabitData.WeekHighHabit,
+				"week_rumina_habit":   weekHabitData.WeekRuminaHabit,
+				"week_chew_habit":     weekHabitData.WeekChewHabit,
+				"week_intake_habit":   weekHabitData.WeekIntakeHabit,
+				"week_inactive_habit": weekHabitData.WeekInactiveHabit,
+			}).Error; err != nil {
+			zaplog.Error("WeeklyUpdateActiveHabit",
+				zap.Error(err),
+				zap.Any("NeckActiveHabit", v),
+				zap.Any("pastureId", pastureId),
+			)
+		}
+	}
+
+	if err = e.SumUpdateActiveHabit(pastureId, newNeckActiveHabitList, xToDay); err != nil {
+		zaplog.Error("WeeklyUpdateActiveHabit",
+			zap.Any("SumUpdateActiveHabit", err),
+			zap.Any("newNeckActiveHabitList", newNeckActiveHabitList),
+			zap.Any("pastureId", pastureId),
+		)
+	}
+
+	if err = e.ActiveChange(pastureId, processIds, xToDay); err != nil {
+		zaplog.Error("WeeklyUpdateActiveHabit",
+			zap.Any("ActiveChange", err),
+			zap.Any("processIds", processIds),
+			zap.Any("xToDay", xToDay),
+			zap.Any("pastureId", pastureId),
+		)
+	}
+
+	return nil
+}
+
+// SumUpdateActiveHabit -- 累计24小时数值
+func (e *Entry) SumUpdateActiveHabit(pastureId int64, newNeckActiveHabitList []*model.NeckActiveHabit, xToDay *XToday) (err error) {
+	for _, v := range newNeckActiveHabitList {
+		sumHabitData := e.FindSumHabitData(pastureId, v.NeckRingNumber, v.HeatDate, v.Frameid, xToDay)
+		// 更新过滤值
+		if err = e.DB.Model(new(model.NeckActiveHabit)).
+			Select("sum_rumina", "sum_intake", "sum_inactive", "sum_active", "sum_max_high", "sum_min_high", "sum_min_chew").
+			Where("id = ?", v.Id).
+			Updates(map[string]interface{}{
+				"sum_rumina":   sumHabitData.SumRumina,
+				"sum_intake":   sumHabitData.SumIntake,
+				"sum_inactive": sumHabitData.SumInactive,
+				"sum_active":   sumHabitData.SumActive,
+				"sum_max_high": sumHabitData.SumMaxHigh,
+				"sum_min_high": sumHabitData.SumMinHigh,
+				"sum_min_chew": sumHabitData.SumMinChew,
+			}).Error; err != nil {
+			zaplog.Error("WeeklyUpdateActiveHabit",
+				zap.Any("err", err),
+				zap.Any("NeckActiveHabit", v),
+				zap.Any("pastureId", pastureId),
+			)
+		}
+	}
+	return err
+}
+
+// ActiveChange -- 变化百分比
+func (e *Entry) ActiveChange(pastureId int64, processIds []int64, xToDay *XToday) (err error) {
+	newNeckActiveHabitList := make([]*model.NeckActiveHabit, 0)
+	if err = e.DB.Model(new(model.NeckActiveHabit)).
+		Where("id IN (?)", processIds).
+		Where("week_high_habit > ?", 0).
+		Where(e.DB.Where("high >= ?", xToDay.High).Or("rumina >= ?", xToDay.Rumina)).
+		Find(&newNeckActiveHabitList).Error; err != nil {
+		return xerr.WithStack(err)
+	}
+	for _, v := range newNeckActiveHabitList {
+		highDiff := v.FilterHigh - v.WeekHighHabit
+		denominator := float64(v.WeekHigh)*0.6 + float64(v.WeekHighHabit)*0.2 + float64(xToDay.WeeklyActive)*0.2
+		if highDiff > 0 {
+			v.ChangeHigh = int32(math.Round((float64(highDiff) / denominator / float64(v.WeekHighHabit)) * 100))
+		} else {
+			v.ChangeHigh = int32(math.Round(float64(highDiff) / float64(v.WeekHighHabit) * 100))
+		}
+
+		if v.WeekRuminaHabit != 0 {
+			v.ChangeRumina = int32(math.Round(float64(v.FilterRumina-v.WeekRuminaHabit) / float64(v.WeekRuminaHabit) * 100))
+		}
+
+		if v.WeekChewHabit != 0 {
+			v.ChangeChew = int32(math.Round(float64(v.FilterChew-v.WeekChewHabit) / float64(v.WeekChewHabit) * 100))
+		}
+
+		// 更新过滤值
+		if err = e.DB.Model(new(model.NeckActiveHabit)).
+			Select("change_high", "change_rumina", "change_chew").
+			Where("id = ?", v.Id).
+			Updates(map[string]interface{}{
+				"change_high":   v.ChangeHigh,
+				"change_rumina": v.ChangeRumina,
+				"change_chew":   v.ChangeChew,
+			}).Error; err != nil {
+			zaplog.Error("WeeklyUpdateActiveHabit",
+				zap.Error(err),
+				zap.Any("NeckActiveHabit", v),
+				zap.Any("pastureId", pastureId),
+			)
+		}
+	}
+	return err
+}
+
+func (e *Entry) WeeklyUpdateActiveHabitOld(pastureId int64, newNeckActiveHabitList []*model.NeckActiveHabit, xToDay *XToday) (err error) {
+	for _, v := range newNeckActiveHabitList {
+		// 前七天的
+		weekHabitData := e.FindWeekHabitData(pastureId, v.NeckRingNumber, v.HeatDate, v.Frameid, xToDay)
+
 		highDiff := v.FilterHigh - weekHabitData.WeekHighHabit
 		denominator := float64(v.WeekHigh)*0.6 + float64(weekHabitData.WeekHighHabit)*0.2 + float64(xToDay.WeeklyActive)*0.2
 		if highDiff > 0 {
@@ -453,7 +506,7 @@ func (e *Entry) WeeklyUpdateActiveHabit(pastureId int64, processIds []int64, xTo
 				"week_rumina_habit":   weekHabitData.WeekRuminaHabit,
 				"week_chew_habit":     weekHabitData.WeekChewHabit,
 				"week_intake_habit":   weekHabitData.WeekIntakeHabit,
-				"week_inactive_habit": weekHabitData.WeekIntakeHabit,
+				"week_inactive_habit": weekHabitData.WeekInactiveHabit,
 				"sum_rumina":          sumHabitData.SumRumina,
 				"sum_intake":          sumHabitData.SumIntake,
 				"sum_inactive":        sumHabitData.SumInactive,
@@ -474,7 +527,6 @@ func (e *Entry) WeeklyUpdateActiveHabit(pastureId int64, processIds []int64, xTo
 	}
 	return err
 }
-
 func (e *Entry) Before3DaysNeckActiveHabit(pastureId int64, processIds []int64, xToDay *XToday) (err error) {
 	newNeckActiveHabitList := make([]*model.NeckActiveHabit, 0)
 	if err = e.DB.Model(new(model.NeckActiveHabit)).
@@ -721,6 +773,29 @@ func (e *Entry) UpdateNeckRingOriginalIsShow(habit *model.NeckActiveHabit) error
 	return nil
 }
 
+// RemoveDuplicates 清洗一下数据，去掉重复的，如果有重复的，取最新的一条数据
+func RemoveDuplicates(records []*model.NeckRingOriginal) []*model.NeckRingOriginal {
+	uniqueRecords := make(map[string]*model.NeckRingOriginal)
+	// 遍历原始数组
+	for _, record := range records {
+		mapKey := fmt.Sprintf("%s%s%s%s%d", record.NeckRingNumber, model.JoinKey, record.ActiveDate, model.JoinKey, record.Frameid) // 0001/2023-12-04/0 0001/2023-12-03/4
+		if existing, exists := uniqueRecords[mapKey]; exists {
+			if record.CreatedAt > existing.CreatedAt {
+				uniqueRecords[mapKey] = record
+			}
+		} else {
+			uniqueRecords[mapKey] = record
+		}
+	}
+
+	// 将 map 中的记录转换为切片
+	result := make([]*model.NeckRingOriginal, 0, len(uniqueRecords))
+	for _, record := range uniqueRecords {
+		result = append(result, record)
+	}
+	return result
+}
+
 // Recalculate 合并计算
 func Recalculate(neckRingList []*model.NeckRingOriginal) []*model.NeckActiveHabit {
 	originalMapData := make(map[string]*model.NeckRingOriginalMerge)
@@ -738,11 +813,8 @@ func Recalculate(neckRingList []*model.NeckRingOriginal) []*model.NeckActiveHabi
 	res := make([]*model.NeckActiveHabit, 0)
 	// 算平均值
 	for k, v := range originalMapData {
-		// 过滤掉合并后不等于6条数据
-		if v.RecordCount > model.DefaultRecordCount {
-			delete(originalMapData, k)
-			continue
-		} else if v.RecordCount < model.DefaultRecordCount {
+		// 过滤掉合并后<6条数据,如果时间太短就晚点再算
+		if v.RecordCount < model.DefaultRecordCount {
 			currMaxXframeId := util.FrameIdMapReverse[int32(currTime.Hour())]
 			activeDateString := fmt.Sprintf("%s %02d:00:00", v.ActiveDate, v.XframeId*2+1)
 			activeDate, _ := time.Parse(model.LayoutTime, activeDateString)
@@ -757,6 +829,7 @@ func Recalculate(neckRingList []*model.NeckRingOriginal) []*model.NeckActiveHabi
 	if len(originalMapData) <= 0 {
 		return res
 	}
+
 	res = model.NeckRingOriginalMap(originalMapData).ForMatData()
 	sort.Sort(model.NeckActiveHabitSlice(res))
 	return res
@@ -765,22 +838,37 @@ func Recalculate(neckRingList []*model.NeckRingOriginal) []*model.NeckActiveHabi
 func (e *Entry) againRecalculate(data *model.NeckActiveHabit) *model.NeckActiveHabit {
 	originalList := make([]*model.NeckRingOriginal, 0)
 	frameIds := util.FrameIds(data.Frameid)
-	if err := e.DB.Model(new(model.NeckRingOriginal)).
+	sql := ""
+	for _, frameId := range frameIds {
+		sql += fmt.Sprintf(`SELECT * FROM neck_ring_original WHERE pasture_id = %d AND neck_ring_number = '%s' AND  active_date = '%s' AND frameid = %d UNION ALL `, data.PastureId, data.NeckRingNumber, data.HeatDate, frameId)
+	}
+
+	if len(sql) > 0 {
+		sql = strings.TrimSuffix(sql, "UNION ALL ")
+	}
+
+	if err := e.DB.Raw(sql).Find(&originalList).Error; err != nil {
+		return nil
+	}
+
+	/*if err := e.DB.Model(new(model.NeckRingOriginal)).
 		Where("pasture_id = ?", data.PastureId).
 		Where("neck_ring_number = ?", data.NeckRingNumber).
 		Where("active_date = ?", data.HeatDate).
 		Where("frameid IN (?)", frameIds).
 		Find(&originalList).Error; err != nil {
 		return nil
-	}
+	}*/
 
+	originalList = RemoveDuplicates(originalList)
 	newDataList := Recalculate(originalList)
-	zaplog.Info("againRecalculate", zap.Any("data", data), zap.Any("newDataList", newDataList))
+
 	if len(newDataList) != 1 {
 		return nil
 	}
 	res := newDataList[0]
 	res.IsShow = pasturePb.IsShow_No
+
 	return res
 }
 

module/crontab/sql.go

@@ -209,7 +209,8 @@ func (e *Entry) FindWeekHabitData(pastureId int64, neckRingNumber, heatDate stri
 		Where("neck_ring_number = ? ", neckRingNumber).
 		Where("frameid = ?", frameid).
 		Where(e.DB.Where("high > ?", xToday.High).Or("rumina >= ?", xToday.Rumina)).
-		Group("neck_ring_number").First(weekHabitData).Error; err != nil {
+		Group("neck_ring_number").
+		First(weekHabitData).Error; err != nil {
 		zaplog.Error("WeeklyActiveAvgUpdate-1",
 			zap.Any("error", err),
 			zap.Any("neckRingNumber", neckRingNumber),