From 4fec751dd71036aab8e3725ebf302808f78cea86 Mon Sep 17 00:00:00 2001
From: 77 <77@77.com>
Date: Wed, 17 Apr 2024 23:28:20 +0800
Subject: [PATCH] 123

---
 .../com/ruoyi/cai/dto/app/query/index/AnchorListQuery.java  | 3 +++
 .../src/main/java/com/ruoyi/cai/manager/HomeManager.java    | 5 +++++
 ruoyi-cai/src/main/resources/mapper/cai/AnchorMapper.xml    | 6 ++++++
 3 files changed, 14 insertions(+)

diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/AnchorListQuery.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/AnchorListQuery.java
index c561208f..7cc0adee 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/AnchorListQuery.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/AnchorListQuery.java
@@ -18,6 +18,9 @@ public class AnchorListQuery {
     @Schema(description = "类型 0-默认 1-活跃 2-新人 3-同城")
     private Integer type;
 
+    @Schema(hidden = true, description = "是否开启视频接听")
+    private Integer openVideoStatus;
+
     @Schema(description = "城市（同城查询使用）")
     private Integer cityId;
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/HomeManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/HomeManager.java
index 2f518482..6bf2cc7e 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/HomeManager.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/HomeManager.java
@@ -56,6 +56,7 @@ public class HomeManager {
         // 0-默认查询 1-活跃查询 2-新人查询 3-同城查询
         query.setType(0);
         query.setOnlineStatus(1);
+        query.setOpenVideoStatus(1);
         Page<AnchorListVo> app = anchorService.pageApp(pageQuery, query);
         List<AnchorListVo> records = app.getRecords();
         RBucket<List<AnchorListVo>> bucket = redissonClient.getBucket(RedisHttpConstant.HOME_RECOMMEND_REDIS);
@@ -69,6 +70,7 @@ public class HomeManager {
         AnchorListQuery query = new AnchorListQuery();
         // 0-默认查询 1-活跃查询 2-新人查询 3-同城查询
         query.setType(1);
+        query.setOpenVideoStatus(1);
         Page<AnchorListVo> app = anchorService.pageApp(pageQuery, query);
         List<AnchorListVo> records = app.getRecords();
         RBucket<List<AnchorListVo>> bucket = redissonClient.getBucket(RedisHttpConstant.HOME_NEW_REDIS);
@@ -82,6 +84,7 @@ public class HomeManager {
         AnchorListQuery query = new AnchorListQuery();
         // 0-默认查询 1-活跃查询 2-新人查询 3-同城查询
         query.setType(2);
+        query.setOpenVideoStatus(1);
         Page<AnchorListVo> app = anchorService.pageApp(pageQuery, query);
         List<AnchorListVo> records = app.getRecords();
         RBucket<List<AnchorListVo>> bucket = redissonClient.getBucket(RedisHttpConstant.HOME_ACTIVE_REDIS);
@@ -105,6 +108,8 @@ public class HomeManager {
             if(query.getCityId() == null){
                 return Collections.emptyList();
             }
+            query.setOnlineStatus(1);
+            query.setOpenVideoStatus(1);
             return anchorService.pageApp(pageQuery, query).getRecords();
         }
         Collections.shuffle(vos);
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/AnchorMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/AnchorMapper.xml
index ac28b221..7ad847ab 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/AnchorMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/AnchorMapper.xml
@@ -51,9 +51,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.cityId != null and query.cityId != ''">
             and t1.city_id = #{query.cityId}
         </if>
+        <if test="query.cityId != null and query.cityId != ''">
+            and t1.city_id = #{query.cityId}
+        </if>
         <if test="query.onlineStatus != null">
             and t3.status = #{query.onlineStatus}
         </if>
+        <if test="query.openVideoStatus != null">
+            and t2.open_video_status = #{query.openVideoStatus}
+        </if>
         <if test="query.type != null">
             <if test="query.type == 0">
                 order by t2.recommend_status desc,t2.update_time desc