Browse Source

二手房更新

by su 3 years ago
parent
commit
9d1c448db2
19 changed files with 172 additions and 56 deletions
  1. 1 1
      fcb-project-application/src/main/java/fcb/project/manager/FcbProjectManagerApplication.java
  2. 10 15
      fcb-project-application/src/main/resources/application-dev.properties
  3. 8 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/PanoInitSceneBean.java
  4. 1 1
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/TmAudit.java
  5. 1 1
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/TmAuditLog.java
  6. 2 1
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/enums/AuditStatus.java
  7. 2 1
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/enums/HouseStatus.java
  8. 7 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/param/house/QueryHouseParam.java
  9. 2 1
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/param/usedEstate/QueryUsedAudit.java
  10. 15 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/service/custom/PanoService.java
  11. 9 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/service/impl/TmEstateServiceImpl.java
  12. 31 17
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/service/impl/TmHouseServiceImpl.java
  13. 4 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/base/vo/house/HouseVO.java
  14. 29 16
      fcb-project-manager-core/src/main/java/fcb/project/manager/core/controller/AuditController.java
  15. 2 1
      fcb-project-manager-core/src/main/java/fcb/project/manager/core/controller/HouseManagerController.java
  16. 32 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/core/controller/TmRedirectController.java
  17. 3 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/core/feignInterfaces/PanoFeign.java
  18. 8 0
      fcb-project-manager-core/src/main/java/fcb/project/manager/core/feignInterfaces/fallBack/PanoFeignFallBack.java
  19. 5 1
      fcb-project-manager-core/src/main/resources/mybatis/mappers/TmEstateMapper.xml

+ 1 - 1
fcb-project-application/src/main/java/fcb/project/manager/FcbProjectManagerApplication.java

@@ -24,7 +24,7 @@ import java.time.format.DateTimeFormatter;
  */
 @EnableFeignClients
 //@NacosPropertySource(dataId = "abner-test", autoRefreshed = true)
-@EnableDiscoveryClient
+//@EnableDiscoveryClient
 @SpringBootApplication(scanBasePackages = {"fdage.back.sdk.core" , "fcb.project.manager" , "fdage.back.sdk.base.swagger"})
 @MapperScan(basePackages = {"fcb.project.manager.base.dao"})
 public class FcbProjectManagerApplication extends SpringBootServletInitializer {

+ 10 - 15
fcb-project-application/src/main/resources/application-dev.properties

@@ -1,13 +1,12 @@
 
 #注册中心
-spring.cloud.nacos.discovery.server-addr=8.135.98.231:8848
-spring.cloud.nacos.discovery.namespace=31b3ac3b-ba06-4be7-9cbf-69a8df190dfe
+#spring.cloud.nacos.discovery.server-addr=10.71.114.232:8848
 
 
 #spring.datasource.url=jdbc:mysql://8.135.107.23:3306/fcb-project-manager?serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.url=jdbc:mysql://8.135.98.231:3306/fcb-project-manager?serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.username=root
-spring.datasource.password=4DAGE168!a
+spring.datasource.url=jdbc:mysql://10.71.114.237:3306/project_manager?serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.username=user_4dhouse_rw
+spring.datasource.password=kaKjbpZi1plmViyDVWhD
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 
 
@@ -18,18 +17,14 @@ swagger.page.packagePath=fcb.project.manager
 
 #redis
 #spring.redis.cluster.max-redirects=3
-spring.redis.host=8.135.98.231
-spring.redis.port=30064
-spring.redis.timeout=5000ms
-spring.redis.jedis.pool.max-active=8
+spring.redis.cluster.nodes=10.71.114.132:7000,10.71.114.132:7001,10.71.114.132:7002,10.71.114.132:7003,10.71.114.132:7004,10.71.114.132:7005
+spring.redis.password=BN5Q40JsPHIGfUg5HTkU
+spring.redis.database=0
+spring.redis.timeout=3000ms
 spring.redis.jedis.pool.max-idle=8
-spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.min-idle=0
-spring.redis.database=0
-spring.redis.password=
-
-
-
+spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-wait=-1ms
 
 fcb.client.code=zxd9WS2twZ3J4DuhJ2r3y6qz1OZ2hMbr
 fcb.client.secret=UyUaWPJuLw1xfN9wXusgiZxJ7vu9cre9

+ 8 - 0
fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/PanoInitSceneBean.java

@@ -1,5 +1,6 @@
 package fcb.project.manager.base.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -33,4 +34,11 @@ public class PanoInitSceneBean implements Serializable {
     private String roomName;
     private String byType;
 
+    @ApiModelProperty(name = "isInit",value = "是否初始场景, 0:否, 1:是",  dataType = "String")
+    private Integer isInit;
+    @ApiModelProperty(name = "vrId",value = "VR Id(四维提供vr主键id)",  dataType = "String")
+    private String vrId;
+    @ApiModelProperty(name = "isDomeVideo",value = "是否配置了球幕视频 (0:否,1:是)",  dataType = "String")
+    private Integer isDomeVideo;
+
 }

+ 1 - 1
fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/TmAudit.java

@@ -65,7 +65,7 @@ public class TmAudit implements Serializable {
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime sumitTime;
 
-    @ApiModelProperty(value = "审核状态: 0->待审核;1->已审核;-1->不通过;2->拍摄审核")
+    @ApiModelProperty(value = "审核状态: 0->待集团审核;1->已上线;2->待地区审核;3->地区审核通过;4->集团审核通过;-1->集团驳回;-4->地区驳回")
     private Integer auditStatus;
 
     @ApiModelProperty(value = "审核备注")

+ 1 - 1
fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/TmAuditLog.java

@@ -47,7 +47,7 @@ public class TmAuditLog implements Serializable {
     @ApiModelProperty(value = "所属公司ID")
     private String belongCompanyId;
 
-    @ApiModelProperty(value = "审核状态: 0->待审核;1->集团审核通过;-1->集团驳回;2->地区审核通过;->-4地区驳回")
+    @ApiModelProperty(value = "审核状态: 0->待集团审核;1->已上线;2->待地区审核;3->地区审核通过;4->集团审核通过;-1->集团驳回;-4->地区驳回")
     private Integer auditStatus;
 
     @ApiModelProperty(value = "审核备注")

+ 2 - 1
fcb-project-manager-core/src/main/java/fcb/project/manager/base/enums/AuditStatus.java

@@ -8,9 +8,10 @@ package fcb.project.manager.base.enums;
 public enum AuditStatus {
 
     WAITING_AUDIT(0 , "待集团审核"),
-    AUDITED(1 , "已审核"),
+    AUDITED(1 , "集团审核通过"),
     SHOOT_AUDIT(2 , "待地区审核"),
     REGION_AUDITED(3 , "地区审核通过"),
+//    REGION_AUDITEDTG(4 , "集团审核通过"),
     REGION_REJECT(-4 , "地区审核未通过"),
     REJECT(-1 , "集团审核不通过"),
     ;

+ 2 - 1
fcb-project-manager-core/src/main/java/fcb/project/manager/base/enums/HouseStatus.java

@@ -10,7 +10,8 @@ public enum  HouseStatus {
       DRAFT(0 , "草稿"),
       WAITING_AUDIT(1 , "待集团审核"),
       WAITING_REGION_AUDIT(3 , "待地区审核"),
-      AUDITED(2 , "已上线"),
+      AUDITED(2 , "集团审核通过"),
+      REJECTGION_AUDITG(4 , "集团审核通过"),
       REJECT(-1 , "集团驳回"),
       REGION_REJECT(-4 , "地区驳回"),
       ALL(-2 , "全部"),

+ 7 - 0
fcb-project-manager-core/src/main/java/fcb/project/manager/base/param/house/QueryHouseParam.java

@@ -30,6 +30,10 @@ public class QueryHouseParam extends PageParam {
     @NotBlank(message = "房源类型不能为空")
     private Integer type;
 
+    @ApiModelProperty(name = "online", value = "房源类型: 1->新房,2->二手房", required = true, dataType = "String")
+    @NotBlank(message = "房源类型不能为空")
+    private Integer online;
+
     @ApiModelProperty(name = "createStartTime", value = "创建开始时间", dataType = "String")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createStartTime;
@@ -60,4 +64,7 @@ public class QueryHouseParam extends PageParam {
     @ApiModelProperty(hidden = true)
     private List<Integer> statues;
 
+    @ApiModelProperty(hidden = true)
+    private String statuslist;
+
 }

+ 2 - 1
fcb-project-manager-core/src/main/java/fcb/project/manager/base/param/usedEstate/QueryUsedAudit.java

@@ -1,5 +1,6 @@
 package fcb.project.manager.base.param.usedEstate;
 
+import fcb.project.manager.base.entity.PanoInitSceneBean;
 import fcb.project.manager.base.param.PageParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,7 +13,7 @@ import java.util.List;
 public class QueryUsedAudit extends PageParam  {
 
     @ApiModelProperty(name = "requestOnlineList",value = "房车宝上下架",  dataType = "String")
-    List<RequestOnline> requestOnlineList;
+    List<PanoInitSceneBean> requestOnlineList;
 
     @ApiModelProperty(name = "houseId",value = "户型id",  dataType = "String")
     private String houseId;

+ 15 - 0
fcb-project-manager-core/src/main/java/fcb/project/manager/base/service/custom/PanoService.java

@@ -70,6 +70,21 @@ public class PanoService {
         return rspBean.getData();
     }
 
+    public List<PanoInitSceneBean> getVrAndIndex(String houseId, String token) {
+        if (StringUtils.isBlank(houseId)) {
+            return null;
+        }
+        PanoInitSceneTotalRsp rspBean = panoFeign.getVrAndIndex(houseId , token);
+        log.info("获取房源的初始化场景数据,从720返回结果:{}" , JSON.toJSONString(rspBean));
+        if(null == rspBean || null == rspBean.getCode() || rspBean.getCode().compareTo(0) != 0){
+            return null;
+        }
+        if(CollectionUtils.isEmpty(rspBean.getData())){
+            return null;
+        }
+        return rspBean.getData();
+    }
+
     public List<String> getKanKanSceneNums(String houseId, String token) {
         if (StringUtils.isBlank(houseId)) {
             return null;

+ 9 - 0
fcb-project-manager-core/src/main/java/fcb/project/manager/base/service/impl/TmEstateServiceImpl.java

@@ -70,6 +70,15 @@ public class TmEstateServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> impl
     public IPage<HouseVO> listProject(QueryHouseParam queryHouseParam, ContextTokenBean contextUserInfo, String token) {
         produceQuery(queryHouseParam, contextUserInfo);
 
+        if(StringUtils.isNotEmpty(queryHouseParam.getStatuslist())){
+            String[] statuslist = queryHouseParam.getStatuslist().split(",");
+            List<Integer> slist = new ArrayList<>();
+            for(String sl:statuslist){
+                slist.add(Integer.valueOf(sl));
+            }
+            queryHouseParam.setStatues(slist);
+        }
+
         Page page = new Page().setCurrent(queryHouseParam.getPageNum()).setSize(queryHouseParam.getPageSize());
         IPage<HouseVO> vos = getBaseMapper().listProject(page, queryHouseParam);
         produceRes(vos.getRecords(), token);

+ 31 - 17
fcb-project-manager-core/src/main/java/fcb/project/manager/base/service/impl/TmHouseServiceImpl.java

@@ -65,8 +65,6 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
     private String outerSceneVrHost;
 
 
-
-
     public List<TmHouse> getListByEstate(String estateId){
         LambdaQueryWrapper<TmHouse> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(TmHouse::getEstateId, estateId);
@@ -78,29 +76,39 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
     public IPage<TmHouse> getAuditHouseList(String houseTitle, Integer status, Integer type,
                                             String belongCompany, String estateName, String token,
                                             String startTime, String endTime,
-                                            Long pageNum, Long pageSize, ContextTokenBean tokenMap, Integer online) {
+                                            Long pageNum, Long pageSize, ContextTokenBean tokenMap, Integer online,String statuslist) {
         LambdaQueryWrapper<TmHouse> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(TmHouse::getIsShow, 1);
         if (StringUtils.isNotBlank(houseTitle)) {
             lambdaQueryWrapper.like(TmHouse::getHouseTitle, houseTitle);
         }
         lambdaQueryWrapper.orderByDesc(TmHouse::getSubmitAuditTime);
-        if (null != status) {
-            if (HouseStatus.ALL.getCode().compareTo(status) != 0) {
-                //当获取的是未通过的数据时,获取所有<=-1的数据
-                if(HouseStatus.REJECT.getCode().compareTo(status) == 0){
-                    lambdaQueryWrapper.le(TmHouse::getStatus, status);
-                }else {
-                    //其余根据状态获取
-                    lambdaQueryWrapper.eq(TmHouse::getStatus, status);
-                }
-            } else {
-                lambdaQueryWrapper.ne(TmHouse::getStatus, HouseStatus.DRAFT.getCode());
+//        if (null != status) {
+//            if (HouseStatus.ALL.getCode().compareTo(status) != 0) {
+//                //当获取的是未通过的数据时,获取所有<=-1的数据
+//                if(HouseStatus.REJECT.getCode().compareTo(status) == 0){
+//                    lambdaQueryWrapper.le(TmHouse::getStatus, status);
+//                }else {
+//                    //其余根据状态获取
+//                    lambdaQueryWrapper.eq(TmHouse::getStatus, status);
+//                }
+//            } else {
+//                lambdaQueryWrapper.ne(TmHouse::getStatus, HouseStatus.DRAFT.getCode());
+//            }
+//            //捞取所有状态,默认不设置status的过滤条件
+//        } else {
+//            lambdaQueryWrapper.eq(TmHouse::getStatus, HouseStatus.WAITING_AUDIT.getCode());
+//        }
+
+        if(StringUtils.isNotEmpty(statuslist)){
+            String[] statuslists = statuslist.split(",");
+            List<Integer> slist = new ArrayList<>();
+            for(String sl:statuslists){
+                slist.add(Integer.valueOf(sl));
             }
-            //捞取所有状态,默认不设置status的过滤条件
-        } else {
-            lambdaQueryWrapper.eq(TmHouse::getStatus, HouseStatus.WAITING_AUDIT.getCode());
+            lambdaQueryWrapper.in(TmHouse::getStatus,slist);
         }
+
         if (StringUtils.isNotBlank(estateName)) {
             lambdaQueryWrapper.like(TmHouse::getEstateName, estateName);
         }
@@ -124,6 +132,12 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
         if(StringUtils.isNotBlank(startTime)){
             lambdaQueryWrapper.ge(TmHouse::getSubmitAuditTime, startTime);
         }
+//
+//        if(statues!=null && statues.size()>0){
+//            lambdaQueryWrapper.in(TmHouse::getStatus,statues);
+//        }
+
+
         if(StringUtils.isNotBlank(startTime)){
             lambdaQueryWrapper.le(TmHouse::getSubmitAuditTime, endTime);
         }

+ 4 - 0
fcb-project-manager-core/src/main/java/fcb/project/manager/base/vo/house/HouseVO.java

@@ -69,6 +69,10 @@ public class HouseVO {
     @ApiModelProperty(name = "type", value = "type",  dataType = "String")
     private Integer type;
 
+    @ApiModelProperty(name = "online", value = "type",  dataType = "Integer")
+    private Integer online;
+
+
     @ApiModelProperty(name = "countNum", value = "countNum",  dataType = "Long")
     private Long countNum;
 

+ 29 - 16
fcb-project-manager-core/src/main/java/fcb/project/manager/core/controller/AuditController.java

@@ -37,6 +37,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -177,18 +178,19 @@ public class AuditController extends BaseController{
                 dbHouse.setStatus(HouseStatus.WAITING_AUDIT.getCode());
 
             }else {
-                tmAudit.setAuditStatus(AuditStatus.AUDITED.getCode());
-                tmAuditLog.setAuditStatus(AuditStatus.AUDITED.getCode());
-
-                dbHouse.setStatus(HouseStatus.AUDITED.getCode());
 
                 auditResultStr = "审核通过";
 
+                //二手房 审核通过就上线  新房审核通过未上线
                 if(auditRequestBean.getAuditHouseType().equals("0")){
-                    dbHouse.setOnline(0);
-                }else {
                     dbHouse.setOnline(1);
+                }else {
+                    dbHouse.setOnline(0);
                 }
+
+                tmAudit.setAuditStatus(AuditStatus.AUDITED.getCode());
+                tmAuditLog.setAuditStatus(AuditStatus.AUDITED.getCode());
+                dbHouse.setStatus(HouseStatus.AUDITED.getCode());
 //
 //                1、通知看看,翻转场景码的状态
                 List<String> sceneNumList = panoService.getKanKanSceneNums(dbHouse.getId() , getToken());
@@ -212,9 +214,9 @@ public class AuditController extends BaseController{
                 //2、通知720,翻转场景码的状态(审核通过/上线:4, 下线:3)
 //                panoService.noticeVrAuditStatus(dbHouse.getId() , getToken() , 4);
                 if(auditRequestBean.getAuditHouseType().equals("0")){
-                    panoService.noticeVrAuditStatus(dbHouse.getId() , getToken() , 3);
-                }else {
                     panoService.noticeVrAuditStatus(dbHouse.getId() , getToken() , 4);
+                }else {
+                    panoService.noticeVrAuditStatus(dbHouse.getId() , getToken() , 3);
                 }
             }
         }
@@ -223,7 +225,7 @@ public class AuditController extends BaseController{
                 //处于拍摄审核状态时,修改成地区审核不通过
                 tmAudit.setAuditStatus(AuditStatus.REGION_REJECT.getCode());
                 tmAuditLog.setAuditStatus(AuditStatus.REGION_REJECT.getCode());
-                //地区审核通过,修改成待集团审核
+                //地区审核通过,修改成地区驳回
                 dbHouse.setStatus(HouseStatus.REGION_REJECT.getCode());
             }else {
                 //修改成集团审核不通过
@@ -307,6 +309,7 @@ public class AuditController extends BaseController{
         if(queryUsedAudit.getOnline().compareTo(0) == 0){
             tmHouse.setStatus(HouseStatus.DRAFT.getCode());
         }
+
         tmHouseService.updateHouse(tmHouse);
         Map<String , Object> map = new HashMap<>();
         map.put("sceneNum" , tmHouse.getSceneNum());
@@ -362,20 +365,30 @@ public class AuditController extends BaseController{
             if(ins != 1){
                 log.info("插入操作记录失败");
             }
-
-            //将上架信息通知fcb
         }
 
         try {
+            List<RequestOnline> requestOnlineList = new ArrayList<>();
+            RequestOnline requestOnline = new RequestOnline();
+
             //将上/下架信息通知fcb
             if(queryUsedAudit.getRequestOnlineList()!=null && queryUsedAudit.getRequestOnlineList().size()>0){
-                List<RequestOnline> requestOnlineList = queryUsedAudit.getRequestOnlineList();
-
-                for(RequestOnline ro:requestOnlineList){
-                    ro.setProId(tmHouse.getEstateId());
+                List<PanoInitSceneBean> panoInitSceneBeanList = queryUsedAudit.getRequestOnlineList();
+
+                for(PanoInitSceneBean ro:panoInitSceneBeanList){
+                    requestOnline = new RequestOnline();
+                    requestOnline.setProId(tmHouse.getEstateId());
+                    requestOnline.setVrId(ro.getSceneCode());
+                    requestOnline.setName(ro.getSceneTitle());
+                    requestOnline.setUrl(ro.getWebSite());
+                    requestOnline.setPicUrl(ro.getIcon());
+                    requestOnline.setIsDomeVideo(ro.getIsDomeVideo());
+                    requestOnline.setHouseId(ro.getHouseId());
+                    requestOnlineList.add(requestOnline);
                 }
 
-                String param = JSON.toJSONString(queryUsedAudit.getRequestOnlineList());
+                String param = JSON.toJSONString(requestOnlineList);
+                log.info("上下线 参数:" + param);
 
                 String url = fcbmainurl;
                 if(queryUsedAudit.getOnline().compareTo(1) == 0){

+ 2 - 1
fcb-project-manager-core/src/main/java/fcb/project/manager/core/controller/HouseManagerController.java

@@ -135,12 +135,13 @@ public class HouseManagerController extends BaseController{
                                             @RequestParam(name = "online") Integer online,
                                             @RequestParam(name = "startTime") String startTime,
                                             @RequestParam(name = "endTime") String endTime,
+                                            @RequestParam(name = "statuslist") String statuslist,
                                        @RequestParam(name = "pageNum")Long pageNum,
                                        @RequestParam(name = "pageSize")Long pageSize){
         ContextTokenBean tokenMap = getContextUserInfo();
 
         IPage<TmHouse> resultPage = tmHouseService.getAuditHouseList(houseTitle , status ,
-                type , belongCompany , estateName , getToken() , startTime, endTime,  pageNum , pageSize, tokenMap, online);
+                type , belongCompany , estateName , getToken() , startTime, endTime,  pageNum , pageSize, tokenMap, online,statuslist);
         return  Result.success(DataUtils.assembleResult(resultPage.getTotal(), resultPage.getPages(),
                 resultPage.getCurrent(), resultPage.getRecords()));
     }

+ 32 - 0
fcb-project-manager-core/src/main/java/fcb/project/manager/core/controller/TmRedirectController.java

@@ -53,6 +53,38 @@ public class TmRedirectController extends BaseController{
                 }
             }
 
+            if(object.containsKey("maintenanceman") ){
+                if(StringUtils.isNotEmpty(tokenMap.getUserName())){
+                    object.put("maintenanceman",tokenMap.getUserName());
+                }else{
+                    object.put("maintenanceman","");
+                }
+            }
+
+            if(object.containsKey("maintenancemanId")){
+                if(StringUtils.isNotEmpty(tokenMap.getId())){
+                    object.put("maintenancemanId",tokenMap.getId());
+                }else{
+                    object.put("maintenancemanId","");
+                }
+            }
+
+            if(object.containsKey("updatorName") ){
+                if(StringUtils.isNotEmpty(tokenMap.getUserName())){
+                    object.put("updatorName",tokenMap.getUserName());
+                }else{
+                    object.put("updatorName","");
+                }
+            }
+
+            if(object.containsKey("updatorId")){
+                if(StringUtils.isNotEmpty(tokenMap.getId())){
+                    object.put("updatorId",tokenMap.getId());
+                }else{
+                    object.put("updatorId","");
+                }
+            }
+
             if(object.containsKey("operatorCompanyId")){
                 if(StringUtils.isNotEmpty(tokenMap.getDepartmentId())){
                     object.put("operatorCompanyId",tokenMap.getDepartmentId());

+ 3 - 0
fcb-project-manager-core/src/main/java/fcb/project/manager/core/feignInterfaces/PanoFeign.java

@@ -45,4 +45,7 @@ public interface PanoFeign {
 
     @GetMapping("/fcb/pano/house/getVrSceneCodeAndType/{houseId}")
     SceneRspBean listPanoSceneWithTypes(@RequestHeader(name = "token")String token, @PathVariable(name = "houseId") String id);
+
+    @GetMapping("/fcb/pano/house/getVrAndIndex/{houseId}")
+    public PanoInitSceneTotalRsp getVrAndIndex(@PathVariable String houseId , @RequestHeader(name = "token") String token);
 }

+ 8 - 0
fcb-project-manager-core/src/main/java/fcb/project/manager/core/feignInterfaces/fallBack/PanoFeignFallBack.java

@@ -67,6 +67,14 @@ public class PanoFeignFallBack implements PanoFeign {
     }
 
     @Override
+    public PanoInitSceneTotalRsp getVrAndIndex(String houseId, String token) {
+        PanoInitSceneTotalRsp commonRspBean = new PanoInitSceneTotalRsp();
+        commonRspBean.setMsg("服务超时");
+        commonRspBean.setCode(-1);
+        return commonRspBean;
+    }
+
+    @Override
     public CommonRspBean statistics(@PathVariable String houseId, @RequestHeader(name = "token") String token) {
         CommonRspBean commonRspBean = new CommonRspBean();
         commonRspBean.setMsg("服务超时");

+ 5 - 1
fcb-project-manager-core/src/main/resources/mybatis/mappers/TmEstateMapper.xml

@@ -29,7 +29,8 @@
         house.vr_link vrLink,
         house.vr_path vrPath,
         house.inner_vr_link innerVrLink,
-        house.type
+        house.type,
+        house.online
         FROM
         tm_estate estate
         INNER JOIN tm_house house ON house.estate_id = estate.id
@@ -51,6 +52,9 @@
         <if test="ew.type != null">
             and house.type = #{ew.type}
         </if>
+        <if test="ew.online != null">
+            and house.online = #{ew.online}
+        </if>
         <if test="ew.createStartTime != null">
             and house.create_time >= #{ew.createStartTime}
         </if>