diff --git a/configFiles/config_承德金隅水泥_河北矿山_冀东承德.json b/configFiles/config_承德金隅水泥_河北矿山_冀东承德.json new file mode 100644 index 0000000..6a3647e --- /dev/null +++ b/configFiles/config_承德金隅水泥_河北矿山_冀东承德.json @@ -0,0 +1,33 @@ +{ + "consumer": "consumerCDJYSN", + "ioConfig": { + "in": { + "http": { + "url": "http://117.89.29.14:39200/axy_themes/_search" + }, + "cronStr": "01 0/1 * * *" + }, + "out": { + "file": { + "directory": "G:\\工作记录\\每月任务需求\\202402需求\\河北矿山数据本地数据工具开发\\saveTxts2", + "fileNameExtension": ".txt" + } + } + }, + "info": { + "structureId": "4326", + "structUploadCode": "130821030006", + "fileNamePrefix": "130821030006_LTCDSS", + "fileContentHeader": "130821030006;承德冀东水泥股份有限公司石灰石矿;" + }, + "sensorMap": { + "GnssSensorMap": { + "BMWY_G1": "100001", + "BMWY_G2": "100002", + "BMWY_G3": "100003" + }, + "RainSensorMap": { + "JYL": "200001" + } + } +} \ No newline at end of file diff --git a/configFiles/config_安心云深基坑数据上报.yaml b/configFiles/弃用备份/config_安心云深基坑数据上报.yaml similarity index 100% rename from configFiles/config_安心云深基坑数据上报.yaml rename to configFiles/弃用备份/config_安心云深基坑数据上报.yaml diff --git a/configFiles/config_承德金隅水泥_河北矿山_冀东唐山.json b/configFiles/弃用备份/config_承德金隅水泥_河北矿山_冀东唐山.json similarity index 98% rename from configFiles/config_承德金隅水泥_河北矿山_冀东唐山.json rename to configFiles/弃用备份/config_承德金隅水泥_河北矿山_冀东唐山.json index ec2f07e..f52310c 100644 --- a/configFiles/config_承德金隅水泥_河北矿山_冀东唐山.json +++ b/configFiles/弃用备份/config_承德金隅水泥_河北矿山_冀东唐山.json @@ -5,7 +5,7 @@ "http": { "url": "https://tools.anxinyun.cn/iot/es-router/anxincloud_themes/_search" }, - "cronStr": "39 0/1 * * *" + "cronStr": "04 0/1 * * *" }, "out": { "file": { diff --git a/configFiles/config_爆闪es数据上报http.yaml b/configFiles/弃用备份/config_爆闪es数据上报http.yaml similarity index 100% rename from configFiles/config_爆闪es数据上报http.yaml rename to configFiles/弃用备份/config_爆闪es数据上报http.yaml diff --git a/consumers/consumerCDJYSN.go b/consumers/consumerCDJYSN.go index 450aa29..7c4ce49 100644 --- a/consumers/consumerCDJYSN.go +++ b/consumers/consumerCDJYSN.go @@ -301,9 +301,9 @@ func (the *consumerCDJYSN) getEsData() { } } `, structureId, start, end) - auth := map[string]string{"Authorization": "Basic YWRtaW46RnJlZXN1bl8xMjM="} - //the.InHttp.HttpClient.SetAuth("admin", "Freesun_123") - esAggResult := the.InHttp.HttpClient.HttpGetWithHeader(esQuery, auth) + //auth := map[string]string{"Authorization": "Basic YWRtaW46cV4hNXV5WEY1c2JJ"} + the.InHttp.HttpClient.SetAuth("admin", "q^!5uyXF5sbI") + esAggResult := the.InHttp.HttpClient.HttpGet(esQuery) var needPush []byte adaptor := the.getAdaptor() diff --git a/models/EsAggTop.go b/models/EsAggTop.go index 9fa81cb..e773d30 100644 --- a/models/EsAggTop.go +++ b/models/EsAggTop.go @@ -36,7 +36,7 @@ type EsAggTop struct { Failed int `json:"failed"` } `json:"_shards"` Hits struct { - Total int `json:"total"` + //Total int `json:"total"` MaxScore float64 `json:"max_score"` } `json:"hits"` Aggregations struct { @@ -53,8 +53,8 @@ type Bucket struct { DocCount int `json:"doc_count"` Last struct { Hits struct { - Total int `json:"total"` - Hits []struct { + //Total int `json:"total"` + Hits []struct { Index string `json:"_index"` Type string `json:"_type"` Id string `json:"_id"`