diff --git a/adaptors/安心云es主题特征to广东省平台.go b/adaptors/安心云es主题特征to广东省平台.go index 9e507a5..543629a 100644 --- a/adaptors/安心云es主题特征to广东省平台.go +++ b/adaptors/安心云es主题特征to广东省平台.go @@ -78,11 +78,6 @@ func (the Adaptor_AXYES_GDJKJC) EsAggTopToGDJKJC(structId int, factorId int, esA } dataBytes := the.EsAgg2StatisticData(factorId, monitorCode, dateBucket) - //dataDefinition := &protoFiles_hb.DataDefinition{ - // DataType: protoFiles_hb.DataType_STATISTICS, - // UniqueCode: fmt.Sprintf("%d", uniqueCode), //乃积沟大桥 - // DataBody: the.EsAgg2StatisticData(factorId, monitorCode, dateBucket), - //} result = append(result, dataBytes) log.Printf("[s:%d,f:%d] t=%s, 特征数据=> %s", structId, factorId, dateBucket.KeyAsString, dataBytes) } diff --git a/configFiles/config_安心云测点特征数据_广东省平台.yaml b/configFiles/config_安心云测点特征数据_广东省平台.yaml index aa6e023..adabac3 100644 --- a/configFiles/config_安心云测点特征数据_广东省平台.yaml +++ b/configFiles/config_安心云测点特征数据_广东省平台.yaml @@ -11,7 +11,7 @@ monitor: #振动是触发式,数据迟缓 cron10min也改成1小时一次 最多上报6条,不进行10min实时上报 cron10min: 25 0/1 * * * #6/10 * * * * #普通类型 特征数据 - cron1hour: 28 0/1 * * * + cron1hour: 53 0/1 * * * info: 5450: #隆江大桥 appKey: db43bc5d74534348 @@ -22,7 +22,6 @@ info: 5456: #螺河东大桥 appKey: d20477c3247b4012 appSecret: 3d9bfb809be545bba11af17a88c81eb3 - queryComponent: redis: address: 10.8.30.160:30379 diff --git a/consumers/consumerAXYES2GDJKJC.go b/consumers/consumerAXYES2GDJKJC.go index 5895a21..261b9ad 100644 --- a/consumers/consumerAXYES2GDJKJC.go +++ b/consumers/consumerAXYES2GDJKJC.go @@ -140,7 +140,7 @@ func (the *consumerAXYES2GDJKJC) getStructIdsBySlope() []int { func (the *consumerAXYES2GDJKJC) getEs1HourAggData() { start, end := utils.GetTimeRangeByHour(-1) log.Printf("查询数据时间范围 %s - %s", start, end) - hourFactorIds := []int{15} //[]int{11, 15, 18, 20} //应变11 桥墩倾斜15 裂缝监测18 支护结构变形63 + hourFactorIds := []int{11, 15, 18, 63} //应变11 桥墩倾斜15 裂缝监测18 支护结构变形63 structIds := the.getStructIdsByBridge() the.handlerHourAggData(start, end, "bridge", structIds, hourFactorIds) } diff --git a/utils/anxinyunEsAggQuery.go b/utils/anxinyunEsAggQuery.go index 086a674..57f298c 100644 --- a/utils/anxinyunEsAggQuery.go +++ b/utils/anxinyunEsAggQuery.go @@ -32,7 +32,7 @@ func GetEsAggSubSqlByAxyFactorId(factorId int) string { } } }` - case 15: + case 15, 63: subAggSQl = ` { "x": {