Merge branch 'f-6.6.9' of 192.168.10.6:caosy/fun-golf-service into f-6.6.9

src/main/java/com/ctrip/fun/golf/api/app/RecommendStaticController.java

+package com.ctrip.fun.golf.api.app;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.ctrip.fun.common.core.util.StringUtils;
+import com.ctrip.fun.common.vo.Request;
+import com.ctrip.fun.common.vo.Response;
+import com.ctrip.fun.common.vo.ResponseStatusEnum;
+import com.ctrip.fun.common.vo.app.AppClientVersionBean;
+import com.ctrip.fun.common.vo.app.AppVersionAllBean;
+import com.ctrip.fun.common.vo.app.AppVersionBean;
+import com.ctrip.fun.common.vo.app.H5VersionBean;
+import com.ctrip.fun.common.vo.user.RecommendRankBean;
+import com.ctrip.fun.golf.dao.user.UserExtDao;
+import com.ctrip.fun.golf.service.app.AppVersionService;
+import com.ctrip.fun.golf.service.app.H5VersionService;
+import com.ctrip.fun.golf.service.user.UserService;
+
+/**
+ * Created by simon on 7/11/14.
+ */
+@Controller
+@RequestMapping(value = "/recommend/static")
+public class RecommendStaticController {
+
+	private static Logger logger = LoggerFactory.getLogger(RecommendStaticController.class);
+
+
+	@Autowired
+	private UserService UserService = null;
+
+	@Autowired
+	private H5VersionService h5VersionService = null;
+
+	@ResponseBody
+	@RequestMapping(value = "/ranking", method = RequestMethod.POST)
+	public Response<List<RecommendRankBean>> getRanking() {
+
+		Response<List<RecommendRankBean>> response = new Response<List<RecommendRankBean>>();
+		List<RecommendRankBean> rankingList = new ArrayList<RecommendRankBean>();
+		
+
+		// 查询数据库最新版本的App
+		 rankingList = UserService.getRanking();
+		 response.setBody(rankingList);
+		return response;
+	}
+
+
+}

src/main/java/com/ctrip/fun/golf/dao/user/UserExtDao.java

@@ -14,13 +14,16 @@ import java.util.regex.Pattern;
 import org.hibernate.Criteria;
 import org.hibernate.Hibernate;
 import org.hibernate.Query;
+import org.hibernate.SQLQuery;
 import org.hibernate.Session;
 import org.hibernate.criterion.CriteriaSpecification;
 import org.hibernate.criterion.MatchMode;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Projections;
 import org.hibernate.criterion.Restrictions;
+import org.hibernate.transform.ResultTransformer;
 import org.hibernate.transform.Transformers;
+import org.hibernate.type.StandardBasicTypes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.CollectionUtils;
@@ -38,6 +41,7 @@ import com.ctrip.fun.common.vo.basic.VipGradeEnum;
 import com.ctrip.fun.common.vo.integral.IntegralReportBean;
 import com.ctrip.fun.common.vo.order.EventCustomerInfoBean;
 import com.ctrip.fun.common.vo.user.ImUserBean;
+import com.ctrip.fun.common.vo.user.RecommendRankBean;
 import com.ctrip.fun.common.vo.user.RecommendUserItemBean;
 import com.ctrip.fun.common.vo.user.RecommendUserListQuery;
 import com.ctrip.fun.common.vo.user.SimpleUser;
@@ -985,11 +989,8 @@ public class UserExtDao extends GenericHibernateDao<UserExt, Integer> {
      * 获取简易的用户信息
      * 
      * @param extId
-<<<<<<< HEAD
      * @return userExt 表的 username
-=======
      * @return
->>>>>>> f-decoup
      */
     public SimpleUser getSimpleUser1(Integer extId) {
         if (extId == null || extId < 1) {
@@ -1220,5 +1221,16 @@ public class UserExtDao extends GenericHibernateDao<UserExt, Integer> {
         query.setParameter("extID", id);
         return query.executeUpdate();
 	}
+
+	public List<RecommendRankBean> getRanking() {
+		String sql = " SELECT a.inviterUid,b.userName as inviterUserName, COUNT(a.miniAppOpenId)  AS myNum FROM bsc_userext a LEFT JOIN bsc_userext b ON a.inviterUid = b.uid  where a.inviterUid is not null GROUP BY a.inviterUid  ORDER BY COUNT(a.miniAppOpenId) DESC ";
+        Query query = getSession().createSQLQuery(sql)
+        		.addScalar("inviterUid", StandardBasicTypes.STRING)
+				.addScalar("inviterUserName", StandardBasicTypes.STRING)
+				.addScalar("myNum", StandardBasicTypes.INTEGER)
+        		.setResultTransformer(Transformers.aliasToBean(RecommendRankBean.class));
+        List<RecommendRankBean> rankingBeanList = query.list();
+		return rankingBeanList;
+	}
 	
 }

src/main/java/com/ctrip/fun/golf/service/user/UserService.java

@@ -79,6 +79,7 @@ import com.ctrip.fun.common.vo.user.LoginBean;
 import com.ctrip.fun.common.vo.user.LoginResultBean;
 import com.ctrip.fun.common.vo.user.MiniAppLoginBean;
 import com.ctrip.fun.common.vo.user.MiniAppLoginResultBean;
+import com.ctrip.fun.common.vo.user.RecommendRankBean;
 import com.ctrip.fun.common.vo.user.RecommendUserItemBean;
 import com.ctrip.fun.common.vo.user.RecommendUserListQuery;
 import com.ctrip.fun.common.vo.user.RegisterBean;
@@ -3174,6 +3175,12 @@ public class UserService {
 	        AlgorithmParameters params = AlgorithmParameters.getInstance("AES");
 	        params.init(new IvParameterSpec(iv));
 	        return params;
+	}
+
+	public List<RecommendRankBean> getRanking() {
+		List<RecommendRankBean> rankingList = userExtDao.getRanking();
+		
+		return rankingList;
 	}	
 
 }