Merge branch 'develop' of 192.168.3.17:zhanghongbo/qfw into develop

core/src/qfw/manage/auditing.go

@@ -86,7 +86,6 @@ func (s *SystemManage) Countlist() {
 	compareafter := s.GetString("compareafter")
 	comparetype := s.GetString("comparetype")
 	checked := s.GetString("checked")
-
 	if comparetype != "nfish" {
 		//第一条图标数据
 		t1, _ := time.ParseInLocation("2006-01-02 15:04:05", timebefore+" 00:00:00", time.Local)
@@ -108,51 +107,74 @@ func (s *SystemManage) Countlist() {
 		t1, _ := time.ParseInLocation("2006-01-02 15:04:05", timebefore+" 00:00:00", time.Local)
 		t2, _ := time.ParseInLocation("2006-01-02 15:04:05", timeafter+" 00:00:00", time.Local)
 		condition := M{"l_date": M{"$gte": t1.Unix(), "$lte": t2.Unix()}}
-		timers := *Find("web_viewcount", condition, `{"l_date": 1}`, `{"l_date":1,"i_viewcount":1}`, false, -1, -1)
+		timers := *Find("web_viewcount", condition, `{"l_date": 1}`, nil, false, -1, -1)
 		ns := make([]map[string]interface{}, 0)
+		ns2 := make([]map[string]interface{}, 0)
 		for _, v := range timers {
 			var tmp = make(map[string]interface{})
 			tmp["_id"] = v["_id"]
 			tmp["intime"] = v["l_date"]
 			tmp["nfish"] = v["i_viewcount"]
+			if tmp["nfish"] == nil {
+				tmp["nfish"] = "0"
+			}
 			ns = append(ns, tmp)
 		}
-		log.Println(ns)
-		s.ServeJson(M{"t": ns, "c": "[]"})
+		for _, v := range timers {
+			var tmp = make(map[string]interface{})
+			tmp["_id"] = v["_id"]
+			tmp["intime"] = v["l_date"]
+			tmp["nfish"] = v["i_nviewcount"]
+			if tmp["nfish"] == nil {
+				tmp["nfish"] = "0"
+			}
+			ns2 = append(ns2, tmp)
+		}
+		s.ServeJson(M{"t": ns, "c": ns2})
 	}
 }
 
 func (s *SystemManage) Count() {
 	rs := *Find("tj", nil, `{"intime": 0}`, nil, false, 0, 1)
 	//获取关键词
-	msg := *Find("user", `{"o_msgset":{"$exists":true}}`, nil, `{"o_msgset":1}`, false, -1, -1)
+	msg := *Find("user", `{"$or":[{"o_msgset":{"$exists":true}},{"o_jy":{"$exists":true}}]}`, nil, `{"o_msgset":1,"o_jy":1}`, false, -1, -1)
 	msgcount := 0
-	tenderarr := make(map[string]int)
-	bidarr := make(map[string]int)
+	keys := map[string]int{}
 	for _, v := range msg {
-		obj := v["o_msgset"].(map[string]interface{})
-		if obj["tender"] != nil {
-			tender := obj["tender"].(map[string]interface{})
-			if tender["a_key"] != nil {
-				arr := tender["a_key"].([]interface{})
-				for _, v := range arr {
-					vs := v.(string)
-					tenderarr[vs] = tenderarr[vs] + 1
+		if v["o_msgset"] != nil {
+			obj := v["o_msgset"].(map[string]interface{})
+			if obj["tender"] != nil {
+				tender := obj["tender"].(map[string]interface{})
+				if tender["a_key"] != nil {
+					arr := tender["a_key"].([]interface{})
+					for _, v := range arr {
+						vs := v.(string)
+						keys[vs] = keys[vs] + 1
+					}
 				}
 			}
-		}
-		if obj["bid"] != nil {
-			bid := obj["bid"].(map[string]interface{})
-			if bid["a_key"] != nil {
-				arr := bid["a_key"].([]interface{})
-				for _, v := range arr {
-					vs := v.(string)
-					bidarr[vs] = bidarr[vs] + 1
+
+			if obj["bid"] != nil {
+				bid := obj["bid"].(map[string]interface{})
+				if bid["a_key"] != nil {
+					arr := bid["a_key"].([]interface{})
+					for _, v := range arr {
+						vs := v.(string)
+						keys[vs] = keys[vs] + 1
+					}
 				}
 			}
 		}
+		if v["o_jy"] != nil {
+			obj := v["o_jy"].(map[string]interface{})
+			jykeys := obj["a_key"].([]interface{})
+			for _, v := range jykeys {
+				vs := v.(string)
+				keys[vs] = keys[vs] + 1
+			}
+		}
 	}
-	msgcount = len(tenderarr) + len(bidarr)
+	msgcount = len(keys)
 	servicemap := make(map[string]interface{})
 	if len(rs) != 0 {
 		rsOne := rs[0]
@@ -181,8 +203,7 @@ func (s *SystemManage) Count() {
 		}
 		s.T["rs"] = rsOne
 		s.T["msgcount"] = msgcount
-		s.T["tender"] = tenderarr
-		s.T["bid"] = bidarr
+		s.T["keys"] = keys
 		s.T["servicename"] = servicemap
 	}
 	s.Render("/manage/tj.html")

core/src/web/staticres/js/chart.js

@@ -36,17 +36,26 @@ function setOptions(rs){
 				"type":"line",
 				"data":rs.yData[0]			//此处为纵坐标值	
 				};
+		var name=$(me).text()+"(对比)";
+		if($(me).text()== "剑鱼用户(活跃)"){
+			name="(新)剑鱼用户(活跃)";
+		}
 		var s2={
-				"name":$(me).text()+"(对比)",
+				"name":name,
 				"type":"line",
 				"data":rs.yData[1]			//此处为纵坐标值	
 			};
 		xAxis.push(x1);
 		series.push(s1);
-		if(check.prop("checked")&& rs.xData1.length>0) {
+		if(check.prop("checked")&& rs.xData1.length>0 || $(me).text()== "剑鱼用户(活跃)") {
 			xAxis.push(x2);
 			series.push(s2);
-			legend.push($(me).text()+"(对比)");
+			if ($(me).text()== "剑鱼用户(活跃)"){
+				legend.push("(新)剑鱼用户(活跃)");
+			}else{
+				legend.push($(me).text()+"(对比)");
+			}
+			
 		}
 		 option = {
 			tooltip : {
@@ -74,6 +83,11 @@ function setOptions(rs){
 }
 function loadData(me){
 	if(me){
+		if($(me).text()=="剑鱼用户(活跃)"){
+			$("#comparecheck").parent().hide();
+		}else{
+			$("#comparecheck").parent().show();
+		}
 		$("#comparetype").val($(me).attr("id"));
 	}
 	var data={};

core/src/web/templates/manage/tj.html

@@ -110,7 +110,7 @@
 						</tr>
 						<tr>
 							<td></td>
-							<td>剑鱼：<span class="number">{{.T.rs.sfish}}</span> &nbsp;&nbsp;<a  href="javascript:void(0);" onclick="controlShowOrHide(this)" value="用户订阅详细" data-set="countfish">用户订阅详细</a></td>
+							<td>剑鱼：<span class="number"><script>document.write({{.T.rs.snfish}}+{{.T.rs.sfish}});</script></span> &nbsp;&nbsp;</td>
 							<td>订阅关键词：<span class="number">{{.T.msgcount}}</span>,<a href="javascript:void(0);" onclick="controlShowOrHide(this)" value="关键词汇总表" data-set="f-keytable">关键词汇总表</a></td>
 							<td></td>
 							<td></td>
@@ -123,23 +123,10 @@
 				</div>
 				<div class="showtop f-keytable lm" style="margin-top:20px;display:none;">
 					<div style="text-align:right;margin-bottom:10px;color:#ff5a5f;">
-						招标订阅关键字
+						订阅关键字
 					</div>
 					<ul>
-						{{range $k,$v:=.T.tender}}
-							<li>
-							{{$k}}(<span>{{$v}}</span>)
-							</li>
-						{{end}}
-					</ul>
-					<div style="clear:both;">
-						<hr />
-					</div>
-					<div style="text-align:right;margin-bottom:10px;color:#ff5a5f;">
-						中标订阅关键字
-					</div>
-					<ul>
-						{{range $k,$v:=.T.bid}}
+						{{range $k,$v:=.T.keys}}
 							<li>
 							{{$k}}(<span>{{$v}}</span>)
 							</li>