|
@@ -123,6 +123,7 @@ func (t *T) task() {
|
|
|
countComptetQuery2 := es.NewBoolQuery().Must(rangeQuery).Filter(es.NewTermQuery("site", "中国招标与采购网"))
|
|
|
countComptetQuery3 := es.NewBoolQuery().Must(rangeQuery).Filter(es.NewTermQuery("site", "北京隆道网络科技有限公司"))
|
|
|
countComptetQuery4 := es.NewBoolQuery().Must(rangeQuery).Filter(es.NewTermQuery("site", "友云采"))
|
|
|
+ countComptetQuery5 := es.NewBoolQuery().Must(rangeQuery).Filter(es.NewTermQuery("site", "标800"))
|
|
|
|
|
|
es2 := elastic.Elastic{S_esurl: esAddr2, I_size: 2, Username: username, Password: password}
|
|
|
es2.InitElasticSize()
|
|
@@ -140,6 +141,9 @@ func (t *T) task() {
|
|
|
countComptet3 := int(es2.Count(esIndex, countComptetQuery3))
|
|
|
//友云采
|
|
|
countComptet4 := int(es2.Count(esIndex, countComptetQuery4))
|
|
|
+ //标800
|
|
|
+ countComptet5 := int(es2.Count(esIndex, countComptetQuery5))
|
|
|
+
|
|
|
countNew := int(es3.Count(esIndex3, countQuery)) //华为云 新集群
|
|
|
log.Println("count", count)
|
|
|
log.Println("count1", count1)
|
|
@@ -201,14 +205,16 @@ func (t *T) task() {
|
|
|
var competCount2 int
|
|
|
var competCount3 int
|
|
|
var competCount4 int
|
|
|
+ var competCount5 int
|
|
|
competeReal1 := 0
|
|
|
competeReal2 := 0
|
|
|
competeReal3 := 0
|
|
|
competeReal4 := 0
|
|
|
+ competeReal5 := 0
|
|
|
|
|
|
query := sess.DB(fs[3]).C(fs[4]).Find(mq).Select(fd).Iter()
|
|
|
for tmp := make(map[string]interface{}); query.Next(tmp); count2++ {
|
|
|
- if util.ObjToString(tmp["site"]) == "元博网(采购与招标网)" || util.ObjToString(tmp["site"]) == "中国招标与采购网" || util.ObjToString(tmp["site"]) == "北京隆道网络科技有限公司" || util.ObjToString(tmp["site"]) == "友云采" {
|
|
|
+ if util.ObjToString(tmp["site"]) == "元博网(采购与招标网)" || util.ObjToString(tmp["site"]) == "中国招标与采购网" || util.ObjToString(tmp["site"]) == "北京隆道网络科技有限公司" || util.ObjToString(tmp["site"]) == "友云采" || util.ObjToString(tmp["site"]) == "标800" {
|
|
|
count4++
|
|
|
if util.ObjToString(tmp["site"]) == "元博网(采购与招标网)" {
|
|
|
competCount1++
|
|
@@ -222,6 +228,9 @@ func (t *T) task() {
|
|
|
if util.ObjToString(tmp["site"]) == "友云采" {
|
|
|
competCount4++
|
|
|
}
|
|
|
+ if util.ObjToString(tmp["site"]) == "标800" {
|
|
|
+ competCount5++
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
if util.IntAll(tmp["extracttype"]) != -1 && util.ObjToString(tmp["sensitive"]) != "测试" && util.IntAll(tmp["dataging"]) != 1 && util.Float64All(tmp["infoformat"]) != 3 {
|
|
@@ -283,7 +292,7 @@ func (t *T) task() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if util.ObjToString(tmp["site"]) == "元博网(采购与招标网)" || util.ObjToString(tmp["site"]) == "中国招标与采购网" || util.ObjToString(tmp["site"]) == "北京隆道网络科技有限公司" || util.ObjToString(tmp["site"]) == "友云采" {
|
|
|
+ if util.ObjToString(tmp["site"]) == "元博网(采购与招标网)" || util.ObjToString(tmp["site"]) == "中国招标与采购网" || util.ObjToString(tmp["site"]) == "北京隆道网络科技有限公司" || util.ObjToString(tmp["site"]) == "友云采" || util.ObjToString(tmp["site"]) == "标800" {
|
|
|
count5++
|
|
|
if util.ObjToString(tmp["site"]) == "元博网(采购与招标网)" {
|
|
|
competeReal1++
|
|
@@ -297,6 +306,9 @@ func (t *T) task() {
|
|
|
if util.ObjToString(tmp["site"]) == "友云采" {
|
|
|
competeReal4++
|
|
|
}
|
|
|
+ if util.ObjToString(tmp["site"]) == "标800" {
|
|
|
+ competeReal5++
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -331,7 +343,8 @@ func (t *T) task() {
|
|
|
addTableRow(&reportBuilder, "中国招标与采购网", countComptet2, competeReal2, competeReal2-countComptet2, competCount2)
|
|
|
addTableRow(&reportBuilder, "北京隆道网络科技有限公司", countComptet3, competeReal3, competeReal3-countComptet3, competCount3)
|
|
|
addTableRow(&reportBuilder, "友云采", countComptet4, competeReal4, competeReal4-countComptet4, competCount4)
|
|
|
- addTableRow(&reportBuilder, "华为云es集群", countNew, count3, count3-countNew, 0)
|
|
|
+ addTableRow(&reportBuilder, "标800", countComptet5, competeReal5, competeReal5-countComptet5, competCount5)
|
|
|
+ addTableRow(&reportBuilder, "华为云es集群", countNew, count3, count3-countNew, count2)
|
|
|
// 结束表格
|
|
|
reportBuilder.WriteString("</table>")
|
|
|
// 获取最终的报告字符串
|