更多推荐预言家列表

huozuan/src/main/java/com/huojutech/controller/weixin/ForecastController.java

@@ -180,15 +180,19 @@ public class ForecastController {
             @ApiParam(value = "预测数排序规则，0-升序  1-降序 (注：无法与priceOrderby、cpOrderby合用)", required = false) @RequestParam(required = false) Integer fnumOrderby,
             @ApiParam(value = "预测成功率排序规则，0-升序  1-降序 (注：无法与frateOrderby、concernOrderby合用))", required = false) @RequestParam(required = false) Integer frateOrderby,
             @ApiParam(value = "被关注数排序规则，0-升序  1-降序 (注：无法与fnumOrderby、fnumOrderby合用))", required = false) @RequestParam(required = false) Integer concernOrderby,
-            @ApiParam(value = "是否是查询订阅的预言家，1-是，null：不是", required = false) @RequestParam(required = false) Integer isSubscribe) throws ParseException {
+            @ApiParam(value = "是否是查询订阅的预言家，1：查询订阅的预言家 ，null：不是", required = false) @RequestParam(required = false) Integer isSubscribe,
+            @ApiParam(value = "更多预言家推荐，1：查询更多预言家推荐 ，null:不查，无法与isSubscribe合用" , required = false) @RequestParam(required = false) Integer recommend) throws ParseException {
         //获取所有的预测人的集合
         Integer sessionId = SessionConstants.getSession();
         List<StockForecast> allForecast = forecastService.findAllForecastUID();
         List<UserConcern> concerns = userConcernService.selectAllConcernCUID(sessionId);
+        List<User> recommondUid = userService.selectRecommondUid();
         List<SeerListDTO> list = new ArrayList<>();
         PageHelper.startPage(page, size);
-        if (isSubscribe!=null){
+        if (isSubscribe!=null && isSubscribe.equals(1)){
             list = forecastService.findAllConcern(concerns, nickName, fnumOrderby, frateOrderby, concernOrderby,stockCode);
+        }else if (recommend!=null && recommend.equals(1)){
+            list = forecastService.findAllRecommend(recommondUid,nickName,fnumOrderby,frateOrderby,concernOrderby,stockCode);
         }else {
             list = forecastService.findAllForecast(allForecast, nickName, fnumOrderby, frateOrderby, concernOrderby,stockCode);
         }

huozuan/src/main/java/com/huojutech/dao/StockForecastMapper.java

@@ -3,6 +3,7 @@ package com.huojutech.dao;
 import com.huojutech.dto.SeerListDTO;
 import com.huojutech.entity.StockForecast;
 import com.huojutech.entity.StockForecastExample;
+import com.huojutech.entity.User;
 import com.huojutech.entity.UserConcern;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -88,4 +89,17 @@ public interface StockForecastMapper {
      * @return
      */
     Integer updateVoteHarvestById(@Param("forecastId") Integer forecastId,@Param("harvest") BigDecimal harvest);
+
+    /**
+     * 更多推荐的预言家列表
+     * @param recommondUid
+     * @param nickName
+     * @param fnumOrderby
+     * @param frateOrderby
+     * @param concernOrderby
+     * @param stockCode
+     * @return
+     */
+    List<SeerListDTO> findAllRecommend(@Param("recommondUid") List<User> recommondUid, @Param("nickName") String nickName, @Param("fnumOrderby") Integer fnumOrderby, @Param("frateOrderby") Integer frateOrderby, @Param("concernOrderby") Integer concernOrderby, @Param("stockCode") String stockCode);
+
 }

huozuan/src/main/java/com/huojutech/dao/UserMapper.java

@@ -59,4 +59,10 @@ public interface UserMapper {
      * @return
      */
     List<User> selectRecommendUser();
+
+    /**
+     * 查看推荐的预言家id
+     * @return
+     */
+    List<User> selectRecommondUid();
 }

huozuan/src/main/java/com/huojutech/service/ForecastService.java

@@ -2,6 +2,7 @@ package com.huojutech.service;
 
 import com.huojutech.dto.SeerListDTO;
 import com.huojutech.entity.StockForecast;
+import com.huojutech.entity.User;
 import com.huojutech.entity.UserConcern;
 
 import java.util.List;
@@ -78,5 +79,17 @@ public interface ForecastService {
      * @return
      */
     List<SeerListDTO> findAllConcern(List<UserConcern> concerns, String nickName, Integer fnumOrderby, Integer frateOrderby, Integer concernOrderby, String stockCode);
+
+    /**
+     * 更多推荐的预言家列表
+     * @param recommondUid
+     * @param nickName
+     * @param fnumOrderby
+     * @param frateOrderby
+     * @param concernOrderby
+     * @param stockCode
+     * @return
+     */
+    List<SeerListDTO> findAllRecommend(List<User> recommondUid, String nickName, Integer fnumOrderby, Integer frateOrderby, Integer concernOrderby, String stockCode);
 }
 

huozuan/src/main/java/com/huojutech/service/Impl/ForecastServiceImpl.java

@@ -6,6 +6,7 @@ import com.huojutech.dto.SeerListDTO;
 import com.huojutech.entity.StockForecast;
 import com.huojutech.entity.StockForecastExample;
 import com.huojutech.entity.StockForecastExample.Criteria;
+import com.huojutech.entity.User;
 import com.huojutech.entity.UserConcern;
 import com.huojutech.service.ForecastService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,5 +81,10 @@ public class ForecastServiceImpl implements ForecastService {
     public List<SeerListDTO> findAllConcern(List<UserConcern> concerns, String nickName, Integer fnumOrderby, Integer frateOrderby, Integer concernOrderby, String stockCode) {
         return stockForecastMapper.selectAllConcern(concerns,nickName,fnumOrderby,frateOrderby,concernOrderby,stockCode);
     }
+
+    @Override
+    public List<SeerListDTO> findAllRecommend(List<User> recommondUid, String nickName, Integer fnumOrderby, Integer frateOrderby, Integer concernOrderby, String stockCode) {
+        return stockForecastMapper.findAllRecommend(recommondUid,nickName,fnumOrderby,frateOrderby,concernOrderby,stockCode);
+    }
 }
 

huozuan/src/main/java/com/huojutech/service/Impl/UserServiceImpl.java

@@ -102,4 +102,9 @@ public class UserServiceImpl implements UserService{
         return userMapper.selectRecommendUser();
     }
 
+    @Override
+    public List<User> selectRecommondUid() {
+        return userMapper.selectRecommondUid();
+    }
+
 }

huozuan/src/main/java/com/huojutech/service/UserService.java

@@ -75,4 +75,10 @@ public interface UserService {
      * @return
      */
     List<User> selectRecommendUser();
+
+    /**
+     * 查出被推荐的预言家列表
+     * @return
+     */
+    List<User> selectRecommondUid();
 }

huozuan/src/main/resources/mappers/StockForecastMapper.xml

@@ -440,6 +440,47 @@
       </choose>
     </trim>
   </select>
+
+
+  <!--更多预言家推荐-->
+  <select id="findAllRecommend" resultMap="seerMap">
+    select distinct a.id,a.nickname,a.avatar,a.forecast_rate_success,a.fnum,a.cnum from user a
+    left join stock_forecast b on a.id = b.uid
+    left join user_concern c on a.id=c.uid
+    <trim prefix="WHERE" prefixOverrides="AND|OR" >
+      <if test="recommondUid != null and recommondUid.size() > 0">
+        <foreach collection="recommondUid" open="a.id in (" separator="," close=")" item="uid">
+          #{uid}
+        </foreach>
+      </if>
+      <if test="nickName != null and nickName != ''">
+        AND (a.nickName like CONCAT('%',#{nickName},'%'))
+      </if>
+      <if test="stockCode != null and stockCode != ''">
+        AND (b.stock_code =#{stockCode})
+      </if>
+
+    </trim>
+
+    <trim prefix="ORDER BY" prefixOverrides="," >
+      <choose>
+        <when test="fnumOrderby == 0"> a.fnum ASC,a.id asc</when>
+        <when test="fnumOrderby == 1"> a.fnum DESC,a.id asc</when>
+        <otherwise></otherwise>
+      </choose>
+      <choose>
+        <when test="frateOrderby == 0">,a.forecast_rate_success ASC,a.id asc</when>
+        <when test="frateOrderby == 1">,a.forecast_rate_success DESC,a.id asc</when>
+        <otherwise></otherwise>
+      </choose>
+      <choose>
+        <when test="concernOrderby == 0">,a.cnum ASC,a.id asc</when>
+        <when test="concernOrderby == 1">,a.cnum DESC,a.id asc</when>
+        <otherwise></otherwise>
+      </choose>
+    </trim>
+  </select>
+
   <!-- 简单对象 -->
   <resultMap type="com.huojutech.dto.SeerListDTO" id="seerMap">
     <result column="id" property="id"/>

huozuan/src/main/resources/mappers/UserMapper.xml

@@ -358,4 +358,9 @@
   <select id="selectRecommendUser" resultMap="BaseResultMap">
     select id,nickname,avatar,forecast_rate_success from user where recommend!=0 order by  recommend asc,id asc limit 0,3
   </select>
+
+  <!--查询被推荐预言家id-->
+  <select id="selectRecommondUid" resultType="Integer">
+    select id from user where recommend!=0 order by  recommend asc,id asc
+  </select>
 </mapper>