|
@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.google.gson.Gson;
|
|
|
import fcb.project.manager.base.config.FcbConfig;
|
|
|
import fcb.project.manager.base.dao.TmEstateDao;
|
|
|
-import fcb.project.manager.base.dto.scene.SceneProEntity;
|
|
|
import fcb.project.manager.base.entity.ContextTokenBean;
|
|
|
import fcb.project.manager.base.entity.SceneRspBean;
|
|
|
import fcb.project.manager.base.entity.TmEstate;
|
|
@@ -21,13 +20,10 @@ import fcb.project.manager.base.enums.SysUserRoleEnums;
|
|
|
import fcb.project.manager.base.param.house.QueryHouseParam;
|
|
|
import fcb.project.manager.base.service.ITmEstateService;
|
|
|
import fcb.project.manager.base.service.custom.PanoService;
|
|
|
-import fcb.project.manager.base.utils.BeanUtils;
|
|
|
import fcb.project.manager.base.utils.DateUtil;
|
|
|
import fcb.project.manager.base.utils.ExcelUtil;
|
|
|
import fcb.project.manager.base.vo.house.HouseVO;
|
|
|
import fcb.project.manager.core.feignInterfaces.SceneFeign;
|
|
|
-import fdage.back.sdk.base.entity.Result;
|
|
|
-import fdage.back.sdk.base.entity.ViewResult;
|
|
|
import fdage.back.sdk.base.enums.ResultCodeEnum;
|
|
|
import fdage.back.sdk.base.exception.CommonBaseException;
|
|
|
import fdage.back.sdk.base.uuid.SnowFlakeUUidUtils;
|
|
@@ -334,17 +330,17 @@ public class TmEstateServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> impl
|
|
|
}
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public ViewResult delete(String estateId, ContextTokenBean contextTokenBean, String token) {
|
|
|
+ public void delete(String estateId, ContextTokenBean contextTokenBean, String token) {
|
|
|
TmEstate dbEstate = getById(estateId);
|
|
|
if(null == dbEstate){
|
|
|
- return ViewResult.error("楼盘不存在或已被删除");
|
|
|
+ throw new CommonBaseException(1, "楼盘不存在或已被删除");
|
|
|
}
|
|
|
|
|
|
LambdaQueryWrapper<TmHouse> qw = new LambdaQueryWrapper();
|
|
|
qw.eq(TmHouse::getIsDelete, 0).eq(TmHouse::getEstateId, estateId);
|
|
|
TmHouse dbHouse = tmHouseService.getOne(qw);
|
|
|
if (dbHouse == null) {
|
|
|
- return ViewResult.error("楼盘项目不存在或已被删除");
|
|
|
+ throw new CommonBaseException(1, "楼盘项目不存在或已被删除");
|
|
|
}
|
|
|
|
|
|
deleteEstateById(estateId);
|
|
@@ -354,12 +350,12 @@ public class TmEstateServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> impl
|
|
|
if(null != dbHouse.getStatus()){
|
|
|
//除了草稿、未通过状态,其他状态都不能删除
|
|
|
if(!HouseStatus.canDelete(dbHouse.getStatus())){
|
|
|
- return ViewResult.error("存在待审核/已审核数据,无法删除");
|
|
|
+ throw new CommonBaseException(1, "存在待审核/已审核数据,无法删除");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if(!isCanDelete(dbHouse, contextTokenBean)){
|
|
|
- return ViewResult.error("暂无删除权限");
|
|
|
+ throw new CommonBaseException(1, "暂无删除权限");
|
|
|
}
|
|
|
|
|
|
tmHouseService.deleteHouseById(dbHouse.getId());
|
|
@@ -371,7 +367,7 @@ public class TmEstateServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> impl
|
|
|
List<String> sceneNumList = panoService.getKanKanSceneNums(house.getId() , token);
|
|
|
log.info("720返回的房源的[{}]对应的四维场景码列表为:{}" , house.getId() , JSON.toJSONString(sceneNumList));
|
|
|
if(!org.apache.commons.collections.CollectionUtils.isEmpty(sceneNumList)){
|
|
|
- return ViewResult.error("楼盘下存在未解绑的VR项目,请解绑后删除");
|
|
|
+ throw new CommonBaseException(1, "楼盘下存在未解绑的VR项目,请解绑后删除");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -402,7 +398,6 @@ public class TmEstateServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> impl
|
|
|
//panoService.noticeVrAuditStatus(houseId , getToken() , 3);
|
|
|
|
|
|
panoService.noticeDeleteVr(dbHouse.getId(), token);
|
|
|
- return ViewResult.success("删除房源成功");
|
|
|
|
|
|
}
|
|
|
|