* 获取房源详情增加返回房源全景图

src/main/java/com/huiju/estateagents/po/BuildingImgPO.java

@@ -0,0 +1,31 @@
+package com.huiju.estateagents.po;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Auther: gusy
+ * @Date: 2020/2/19 16:24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class BuildingImgPO {
+
+    /**
+     * 是否全景图，1是
+     */
+    private Integer type;
+
+    /**
+     * 图片链接
+     */
+    private String url;
+
+    /**
+     * 全景图链接
+     */
+    private String panoramaLink;
+
+}

src/main/java/com/huiju/estateagents/po/TaHousingResourcesPO.java

@@ -2,6 +2,7 @@ package com.huiju.estateagents.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.huiju.estateagents.entity.TaBuildingImg;
+import com.huiju.estateagents.entity.TaBuildingPanorama;
 import com.huiju.estateagents.entity.TaHousingResources;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -48,7 +49,7 @@ public class TaHousingResourcesPO extends TaHousingResources {
      * 户型图片列表
      */
     @TableField(exist = false)
-    private List<TaBuildingImg> buildingImgList;
+    private List<BuildingImgPO> buildingImgList;
 
     /**
      * 楼盘名称

src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java

@@ -13,6 +13,7 @@ import com.huiju.estateagents.mapper.TaApartmentImgMapper;
 import com.huiju.estateagents.mapper.TaBuildingImgMapper;
 import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
 import com.huiju.estateagents.mapper.TaPreselectionRecordMapper;
+import com.huiju.estateagents.po.BuildingImgPO;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
 import com.huiju.estateagents.service.ITaHousingResourcesService;
 import org.apache.commons.collections.CollectionUtils;
@@ -79,6 +80,9 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
     @Autowired
     TaApartmentImgMapper taApartmentImgMapper;
 
+    @Autowired
+    private TaBuildingPanoramaMapper taBuildingPanoramaMapper;
+
 
     /**
      * 分页获取房源列表
@@ -168,24 +172,52 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
             resourcesPO.setIsPreselect(false);
         }
 
-        // 获取户型图片列表
-        List<TaBuildingImg> taBuildingImgList = new ArrayList<>();
-        List<TaApartmentImg> buildingImg;
-        QueryWrapper<TaBuildingImg> buildingImgQueryWrapper;
-        QueryWrapper<TaApartmentImg> apartmentImgQueryWrapper = new QueryWrapper<>();
-        apartmentImgQueryWrapper.eq("apartment_id", resourcesPO.getApartmentId());
-        buildingImg = taApartmentImgMapper.selectList(apartmentImgQueryWrapper);
-        for (TaApartmentImg apartmentImg : buildingImg) {
-            buildingImgQueryWrapper = new QueryWrapper<>();
-            buildingImgQueryWrapper.eq("img_id", apartmentImg.getImgId());
-            buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
-            buildingImgQueryWrapper.orderByAsc("order_no");
-            taBuildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
-        }
-        if (CollectionUtils.isNotEmpty(taBuildingImgList)) {
-            resourcesPO.setBuildingImgList(taBuildingImgList);
+        List<BuildingImgPO> buildingImgPOList = new ArrayList<>();
+        BuildingImgPO buildingImgPO;
+        if (!StringUtils.isEmpty(resourcesPO.getApartmentId())) {
+            // 获取全景图
+            QueryWrapper<TaBuildingPanorama> buildingPanoramaQueryWrapper = new QueryWrapper<>();
+            buildingPanoramaQueryWrapper.eq("org_id", resourcesPO.getOrgId());
+            buildingPanoramaQueryWrapper.eq("building_id", resourcesPO.getBuildingId());
+            buildingPanoramaQueryWrapper.eq("apartment_id", resourcesPO.getApartmentId());
+            buildingPanoramaQueryWrapper.eq("panorama_type", "apartment");
+            buildingPanoramaQueryWrapper.eq("status", "1");
+            List<TaBuildingPanorama> panoramaList = taBuildingPanoramaMapper.selectList(buildingPanoramaQueryWrapper);
+            if (CollectionUtils.isNotEmpty(panoramaList)) {
+                for (TaBuildingPanorama panorama : panoramaList) {
+                    buildingImgPO = new BuildingImgPO();
+                    buildingImgPO.setUrl(panorama.getCoverImg());
+                    buildingImgPO.setType(1);
+                    buildingImgPO.setPanoramaLink(panorama.getPanoramaLink());
+                    buildingImgPOList.add(buildingImgPO);
+                }
+            }
+
+            // 获取户型图片列表
+            List<TaBuildingImg> taBuildingImgList = new ArrayList<>();
+            List<TaApartmentImg> buildingImg;
+            QueryWrapper<TaBuildingImg> buildingImgQueryWrapper;
+            QueryWrapper<TaApartmentImg> apartmentImgQueryWrapper = new QueryWrapper<>();
+            apartmentImgQueryWrapper.eq("apartment_id", resourcesPO.getApartmentId());
+            buildingImg = taApartmentImgMapper.selectList(apartmentImgQueryWrapper);
+            for (TaApartmentImg apartmentImg : buildingImg) {
+                buildingImgQueryWrapper = new QueryWrapper<>();
+                buildingImgQueryWrapper.eq("img_id", apartmentImg.getImgId());
+                buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
+                buildingImgQueryWrapper.orderByAsc("order_no");
+                taBuildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
+            }
+            if (CollectionUtils.isNotEmpty(taBuildingImgList)) {
+                for (TaBuildingImg img : taBuildingImgList) {
+                    buildingImgPO = new BuildingImgPO();
+                    buildingImgPO.setType(0);
+                    buildingImgPO.setUrl(img.getUrl());
+                    buildingImgPOList.add(buildingImgPO);
+                }
+            }
         }
 
+        resourcesPO.setBuildingImgList(buildingImgPOList);
         return resourcesPO;
     }