Merge remote-tracking branch 'origin/master'

src/main/java/com/postcard/service/moudle/park/service/impl/ParkInfoServiceImpl.java

@@ -30,6 +30,8 @@ import com.postcard.service.moudle.park.vo.ParkDetailVo;
 import com.postcard.service.moudle.park.vo.ParkIndustryVo;
 import com.postcard.service.moudle.park.vo.ParkPageVo;
 import com.postcard.service.moudle.system.service.SysCarouselInfoService;
+import com.postcard.service.moudle.system.vo.ResourceVo;
+import com.postcard.service.moudle.system.vo.VrVo;
 import com.postcard.service.util.CommonUtil;
 import com.postcard.service.util.DataUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -89,7 +91,7 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo>
                 parkInfoParam.setCoverAreaUnder(Double.valueOf(split[1]));
             }
         }
-    if(StringUtils.isNotBlank(parkInfoParam.getPrimaryIndustry())){
+        if (StringUtils.isNotBlank(parkInfoParam.getPrimaryIndustry())) {
             String name = PrimaryIndustryEnum.getName(parkInfoParam.getPrimaryIndustry());
             String[] split = name.split("、");
             parkInfoParam.setPrimaryIndustryList(Arrays.asList(split));
@@ -112,8 +114,14 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo>
         // 获取园区基本信息
         ParkInfo parkInfo = this.getById(id);
         ParkDetailVo parkDetailVo = BeanUtil.copyProperties(parkInfo, ParkDetailVo.class);
+        ResourceVo allResource = sysCarouselInfoService.getAllResource(CarouselTypeEnum.YUANQU.getType(), id);
+        List<String> imgUrlList = allResource.getImgUrlList();
+        List<VrVo> vrVoList = allResource.getVrVoList();
+
         // 轮播图
-    parkDetailVo.setImgUrlList(sysCarouselInfoService.getImgUrls(CarouselTypeEnum.YUANQU.getType(), id));
+//    parkDetailVo.setImgUrlList(sysCarouselInfoService.getImgUrls(CarouselTypeEnum.YUANQU.getType(), id));
+        parkDetailVo.setImgUrlList(imgUrlList);
+        parkDetailVo.setVrUrlList(vrVoList);
         // 招商方向
         parkDetailVo.setInvestmentDetails(listInvestDetail(id));
         // 产业支持
@@ -157,7 +165,7 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo>
 
 
     @Override
-  public List<String> getIndustryList(){
+    public List<String> getIndustryList() {
         DevelopmentInfo developmentInfo = developmentInfoService.getById(developmentId);
         String primaryIndustry = developmentInfo.getPrimaryIndustry();
         String[] split = primaryIndustry.split("、");

src/main/java/com/postcard/service/moudle/park/vo/ParkDetailVo.java

@@ -17,6 +17,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -122,4 +123,7 @@ public class ParkDetailVo {
   @ApiModelProperty(value = "状态")
   private Integer status;
 
+  @ApiModelProperty(value = "vr图")
+  private List<VrVo> vrUrlList = new ArrayList<>();
+
 }