Merge branch 'dev' of https://gitea.anxinyun.cn/lucas2/goUpload into dev

consumers/consumerAXYES2GDJKJC.go

@@ -182,7 +182,7 @@ func (the *consumerAXYES2GDJKJC) GetEs10minAggData() {
 	//utils.GetTimeRangeBy10min() 由于振动数据实时性问题 改用一小时统一上报
 	start, end := utils.GetTimeRangeByHour(-1)
 	log.Printf("查询10min数据时间范围 %s - %s", start, end)
-	factorIds := []int{28} //桥面振动 28
+	factorIds := []int{28, 25} //桥面振动 28  桥墩振动25
 	structIds := the.getStructIdsByBridge()
 	for _, structId := range structIds {
 		for _, factorId := range factorIds {