EsTheme JSON序列化时间处理

dbHelper/elasticsearchHelper.go

@@ -30,7 +30,7 @@ func NewESHelper(addresses []string, user, pwd string) *ESHelper {
 	if err != nil {
 		log.Fatalf("Error getting response: %s", err)
 	}
-	log.Printf("链接到es[%s]info=%v", elasticsearch6.Version, res)
+	log.Printf("链接到es[%s]info=%v", elasticsearch6.Version, res.StatusCode)
 	return &ESHelper{
 		addresses: addresses,
 		esClient:  es,
@@ -220,7 +220,7 @@ func (the *ESHelper) Close() {
 func (the *ESHelper) BulkWriteGroup2Es(index string, themes []common_models.EsGroupTheme) {
 	body := strings.Builder{}
 	for _, theme := range themes {
-		source, _ := json.Marshal(theme)
+		source, _ := theme.MarshalJSON() //json.Marshal(theme)
 		_id := common_calc.NameUUIDFromString(fmt.Sprintf("%d-%d", theme.GroupId, theme.CollectTime.UnixMilli()))
 		s := fmt.Sprintf(
 			`{"index": {"_index": "%s","_id": "%s"}}

storage/storageDBs/storage2Es.go

@@ -77,7 +77,7 @@ func (the *Storage2Es) SaveTheme(dataList []common_models.EsTheme) {
 
 	for _, theme := range dataList {
 		//  scala =>    val id = UUID.nameUUIDFromBytes(s"${sd.station.id}-${sd.acqTime.getMillis}".getBytes("UTF-8")).toString
-		source, err := json.Marshal(theme)
+		source, err := theme.MarshalJSON() //json.Marshal(theme)
 		if err != nil {
 			log.Printf("theme序列化异常,err=%s", err.Error())
 			continue
@@ -110,7 +110,11 @@ func (the *Storage2Es) SaveVib(dataList []common_models.EsVbRaw) {
 func (the *Storage2Es) SaveGroupTheme(dataList []common_models.EsGroupTheme) {
 	body := strings.Builder{}
 	for _, theme := range dataList {
-		source, _ := json.Marshal(theme)
+		source, err := theme.MarshalJSON() //json.Marshal(theme)
+		if err != nil {
+			log.Printf("group theme 序列化异常,err=%s", err.Error())
+			continue
+		}
 		_id := common_calc.NameUUIDFromString(fmt.Sprintf("%d-%d", theme.GroupId, theme.CollectTime.UnixMilli()))
 		s := fmt.Sprintf(
 			`{"index": {"_index": "%s","_id": "%s"}}