Merge branch 'dev2.0' of 192.168.3.17:qmx/jy into dev2.0

src/jfw/modules/followent/src/followent/followent.go

@@ -2,7 +2,6 @@ package followent
 
 import (
 	"config"
-	"fmt"
 	"log"
 	"qfw/util"
 	"qfw/util/elastic"
@@ -12,6 +11,7 @@ import (
 	"tools"
 
 	"github.com/go-xweb/xweb"
+	"jfw/jylabutil"
 )
 
 var mongodb = tools.MQFW
@@ -34,14 +34,6 @@ func init() {
 
 func (f *FollowEnt) EntList() error {
 	defer util.Catch()
-	//var entArr = make([]map[string]string, 0)
-	//for i := 0; i < 10; i++ {
-	//	entMap := make(map[string]string)
-	//	entMap["s_projectname"] = "计算机" + strconv.Itoa(i+1)
-	//	entMap["l_lastpushtime"] = strconv.FormatInt(1501546210, 10)
-	//	entArr = append(entArr, entMap)
-	//}
-	//f.T["datas"] = entArr
 	f.T["followLimit"] = config.Sysconfig["followentlimit"]
 	datas, ok := mongodb.Find("jylab_followent", `{"s_userid":"`+f.GetSession("userId").(string)+`","s_entname":{$ne:""}}`, `{"l_createtime":-1}`, `{"_id":1,"s_entname":1,"s_userid":1,"s_openid":1,"l_createtime":1,"s_id":1,"i_ispush":1}`, false, 0, 10)
 	f.T["flag"] = false
@@ -60,25 +52,17 @@ func (f *FollowEnt) AddEnt() error {
 }
 
 func (f *FollowEnt) RecList() {
-	fmt.Println("entName", f.GetString("entName"))
 	var entName = f.GetString("entName")
-	if entName != "" {
-		limit, _ := strconv.Atoi(config.Sysconfig["recommendEntLimit"].(string))
-		r := elastic.GetPage("winner", "winner", `{"winner":"`+entName+`"}`, ``, `"_id","winner"`, 0, limit)
-		if r != nil && len(*r) != 0 {
-			fmt.Println("RecList", r)
-			for _, v := range *r {
-				v["_id"] = util.EncodeArticleId2ByCheck(v["_id"].(string))
-			}
-			f.ServeJson(map[string]interface{}{
-				"recList": r,
-			})
+	limit,_ := strconv.Atoi(config.Sysconfig["recommendEntLimit"].(string))
+	re := jylabutil.GetEenNameImmediate(entName,limit)
+	if re!=nil && len(re) != 0{
+		for _, v := range re {
+			v["_id"] = util.EncodeArticleId2ByCheck(v["_id"].(string))
 		}
+		f.ServeJson(map[string]interface{}{
+			"recList": re,
+		})
 	}
-	//var recArr [10]string
-	//for i := 0; i < len(recArr); i++ {
-	//	recArr[i] = "河南省凯陆电子科技有限公司" + strconv.Itoa(i+1)
-	//}
 }
 
 func (f *FollowEnt) SaveEnt() {

src/jfw/modules/followent/src/web/templates/weixin/add.html

@@ -33,6 +33,9 @@
 		line-height: 35px;
 		font-size: 13px;
 	}
+.highLight{
+    color: #2cb7ca;
+}
 </style>
 <script type="text/javascript">
 	var winner_id = "";
@@ -89,19 +92,19 @@
         });
     });
 
-	function getRecList(entName) {
+	function getRecList(entName_key) {
 		$("#recList").html("");
-		$.post("/jylab/followent/recList",{entName:entName},function(r){
+		$.post("/jylab/followent/recList",{entName:entName_key},function(r){
 			if(r){
 				if(typeof (r.recList)!="undefined"){
 					var recList = r.recList;
 					for(var i=0;i<recList.length;i++){
-					    var entName = recList[i].winner;
+					    var entName = recList[i].name;
 					    var id = recList[i]._id;
 						if(entName!="" && entName.length>20){
 							entName = entName.substr(0,20)+"...";
 						}
-						var obj=$("<div class='rec' data-id='"+id+"'>"+entName+"</div>");
+						var obj=$("<div class='rec' data-id='"+id+"'>"+entName.replace(entName_key,"<span class='highLight'>"+entName_key+"</span>")+"</div>");
 						$("#recList").append(obj);
 					}
 				}