update 窗口创建原因

aggData.go

@@ -33,9 +33,9 @@ func (the *AggData) GetThingId() string {
 	return the.ThingId
 }
 
-// GetDeviceId 功能未实现的功能，会返回“”，只是未了实现接口 IDataTrace
+// GetDeviceId 返回SensorId
 func (the *AggData) GetDeviceId() string {
-	return "unknown"
+	return fmt.Sprintf("%d", the.SensorId)
 }
 
 var typeDict = map[int]string{

cacheData.go

@@ -27,13 +27,14 @@ type expirationInfo struct {
 // CacheWindow
 // 存储大量测点缓存数据
 type CacheWindow struct {
-	Id         string
+	Id          string
-	windowLen  int //窗体长度
+	windowLen   int    //窗体长度
-	WindowSize int //窗体大小
+	WindowSize  int    //窗体大小
-	MethodId   int //滑窗方法
+	MethodId    int    //滑窗方法
-	LatestData any
+	CreatReason string //创建原因
-	ring       *ring.Ring
+	LatestData  any
-	Params     FilterParams
+	ring        *ring.Ring
+	Params      FilterParams
 	//过期控制
 	Expire expirationInfo
 }
@@ -74,17 +75,18 @@ func (c *CacheWindow) MarshalBinary() (data []byte, err error) {
 func (c *CacheWindow) UnmarshalBinary(data []byte) error {
 	return json.Unmarshal(data, c)
 }
-func NewCacheWindow(id string, size, methodId int, params FilterParams) CacheWindow {
+func NewCacheWindow(id string, size, methodId int, params FilterParams, creatReason string) CacheWindow {
 	limit := 10
 	if size > limit {
 		size = 10
 	}
 	return CacheWindow{
-		Id:         id,
+		Id:          id,
-		WindowSize: size,
+		WindowSize:  size,
-		MethodId:   methodId,
+		MethodId:    methodId,
-		ring:       ring.New(size),
+		ring:        ring.New(size),
-		Params:     params,
+		Params:      params,
+		CreatReason: creatReason,
 		Expire: expirationInfo{
 			UpdateTime: time.Now(),
 			Duration:   60 * 2,

esGroupTheme.go

@@ -1,6 +1,9 @@
 package common_models
 
-import "time"
+import (
+	"encoding/json"
+	"time"
+)
 
 // EsGroupTheme 分组主题数据结构体
 type EsGroupTheme struct {
@@ -15,6 +18,19 @@ type EsGroupTheme struct {
 	CreateTime  time.Time          `json:"create_time"`
 }
 
+func (the EsGroupTheme) MarshalJSON() ([]byte, error) {
+	type Alias EsGroupTheme
+	return json.Marshal(&struct {
+		CollectTime string `json:"collect_time"`
+		CreateTime  string `json:"create_time"`
+		*Alias
+	}{
+		CollectTime: the.CollectTime.Format("2006-01-02T15:04:05.000+08:00"),
+		CreateTime:  the.CreateTime.Format("2006-01-02T15:04:05.000+08:00"),
+		Alias:       (*Alias)(&the),
+	})
+}
+
 // 级联测点数据
 type CorrItemData struct {
 	StationId   int                    `json:"station_id"`

esTheme.go

@@ -1,6 +1,9 @@
 package common_models
 
-import "time"
+import (
+	"encoding/json"
+	"time"
+)
 
 type EsTheme struct {
 	SensorName      string         `json:"sensor_name"`
@@ -16,6 +19,19 @@ type EsTheme struct {
 	CreateTime      time.Time      `json:"create_time"`
 }
 
+func (the EsTheme) MarshalJSON() ([]byte, error) {
+	type Alias EsTheme
+	return json.Marshal(&struct {
+		CollectTime string `json:"collect_time"`
+		CreateTime  string `json:"create_time"`
+		*Alias
+	}{
+		CollectTime: the.CollectTime.Format("2006-01-02T15:04:05.000+08:00"),
+		CreateTime:  the.CreateTime.Format("2006-01-02T15:04:05.000+08:00"),
+		Alias:       (*Alias)(&the),
+	})
+}
+
 type EsThemeResp struct {
 	Took     int  `json:"took"`
 	TimedOut bool `json:"timed_out"`