neckRing: update

config/app.develop.yaml

@@ -5,7 +5,7 @@ debug: true
 http_server_addr: ':8090'
 http_metrics_addr: ':23332'
 jwt_expire_time: 172800
-neck_ring_limit: 10000
+neck_ring_limit: 100
 
 store:
   show_sql: true

config/app.test.yaml

@@ -4,7 +4,7 @@ debug: true
 http_server_addr: ':8090'
 http_metrics_addr: ':23332'
 jwt_expire_time: 172800
-neck_ring_limit: 10000
+neck_ring_limit: 100
 
 store:
   show_sql: true

model/neck_ring_original.go

@@ -99,11 +99,11 @@ func (n NeckRingOriginalMap) ForMatData() []*NeckActiveHabit {
 		if len(keyStrList) != 3 {
 			continue
 		}
-		imei := keyStrList[0]
+		neckRingNumber := keyStrList[0]
 		activeDate := keyStrList[1]
 		frameId := keyStrList[2]
 		frameIdInt, _ := strconv.Atoi(frameId)
-		res = append(res, NewNeckActiveHabit(int32(frameIdInt), activeDate, imei, v))
+		res = append(res, NewNeckActiveHabit(int32(frameIdInt), activeDate, neckRingNumber, v))
 	}
 	return res
 }

module/mqtt/handle.go

@@ -31,7 +31,7 @@ type DataInsertNeckRingLog struct {
 var (
 	batchSize    = 10
 	batchList    = make([]*model.NeckRingOriginal, 0, batchSize)
-	DefaultLimit = int32(10000)
+	defaultLimit = int32(100)
 	DSMLog       = &DataInsertNeckRingLog{
 		NeckRingOriginalData:   make([]*model.NeckRingOriginal, 0),
 		NeckRingErrorData:      make([]*model.NeckRingError, 0),
@@ -327,7 +327,7 @@ func (e *Entry) MsgDataFormat2(msg []byte) []*model.NeckRingOriginal {
 func (e *Entry) NeckRingOriginalMergeData() {
 	limit := e.Cfg.NeckRingLimit
 	if limit <= 0 {
-		limit = DefaultLimit
+		limit = defaultLimit
 	}
 
 	updateOriginalMaxId := e.GetSystemConfigure(model.MaxEstrus).Value