neckRing: 脖环数据重新梳理

go.mod

@@ -3,7 +3,7 @@ module kpt-pasture
 go 1.17
 
 require (
-	gitee.com/xuyiping_admin/go_proto v0.0.0-20241204021755-ac6c028d07a3
+	gitee.com/xuyiping_admin/go_proto v0.0.0-20241204031342-3f1a7bd2d670
 	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

@@ -44,6 +44,8 @@ gitee.com/xuyiping_admin/go_proto v0.0.0-20241204014219-67b3a86c6073 h1:9lzMO1lw
 gitee.com/xuyiping_admin/go_proto v0.0.0-20241204014219-67b3a86c6073/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20241204021755-ac6c028d07a3 h1:05zSqGf+j1PFXULInvcc610amPNWH+CJk9Jd9h/kHhs=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20241204021755-ac6c028d07a3/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20241204031342-3f1a7bd2d670 h1:cqwZ/W6yHEqymPrIPm9VNKvy9U/Mx6OT4B4axdBZ2ak=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20241204031342-3f1a7bd2d670/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=

http/handler/event/event_breed.go

@@ -230,11 +230,15 @@ func EstrusCreate(c *gin.Context) {
 
 func EstrusBatch(c *gin.Context) {
 	var req pasturePb.EventEstrusBatch
+	if err := ginutil.BindProto(c, &req); err != nil {
+		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
+		return
+	}
+
 	if err := valid.ValidateStruct(&req,
 		valid.Field(&req.Item, valid.Required, valid.Each(valid.By(func(value interface{}) error {
 			item := value.(pasturePb.EventEstrus)
-			return valid.ValidateStruct(&item,
-				valid.Field(&item.CowId, valid.Required),
+			return valid.ValidateStruct(&item, valid.Field(&item.CowId, valid.Required),
 				valid.Field(&item.OperationId, valid.Required),
 				valid.Field(&item.IsMathing, valid.Required),
 				valid.Field(&item.UnMatingReasons, valid.Required),

model/cow_active_habit.go → model/neck_active_habit.go

@@ -2,12 +2,13 @@ package model
 
 import pasturePb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/cow"
 
-type CowActiveHabit struct {
+type NeckActiveHabit struct {
 	Id                       int64                 `json:"id"`
 	CowId                    int64                 `json:"cowId"`
 	NeckRingNumber           string                `json:"neckRingNumber"`
 	Lact                     int32                 `json:"lact"`
-	FrameId                  int32                 `json:"frameId"`
+	FrameId                  int32                 `json:"frameid"`
+	HeatDate                 string                `json:"heatDate"`
 	Rumina                   int32                 `json:"rumina"`
 	Intake                   int32                 `json:"intake"`
 	Inactive                 int32                 `json:"inactive"`
@@ -53,6 +54,29 @@ type CowActiveHabit struct {
 	UpdatedAt                int64                 `json:"updatedAt"`
 }
 
-func (c *CowActiveHabit) TableName() string {
-	return "cow_active_habit"
+func (c *NeckActiveHabit) TableName() string {
+	return "neck_active_habit"
+}
+
+func NewNeckActiveHabit(frameId int32, heatDate, neckRingNumber string, cow *Cow, data *NeckRingOriginalMerge) *NeckActiveHabit {
+	cowId := int64(0)
+	lact := int32(0)
+	if cow != nil {
+		cowId = cow.Id
+		lact = cow.Lact
+	}
+	return &NeckActiveHabit{
+		FrameId:        frameId,
+		HeatDate:       heatDate,
+		NeckRingNumber: neckRingNumber,
+		Lact:           lact,
+		CowId:          cowId,
+		Active:         data.Active,
+		Gasp:           data.Gasp,
+		High:           data.High,
+		Inactive:       data.Inactive,
+		Intake:         data.Intake,
+		Other:          data.Other,
+		Rumina:         data.Rumina,
+	}
 }

model/neck_ring_original.go

@@ -1,6 +1,12 @@
 package model
 
-import pasturePb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/cow"
+import (
+	"math"
+	"strconv"
+	"strings"
+
+	pasturePb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/cow"
+)
 
 type NeckRingOriginal struct {
 	Id                 int64                         `json:"id"`
@@ -32,6 +38,74 @@ type NeckRingOriginal struct {
 	UpdatedAt          int64                         `json:"updatedAt"`
 }
 
-func (s *NeckRingOriginal) TableName() string {
+func (n *NeckRingOriginal) TableName() string {
 	return "neck_ring_original"
 }
+
+var (
+	AvgHours = int32(6)
+	JoinKey  = "-"
+)
+
+func (n *NeckRingOriginal) IsAvgHours() {
+	if n.ActiveDateType == pasturePb.ActiveTimeType_Two_Hours {
+		n.Remain *= AvgHours
+		n.Inactive *= AvgHours
+		n.Active *= AvgHours
+		n.Intake *= AvgHours
+		n.Other *= AvgHours
+		n.Gasp *= AvgHours
+		n.High *= AvgHours
+		n.High = int32(math.Min(1800, float64(n.Other)))
+	}
+}
+
+type NeckRingOriginalMerge struct {
+	Rumina         int32
+	Inactive       int32
+	Active         int32
+	Intake         int32
+	Other          int32
+	High           int32
+	Gasp           int32
+	ActiveDateType pasturePb.ActiveTimeType_Kind
+}
+
+func (n *NeckRingOriginalMerge) IsMageData(data *NeckRingOriginal) {
+	n.Rumina += data.Rumina
+	n.Inactive += data.Inactive
+	n.Active += data.Active
+	n.Intake += data.Intake
+	n.Other += data.Other
+	n.Gasp += data.Gasp
+	n.High += data.High
+}
+
+func (n *NeckRingOriginalMerge) SumAvg() {
+	n.Rumina = n.Rumina / AvgHours * AvgHours
+	n.Inactive = n.Inactive / AvgHours * AvgHours
+	n.Active = n.Active / AvgHours * AvgHours
+	n.Intake = n.Intake / AvgHours * AvgHours
+	n.Other = n.Other / AvgHours * AvgHours
+	n.Gasp = n.Gasp / AvgHours * AvgHours
+	n.High = n.High / AvgHours * AvgHours
+}
+
+type NeckRingOriginalMap map[string]*NeckRingOriginalMerge
+
+func (n NeckRingOriginalMap) ForMatData(getCowInfo func(string) *Cow) []*NeckActiveHabit {
+	res := make([]*NeckActiveHabit, 0)
+	for key, v := range n {
+		keyStrList := strings.Split(key, JoinKey)
+		if len(keyStrList) != 3 {
+			continue
+		}
+		imei := keyStrList[0]
+		activeDate := keyStrList[1]
+		frameId := keyStrList[2]
+		frameIdInt, _ := strconv.Atoi(frameId)
+		cowInfo := getCowInfo(imei)
+		res = append(res, NewNeckActiveHabit(int32(frameIdInt), activeDate, imei, cowInfo, v))
+	}
+	return res
+}

module/backend/config_data_breed.go

@@ -167,6 +167,14 @@ func (s *StoreEntry) LactIntervalSymbolEnumList(isAll string) []*pasturePb.Confi
 		Value:    int32(pasturePb.CompareSymbol_Between),
 		Label:    "区间",
 		Disabled: true,
+	}, &pasturePb.ConfigOptionsList{
+		Value:    int32(pasturePb.CompareSymbol_Include),
+		Label:    "包含",
+		Disabled: true,
+	}, &pasturePb.ConfigOptionsList{
+		Value:    int32(pasturePb.CompareSymbol_Not_Include),
+		Label:    "不包含",
+		Disabled: true,
 	})
 	return configOptions
 }

module/crontab/neck_ring.go

@@ -4,20 +4,14 @@ import (
 	"fmt"
 	"kpt-pasture/config"
 	"kpt-pasture/model"
+	"math"
+
+	"gorm.io/gorm"
 
 	pasturePb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/cow"
 	"gitee.com/xuyiping_admin/pkg/xerr"
 )
 
-type SumData struct {
-	sumRemain   int32
-	sumIntake   int32
-	sumInactive int32
-	sumGasp     int32
-	sumOther    int32
-	sumActive   int32
-}
-
 // NeckRingMergeData 把
 func (e *Entry) NeckRingMergeData() error {
 	cfg := config.Options()
@@ -39,65 +33,49 @@ func (e *Entry) NeckRingMergeData() error {
 	}
 
 	neckRingIds := make([]int64, 0)
-	// 更新已处理过的id
-	defer func() {
-		if len(neckRingIds) > 0 {
-			e.DB.Model(new(model.NeckRingOriginal)).Where("id IN ?", neckRingIds).Update("is_show", pasturePb.IsShow_Ok)
-		}
-	}()
-
-	originalMapData := make(map[string]*model.NeckRingOriginal)
-	baseHours := int32(6)
+	originalMapData := make(map[string]*model.NeckRingOriginalMerge)
 	// 合并成2个小时的
 	for _, v := range neckRingList {
-		if v.ActiveDate == "" {
-			continue
-		}
 		neckRingIds = append(neckRingIds, v.Id)
-		mapKey := fmt.Sprintf("%s-%s-%d", v.Imei, v.ActiveDate, v.FrameId)
-		if _, ok := originalMapData[mapKey]; ok {
-			if v.ActiveDateType == pasturePb.ActiveTimeType_Twenty_Minutes {
-				baseHours = 1
-			}
-			originalMapData[mapKey].Remain *= baseHours
-			originalMapData[mapKey].Intake *= baseHours
-			originalMapData[mapKey].Inactive *= baseHours
-			originalMapData[mapKey].Gasp *= baseHours
-			originalMapData[mapKey].Other *= baseHours
-			originalMapData[mapKey].Active *= baseHours
-		} else {
-			originalMapData[mapKey] = v
+		xframeId := int(math.Floor(float64(v.FrameId)/10) * 2)
+		mapKey := fmt.Sprintf("%s%s%s%s%d", v.Imei, model.JoinKey, v.ActiveDate, model.JoinKey, xframeId) // 0001-2023-12-04-0 0001-2023-12-03-4
+		if _, ok := originalMapData[mapKey]; !ok {
+			originalMapData[mapKey] = new(model.NeckRingOriginalMerge)
 		}
+		v.IsAvgHours()
+		originalMapData[mapKey].IsMageData(v)
 	}
 
-	iemMap := make(map[string]*model.NeckRingOriginal)
-	for _, v := range originalMapData {
-		mapKey := fmt.Sprintf("%s-%s", v.Imei, v.ActiveDate)
-		if _, ok := iemMap[mapKey]; ok {
-			originalMapData[mapKey].Remain += v.Remain
-			originalMapData[mapKey].Intake += v.Intake
-			originalMapData[mapKey].Inactive += v.Inactive
-			originalMapData[mapKey].Gasp += v.Gasp
-			originalMapData[mapKey].Other += v.Other
-			originalMapData[mapKey].Active += v.Active
-		} else {
-			iemMap[mapKey] = v
+	// 算平均值
+	sumAvgImei := make(map[string]*model.NeckRingOriginalMerge)
+	for key, _ := range originalMapData {
+		if _, ok := originalMapData[key]; !ok {
+			sumAvgImei[key] = new(model.NeckRingOriginalMerge)
 		}
+		sumAvgImei[key].SumAvg()
 	}
 
-	sumIemMap := make(map[string]*SumData)
-	for k, v := range iemMap {
-		if sumIemMap[k] == nil {
-			sumIemMap[k] = &SumData{
-				sumRemain:   v.Remain / baseHours,
-				sumIntake:   v.Intake / baseHours,
-				sumInactive: v.Inactive / baseHours,
-				sumGasp:     v.Gasp / baseHours,
-				sumOther:    v.Other / baseHours,
-				sumActive:   v.Active / baseHours,
+	if err := e.DB.Transaction(func(tx *gorm.DB) error {
+		// 更新已处理过的id
+		if len(neckRingIds) > 0 {
+			if err := tx.Model(new(model.NeckRingOriginal)).
+				Where("id IN ?", neckRingIds).
+				Update("is_show", pasturePb.IsShow_Ok).
+				Error; err != nil {
+				return xerr.WithStack(err)
 			}
 		}
-	}
 
+		// 插入新的数据，如果存在则合并更新
+		newNeckActiveHabitList := model.NeckRingOriginalMap(sumAvgImei).ForMatData(e.GetCowInfoByImei)
+		if len(newNeckActiveHabitList) > 0 {
+			if err := tx.Create(newNeckActiveHabitList).Error; err != nil {
+				return xerr.WithStack(err)
+			}
+		}
+		return nil
+	}); err != nil {
+		return xerr.WithStack(err)
+	}
 	return nil
 }

module/crontab/sql.go

@@ -19,3 +19,11 @@ func (e *Entry) GetPenMapList() (map[int32]*model.Pen, error) {
 	}
 	return penMap, nil
 }
+
+func (e *Entry) GetCowInfoByImei(imei string) *model.Cow {
+	res := &model.Cow{}
+	if err := e.DB.Model(new(model.Cow)).Where("imei = ?", imei).First(res).Error; err != nil {
+		return nil
+	}
+	return res
+}

util/util.go

@@ -325,7 +325,6 @@ GetNeckRingActiveTimer
 91-96代表每天的18-20点，101-106代表每天的20-22点，111-116代表每天的22-24点。其中每天数字代表20分钟。如果frameId大于接受时间点，就代表frameId是昨天的。
 2. 如果farmId取值出现8,18,28,3848,58,68,78,88,98,108,118数字分别代表2个小时，从0-2点开始，以此类推。
 帮我根据frameId值，获取对应的时间点
-todo 116和118有问题，需要处理
 */
 func GetNeckRingActiveTimer(frameId int32) (dateTime string, hours int) {
 	if frameId < 0 || frameId > 118 {
@@ -338,22 +337,21 @@ func GetNeckRingActiveTimer(frameId int32) (dateTime string, hours int) {
 		8: 2, 18: 4, 28: 6, 38: 8, 48: 10, 58: 12, 68: 14, 78: 16, 88: 18, 98: 20, 108: 22, 118: 0,
 	}
 	hours, ok := specialHours[int(frameId)]
-	startHour := hours
+	day := 0
 	if ok {
 		if hours > currHour {
-			startHour -= 24
+			day = -1
 		}
-		dateTime = time.Date(nowTime.Year(), nowTime.Month(), nowTime.Day(), startHour, 0, 0, 0, nowTime.Location()).Format(Layout)
+		dateTime = nowTime.AddDate(0, 0, day).Format(Layout)
 		return
 	}
 
 	hours = int(math.Floor(float64(frameId)/10) * 2)
 	units := int(frameId % 10)
 	hours += units / 3
-	startHour = hours
 	if hours > currHour {
-		startHour -= 24
+		day = -1
 	}
-	dateTime = time.Date(nowTime.Year(), nowTime.Month(), nowTime.Day(), startHour, 0, 0, 0, nowTime.Location()).Format(Layout)
+	dateTime = nowTime.AddDate(0, 0, day).Format(Layout)
 	return
 }

util/util_test.go

@@ -423,70 +423,65 @@ func TestGetNeckRingActiveTimer(t *testing.T) {
 		hours    []int32
 	}{
 		frameId: []int32{
-			1, 2, 3, 4, 5, 6, 8,
-			11, 12, 13, 14, 15, 16, 18,
-			21, 22, 23, 24, 25, 26, 28,
-			31, 32, 33, 34, 35, 36, 38,
-			41, 42, 43, 44, 45, 46, 48,
-			51, 52, 53, 54, 55, 56, 58,
-			61, 62, 63, 64, 65, 66, 68,
-			71, 72, 73, 74, 75, 76, 78,
-			81, 82, 83, 84, 85, 86, 88,
-			91, 92, 93, 94, 95, 96, 98,
-			101, 102, 103, 104, 105, 106, 108,
-			111, 112, 113, 114, 115, 116, 118,
+			1, 2, 3, 4, 5, 6,
+			11, 12, 13, 14, 15, 16,
+			21, 22, 23, 24, 25, 26,
+			31, 32, 33, 34, 35, 36,
+			41, 42, 43, 44, 45, 46,
+			51, 52, 53, 54, 55, 56,
+			61, 62, 63, 64, 65, 66,
+			71, 72, 73, 74, 75, 76,
+			81, 82, 83, 84, 85, 86,
+			91, 92, 93, 94, 95, 96,
+			101, 102, 103, 104, 105, 106,
+			111, 112, 113, 114, 115, 116,
+			8, 18, 28, 38, 48, 58, 68, 78, 88, 98, 108, 118,
 		},
 		hours: []int32{
-			0, 0, 1, 1, 1, 2, 2,
-			2, 2, 3, 3, 3, 4, 4,
-			4, 4, 5, 5, 5, 6, 6,
-			6, 6, 7, 7, 7, 8, 8,
-			8, 8, 9, 9, 9, 10, 10,
-			10, 10, 11, 11, 11, 12, 12,
-			12, 12, 13, 13, 13, 14, 14,
-			14, 14, 15, 15, 15, 16, 16,
-			16, 16, 17, 17, 17, 18, 18,
-			18, 18, 19, 19, 19, 20, 20,
-			20, 20, 21, 21, 21, 22, 22,
-			22, 22, 23, 23, 23, 24, 0,
+			0, 0, 1, 1, 1, 2,
+			2, 2, 3, 3, 3, 4,
+			4, 4, 5, 5, 5, 6,
+			6, 6, 7, 7, 7, 8,
+			8, 8, 9, 9, 9, 10,
+			10, 10, 11, 11, 11, 12,
+			12, 12, 13, 13, 13, 14,
+			14, 14, 15, 15, 15, 16,
+			16, 16, 17, 17, 17, 18,
+			18, 18, 19, 19, 19, 20,
+			20, 20, 21, 21, 21, 22,
+			22, 22, 23, 23, 23, 24,
+			2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 0,
 		},
 		dateTime: []string{
 			fmt.Sprintf("%s 00:20:00", nowTime), fmt.Sprintf("%s 00:40:00", nowTime), fmt.Sprintf("%s 01:00:00", nowTime),
 			fmt.Sprintf("%s 01:20:00", nowTime), fmt.Sprintf("%s 01:40:00", nowTime), fmt.Sprintf("%s 02:00:00", nowTime),
-			fmt.Sprintf("%s 00:00:00", nowTime),
 			fmt.Sprintf("%s 02:20:00", nowTime), fmt.Sprintf("%s 02:40:00", nowTime), fmt.Sprintf("%s 03:00:00", nowTime),
 			fmt.Sprintf("%s 03:20:00", nowTime), fmt.Sprintf("%s 03:40:00", nowTime), fmt.Sprintf("%s 04:00:00", nowTime),
-			fmt.Sprintf("%s 02:00:00", nowTime),
 			fmt.Sprintf("%s 04:20:00", nowTime), fmt.Sprintf("%s 04:40:00", nowTime), fmt.Sprintf("%s 05:00:00", nowTime),
 			fmt.Sprintf("%s 05:20:00", nowTime), fmt.Sprintf("%s 05:40:00", nowTime), fmt.Sprintf("%s 06:00:00", nowTime),
-			fmt.Sprintf("%s 04:00:00", nowTime),
 			fmt.Sprintf("%s 06:20:00", nowTime), fmt.Sprintf("%s 06:40:00", nowTime), fmt.Sprintf("%s 07:00:00", nowTime),
 			fmt.Sprintf("%s 07:20:00", nowTime), fmt.Sprintf("%s 07:40:00", nowTime), fmt.Sprintf("%s 08:00:00", nowTime),
-			fmt.Sprintf("%s 06:00:00", nowTime),
 			fmt.Sprintf("%s 08:20:00", nowTime), fmt.Sprintf("%s 08:40:00", nowTime), fmt.Sprintf("%s 09:00:00", nowTime),
 			fmt.Sprintf("%s 09:20:00", nowTime), fmt.Sprintf("%s 09:40:00", nowTime), fmt.Sprintf("%s 10:00:00", nowTime),
-			fmt.Sprintf("%s 08:00:00", nowTime),
 			fmt.Sprintf("%s 10:20:00", nowTime), fmt.Sprintf("%s 10:40:00", nowTime), fmt.Sprintf("%s 11:00:00", nowTime),
 			fmt.Sprintf("%s 11:20:00", nowTime), fmt.Sprintf("%s 11:40:00", nowTime), fmt.Sprintf("%s 12:00:00", nowTime),
-			fmt.Sprintf("%s 10:00:00", nowTime),
 			fmt.Sprintf("%s 12:20:00", nowTime), fmt.Sprintf("%s 12:40:00", nowTime), fmt.Sprintf("%s 13:00:00", nowTime),
 			fmt.Sprintf("%s 13:20:00", nowTime), fmt.Sprintf("%s 13:40:00", nowTime), fmt.Sprintf("%s 14:00:00", nowTime),
-			fmt.Sprintf("%s 12:00:00", nowTime),
 			fmt.Sprintf("%s 14:20:00", nowTime), fmt.Sprintf("%s 14:40:00", nowTime), fmt.Sprintf("%s 15:00:00", nowTime),
 			fmt.Sprintf("%s 15:20:00", nowTime), fmt.Sprintf("%s 15:40:00", nowTime), fmt.Sprintf("%s 16:00:00", nowTime),
-			fmt.Sprintf("%s 14:00:00", nowTime),
 			fmt.Sprintf("%s 16:20:00", nowTime), fmt.Sprintf("%s 16:40:00", nowTime), fmt.Sprintf("%s 17:00:00", nowTime),
 			fmt.Sprintf("%s 17:20:00", nowTime), fmt.Sprintf("%s 17:40:00", nowTime), fmt.Sprintf("%s 18:00:00", nowTime),
-			fmt.Sprintf("%s 16:00:00", nowTime),
 			fmt.Sprintf("%s 18:20:00", nowTime), fmt.Sprintf("%s 18:40:00", nowTime), fmt.Sprintf("%s 19:00:00", nowTime),
 			fmt.Sprintf("%s 19:20:00", nowTime), fmt.Sprintf("%s 19:40:00", nowTime), fmt.Sprintf("%s 20:00:00", nowTime),
-			fmt.Sprintf("%s 18:00:00", nowTime),
 			fmt.Sprintf("%s 20:20:00", nowTime), fmt.Sprintf("%s 20:40:00", nowTime), fmt.Sprintf("%s 21:00:00", nowTime),
 			fmt.Sprintf("%s 21:20:00", nowTime), fmt.Sprintf("%s 21:40:00", nowTime), fmt.Sprintf("%s 22:00:00", nowTime),
-			fmt.Sprintf("%s 22:00:00", nowTime),
 			fmt.Sprintf("%s 22:20:00", nowTime), fmt.Sprintf("%s 22:40:00", nowTime), fmt.Sprintf("%s 23:00:00", nowTime),
 			fmt.Sprintf("%s 23:20:00", nowTime), fmt.Sprintf("%s 23:40:00", nowTime), fmt.Sprintf("%s 24:00:00", nowTime),
-			fmt.Sprintf("%s 24:00:00", nowTime),
+
+			fmt.Sprintf("%s 02:00:00", nowTime), fmt.Sprintf("%s 04:00:00", nowTime), fmt.Sprintf("%s 06:00:00", nowTime),
+			fmt.Sprintf("%s 08:00:00", nowTime), fmt.Sprintf("%s 10:00:00", nowTime), fmt.Sprintf("%s 12:00:00", nowTime),
+			fmt.Sprintf("%s 14:00:00", nowTime), fmt.Sprintf("%s 16:00:00", nowTime), fmt.Sprintf("%s 18:00:00", nowTime),
+			fmt.Sprintf("%s 20:00:00", nowTime), fmt.Sprintf("%s 22:00:00", nowTime), fmt.Sprintf("%s 00:00:00", nowTime),
 		},
 	}
 
@@ -502,20 +497,12 @@ func Test_demo(t *testing.T) {
 	ids := []int32{1, 2, 3, 4, 5, 6, 11, 12, 13, 14, 15, 16, 21, 22, 23, 24, 25, 26,
 		31, 32, 33, 34, 35, 36, 41, 42, 43, 44, 45, 46, 51, 52, 53, 54, 55, 56,
 		61, 62, 63, 64, 65, 66, 71, 72, 73, 74, 75, 76, 81, 82, 83, 84, 85, 86,
-		91, 92, 93, 94, 95, 96, 101, 102, 103, 104, 105, 106, 111, 112, 113, 114, 115, 116}
-
-	nowTime := time.Now()
-	currHour := nowTime.Hour()
+		91, 92, 93, 94, 95, 96, 101, 102, 103, 104, 105, 106, 111, 112, 113, 114, 115, 116,
+		8, 18, 28, 38, 48, 58, 68, 78, 88, 98, 108, 118,
+	}
 
 	for _, v := range ids {
 		hours := int(math.Floor(float64(v)/10) * 2)
-		units := int(v % 10)
-		minutes := units * 20 % 60
-		hours += units / 3
-		if hours > currHour {
-			hours -= 24
-		}
-		activeTime := time.Date(time.Now().Year(), time.Now().Month(), time.Now().Day(), hours, minutes, 0, 0, time.Now().Location()).Format(LayoutTime)
-		fmt.Println(v, activeTime)
+		fmt.Println(hours)
 	}
 }