Merge remote-tracking branch 'origin/master'

src/main/java/com/fdkankan/ucenter/controller/api/FusionController.java

@@ -25,7 +25,7 @@ public class FusionController extends BaseController {
     @PostMapping("/scene/list")
     public Result sceneList(@RequestBody SceneParam param){
 
-        return Result.success(fusionService.scenePageList(param,getToken()));
+        return Result.success(fusionService.scenePageOnlyV4List(param,getToken()));
     }
 
 

src/main/java/com/fdkankan/ucenter/controller/api/VoidController.java

@@ -10,6 +10,10 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
+/**
+ * 随心装调用
+ */
+
 @RestController
 @RequestMapping("/void")
 public class VoidController {

src/main/java/com/fdkankan/ucenter/httpClient/address/LaserAddressSource.java

@@ -12,11 +12,9 @@ public class LaserAddressSource implements AddressSource {
     @Value("${4dkk.laserService.basePath}")
     private String basePath;
 
-    @Value("${4dkk.laserService.port}")
-    private String port;
 
     @Override
     public ForestAddress getAddress(ForestRequest forestRequest) {
-        return new ForestAddress("","",Integer.valueOf(port),basePath);
+        return new ForestAddress("","",null,basePath);
     }
 }

src/main/java/com/fdkankan/ucenter/service/IFusionService.java

@@ -2,8 +2,11 @@ package com.fdkankan.ucenter.service;
 
 import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.vo.request.SceneParam;
+import com.fdkankan.ucenter.vo.response.SceneProEntityVo;
 
 public interface IFusionService {
 
     PageInfo scenePageList(SceneParam param, String token);
+
+    PageInfo scenePageOnlyV4List(SceneParam param, String token);
 }

src/main/java/com/fdkankan/ucenter/service/impl/FusionService.java

@@ -9,6 +9,7 @@ import com.fdkankan.ucenter.entity.*;
 import com.fdkankan.ucenter.service.*;
 import com.fdkankan.ucenter.vo.request.SceneParam;
 import com.fdkankan.ucenter.vo.response.ScenePlusVo;
+import com.fdkankan.ucenter.vo.response.SceneProEntityVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +32,27 @@ public class FusionService implements IFusionService {
     @Autowired
     IScenePlusVoidService scenePlusVoidService;
 
+
+    @Override
+    public PageInfo scenePageOnlyV4List(SceneParam param, String token) {
+        PageInfo pageInfo = this.scenePageList(param, token);
+        List<ScenePlusVo> list = (List<ScenePlusVo>) pageInfo.getList();
+        List<SceneProEntityVo> proEntityVos = new ArrayList<>();
+        for (ScenePlusVo scenePlusVo : list) {
+            SceneProEntityVo vo = new SceneProEntityVo();
+            vo.setSceneName(scenePlusVo.getTitle());
+            vo.setStatus(scenePlusVo.getSceneStatus());
+            BeanUtils.copyProperties(scenePlusVo,vo);
+            BeanUtils.copyProperties(scenePlusVo.getPlusExt(),vo);
+            proEntityVos.add(vo);
+        }
+        Page<SceneProEntityVo> pageVo = new Page<>(param.getPageNum(),param.getPageSize());
+        pageVo.setRecords(proEntityVos);
+        pageVo.setTotal(pageInfo.getTotal());
+
+        return PageInfo.PageInfo(pageVo);
+    }
+
     @Override
     public PageInfo scenePageList(SceneParam param, String token) {
         LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<>();

src/main/java/com/fdkankan/ucenter/vo/response/SceneProEntityVo.java

@@ -0,0 +1,77 @@
+package com.fdkankan.ucenter.vo.response;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.Date;
+
+/**
+ * 场景表
+ */
+@Data
+public class SceneProEntityVo  implements Serializable {
+
+    /**
+     * 场景名称
+     */
+    private String sceneName;
+    /**
+     * 场景的链接地址
+     */
+    private String webSite;
+    /**
+     * 场景缩略图
+     */
+    private String thumb;
+    /**
+     * 0表示未建好，1表示建好，-1表示出错，-2表示不要在官网上显示
+     */
+    private int status;
+    /**
+     * 原始的大场景数据（七牛）
+     */
+    private String dataSource;
+    /**
+     * 0表示未付款，1表示付款了，-1表示欠费（八目场景指锁住），-2表示临时空间（八目场景）
+     */
+    private int payStatus;
+    /**
+     * 大场景序号
+     */
+    private String num;
+    /**
+     * 0表示其他，1表示文博，2表示地产，3表示电商，4表示餐饮，5表示家居
+     */
+    private int sceneType;
+    /**
+     * 浏览次数
+     */
+    private int viewCount;
+    /**
+     * 用户表t_user的id
+     */
+    private Long userId;
+    /**
+     * 相机主表t_camera的id
+     */
+    private Long cameraId;
+
+    /**
+     * 场景来源，相机拍摄10以内表示， 1表示八目，2双目，3转台，4 激光
+     * 其他来源10以上，11：一键换装，12：123看房，13文通虚拟场景
+     */
+    private Integer sceneSource;
+
+    private String snCode;
+
+    private Long id;
+
+    private String createTime;
+
+    private String updateTime;
+
+    private String recStatus;
+
+}