调整楼盘删除逻辑

src/main/java/fcb/project/manager/base/service/custom/PanoService.java

@@ -33,11 +33,11 @@ public class PanoService {
             return false;
         }
         CommonRspBean rspBean = panoFeign.auditedVrNotice(houseId, status , token );
-        log.info("通知720VR项目审核通过，720返回结果:{}" , JSON.toJSONString(rspBean));
+        log.info("通知720VR项目审核结果{}，720返回结果:{}" , status , JSON.toJSONString(rspBean));
         if(null == rspBean || null == rspBean.getCode() || rspBean.getCode().compareTo(0) != 0){
             return false;
         }
-        log.info("成功通知720VR项目已经审核通过");
+        log.info("成功通知720VR项目审核结果");
         return true;
     }
 

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

@@ -113,9 +113,17 @@ public class TmHouseServiceImpl extends ServiceImpl<TmHouseDao, TmHouse> impleme
         return resultPage;
     }
 
+    public List<TmHouse> getListByEstate(String estateId){
+        LambdaQueryWrapper<TmHouse> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(TmHouse::getEstateId, estateId);
+        lambdaQueryWrapper.eq(TmHouse::getIsDelete, 0);
+        return getBaseMapper().selectList(lambdaQueryWrapper);
+    }
+
     public IPage<TmHouse> checkEstateCanDelete(String estateId) {
         LambdaQueryWrapper<TmHouse> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(TmHouse::getEstateId, estateId);
+        lambdaQueryWrapper.eq(TmHouse::getIsDelete, 0);
         lambdaQueryWrapper.in(TmHouse::getStatus, HouseStatus.AUDITED.getCode() , HouseStatus.WAITING_AUDIT.getCode());
         IPage<TmHouse> page = new Page<>(1, 10, true);
         return getBaseMapper().selectPage(page, lambdaQueryWrapper);

src/main/java/fcb/project/manager/core/controller/AuditController.java

@@ -244,7 +244,7 @@ public class AuditController extends BaseController{
                 }
 
             }
-
+            //通知720,告知房源下线(审核通过/上线:4， 下线：3)
             panoService.noticeVrAuditStatus(tmHouse.getId() , getToken() , 3);
 
             int ins = tmOperationService.addNewWithTypeAndContent(getContextUserInfo() , "审核管理" , "审核管理/审核下线/" + tmHouse.getHouseTitle() );

src/main/java/fcb/project/manager/core/controller/HouseManagerController.java

@@ -405,7 +405,7 @@ public class HouseManagerController extends BaseController{
             return Result.failure("删除失败");
         }
         List<String> sceneNumList = panoService.getKanKanSceneNums(dbHouse.getId() , getToken());
-        log.info("720返回的房源的[{}]对应的四维场景码列表为:{}" , dbHouse.getSceneNum() , JSON.toJSONString(sceneNumList));
+        log.info("720返回的房源的[{}]对应的四维场景码列表为:{}" , dbHouse.getId() , JSON.toJSONString(sceneNumList));
         if(!CollectionUtils.isEmpty(sceneNumList)){
             Map<String , Object> map = new HashMap<>();
             map.put("status" , 2);
@@ -423,7 +423,8 @@ public class HouseManagerController extends BaseController{
 
         }
 
-        panoService.noticeVrAuditStatus(houseId , getToken() , 3);
+        //通知720,告知房源下线(审核通过/上线:4， 下线：3)
+        //panoService.noticeVrAuditStatus(houseId , getToken() , 3);
 
         panoService.noticeDeleteVr(houseId , getToken());
         return Result.success("删除房源成功");

src/main/java/fcb/project/manager/core/controller/ProjectController.java

@@ -1,9 +1,11 @@
 package fcb.project.manager.core.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import fcb.project.manager.base.entity.ContextTokenBean;
 import fcb.project.manager.base.entity.TmEstate;
 import fcb.project.manager.base.entity.TmHouse;
+import fcb.project.manager.base.service.custom.PanoService;
 import fcb.project.manager.base.service.impl.TmEstateServiceImpl;
 import fcb.project.manager.base.service.impl.TmHouseServiceImpl;
 import fcb.project.manager.base.utils.DataUtils;
@@ -15,12 +17,14 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * 2 * @Author: Abner
@@ -42,6 +46,9 @@ public class ProjectController extends BaseController {
     @Autowired
     private RedisTemplate redisTemplate;
 
+    @Autowired
+    private PanoService panoService;
+
     @GetMapping("/queryOrSearchList")
     @ApiOperation(value = "根据条件拉取所有楼盘")
     @ApiImplicitParams({
@@ -93,10 +100,23 @@ public class ProjectController extends BaseController {
         if (StringUtils.isBlank(estateId)) {
             return Result.failure("楼盘ID不能为空");
         }
+
         IPage<TmHouse> page = tmHouseService.checkEstateCanDelete(estateId);
         if (null != page && page.getTotal() > 0) {
             return Result.failure("楼盘下存在VR项目时不可删除");
         }
+        List<TmHouse> houseList = tmHouseService.getListByEstate(estateId);
+        if(!CollectionUtils.isEmpty(houseList)){
+            for ( TmHouse house : houseList) {
+                if(null != house){
+                    List<String> sceneNumList = panoService.getKanKanSceneNums(house.getId() , getToken());
+                    log.info("720返回的房源的[{}]对应的四维场景码列表为:{}" , house.getId() , JSON.toJSONString(sceneNumList));
+                    if(!CollectionUtils.isEmpty(sceneNumList)){
+                        return Result.failure("楼盘下存在未解绑的VR项目，请解绑后删除");
+                    }
+                }
+            }
+        }
         int delete = tmEstateService.deleteEstateById(estateId);
         if (delete != 1) {
             return Result.failure("删除失败");