修改

src/main/java/fcb/project/manager/base/dao/TmHouseDao.java

@@ -1,7 +1,10 @@
 package fcb.project.manager.base.dao;
 
-import fcb.project.manager.base.entity.TmHouse;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import fcb.project.manager.base.entity.TmHouse;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface TmHouseDao extends BaseMapper<TmHouse> {
 
+    IPage<TmHouse> getHousePageWithCount(IPage<TmHouse> page ,
+                                                @Param("ew") LambdaQueryWrapper<TmHouse> queryWrapper);
 }

src/main/java/fcb/project/manager/base/entity/TmHouse.java

@@ -145,4 +145,7 @@ public class TmHouse implements Serializable {
     @ApiModelProperty(value = "房源内网场景链接")
     private String innerVrLink;
 
+    @ApiModelProperty(value = "当前房源的审核记录条数-仅仅用于返回给前端用")
+    private Long countNum;
+
 }

src/main/java/fcb/project/manager/base/service/impl/TmAuditServiceImpl.java

@@ -59,6 +59,15 @@ public class TmAuditServiceImpl extends ServiceImpl<TmAuditDao, TmAudit> impleme
         return getBaseMapper().selectPage(page , lambdaQueryWrapper);
     }
 
+    public long countAuditNum(String vrId){
+        LambdaQueryWrapper<TmAudit> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(TmAudit::getVrId , vrId);
+        lambdaQueryWrapper.eq(TmAudit::getIsDelete , 0);
+        IPage<TmAudit> page = new Page<>(1 , 10);
+        IPage<TmAudit> resultPage = getBaseMapper().selectPage(page , lambdaQueryWrapper);
+        return null != resultPage ? resultPage.getTotal() : 0L;
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public int updateAudit(TmAudit tmAudit){
         if(null == tmAudit){

src/main/java/fcb/project/manager/base/service/impl/TmHouseServiceImpl.java

@@ -39,6 +39,9 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
     @Autowired
     private UserFeign userFeign;
 
+    @Autowired
+    private TmAuditServiceImpl tmAuditService;
+
     public IPage<TmHouse> getListByNameOrBelong(String houseTitle,
                                                 Integer status, Integer type,
                                                 String estateId, ContextTokenBean contextTokenBean,
@@ -83,7 +86,8 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
     }
 
     public IPage<TmHouse> getAuditHouseList(String houseTitle, Integer status, Integer type,
-                                            String belongCompany, String estateName, Long pageNum, Long pageSize) {
+                                            String belongCompany, String estateName,
+                                            Long pageNum, Long pageSize) {
         LambdaQueryWrapper<TmHouse> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(TmHouse::getIsShow, 1);
         if (StringUtils.isNotBlank(houseTitle)) {
@@ -109,7 +113,15 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
             lambdaQueryWrapper.eq(TmHouse::getType, type);
         }
         IPage<TmHouse> page = new Page<>(pageNum, pageSize, true);
-        return getBaseMapper().selectPage(page, lambdaQueryWrapper);
+        IPage<TmHouse> resultPage = getBaseMapper().selectPage(page, lambdaQueryWrapper);
+        if(null != resultPage && resultPage.getTotal() > 0){
+            for (int i = 0; i < resultPage.getRecords().size(); i++) {
+                String vrId = resultPage.getRecords().get(i).getId();
+                resultPage.getRecords().get(i).setCountNum(tmAuditService.countAuditNum(vrId));
+            }
+        }
+        return resultPage;
+//        return tmHouseDao.getHousePageWithCount(page, lambdaQueryWrapper);
     }
 
     public int deleteHouseById(String houseId) {

src/main/resources/application-prod.properties

@@ -16,7 +16,7 @@ swagger.page.packagePath=fcb.project.manager
 
 
 spring.redis.cluster.max-redirects=3
-spring.redis.cluster.nodes=10.71.184.237:7000,10.71.184.181:7000,10.71.184.217:7000,10.71.184.188:7000,10.71.184.222:7000,10.71.184.200:7000
+spring.redis.cluster.nodes=10.71.184.237:7000,10.71.184.181:7000,10.71.184.217:7000
 spring.redis.timeout=5000ms
 spring.redis.jedis.pool.max-active=8
 spring.redis.jedis.pool.max-idle=8

src/main/resources/application-test.properties

@@ -38,13 +38,22 @@ fcb.client.code=zxd9WS2twZ3J4DuhJ2r3y6qz1OZ2hMbr
 fcb.client.secret=UyUaWPJuLw1xfN9wXusgiZxJ7vu9cre9
 
 
-oss.point=fcb-vrkanfang-uat.oss-cn-shenzhen-internal.aliyuncs.com
+#oss.point=fcb-vrkanfang-uat.oss-cn-shenzhen-internal.aliyuncs.com
+#oss.key=LTAIUrvuHqj8pvry
+#oss.secrey=mqVRTWbWcn4sNMoWmnRq6eToWr9BIy
+#oss.bucket=fcb-vrkanfang-uat
+
+#share.logo.oss.path=domain/4dhouse/
+#oss.query.url=http://fcb-vrkanfang-uat.oss-cn-shenzhen-internal.aliyuncs.com/
+
+oss.point=http://oss-cn-shenzhen.aliyuncs.com
 oss.key=LTAIUrvuHqj8pvry
-oss.secrey=mqVRTWbWcn4sNMoWmnRq6eToWr9BIy
-oss.bucket=fcb-vrkanfang-uat
+oss.secrey=JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+oss.bucket=4d-tjw
 
 share.logo.oss.path=domain/4dhouse/
-oss.query.url=http://fcb-vrkanfang-uat.oss-cn-shenzhen-internal.aliyuncs.com/
+oss.query.url=https://houseoss.4dkankan.com/
+
 image.local.path=/image/
 inner.vr.scene.host=https://fcb.intranet.4dkankan.com/
 outer.vr.scene.host=https://fcb.test.4dkankan.com/

src/main/resources/mybatis/mappers/TmHouseMapper.xml

@@ -2,4 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="fcb.project.manager.base.dao.TmHouseDao">
 
+
+    <select id="getHousePageWithCount" resultType="fcb.project.manager.base.entity.TmHouse">
+     select house.*, (select count(*) from tm_audit where vr_id = house.id and isDelete = 0) as count_num from tm_house house
+          ${ew.customSqlSegment}
+   </select>
+
 </mapper>