调整

src/main/java/fcb/project/manager/FcbProjectManagerApplication.java

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

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

@@ -26,12 +26,12 @@ public class PanoService {
     @Autowired
     PanoFeign panoFeign;
 
-    public boolean noticeVrAuditStatus(String houseId, String token){
+    public boolean noticeVrAuditStatus(String houseId, String token , int status){
 
         if(StringUtils.isBlank(houseId)){
             return false;
         }
-        CommonRspBean rspBean = panoFeign.auditedVrNotice(houseId , token);
+        CommonRspBean rspBean = panoFeign.auditedVrNotice(houseId, status , token );
         log.info("通知720VR项目审核通过，720返回结果:{}" , JSON.toJSONString(rspBean));
         if(null == rspBean || null == rspBean.getCode() || rspBean.getCode().compareTo(0) != 0){
             return false;

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

@@ -149,26 +149,26 @@ public class AuditController extends BaseController{
             dbHouse.setStatus(HouseStatus.AUDITED.getCode());
             dbHouse.setOnline(1);
             //1、通知看看，翻转场景码的状态
-            if(StringUtils.isNotBlank(dbHouse.getSceneNum())){
-                List<String> sceneNumList = panoService.getKanKanSceneNums(dbHouse.getId() , getToken());
-                if(!CollectionUtils.isEmpty(sceneNumList)){
-                    //上线
-                    map.put("status" , 1);
-                    map.put("sceneNum" , sceneNumList.stream().collect(Collectors.joining(";")));
-                    SceneRspBean rsp = sceneFeign.updateSceneStatus(map , getToken());
-                    if(null == rsp || rsp.getCode() != 0){
-                        log.info("调用看看的更新场景状态微服务失败");
-                        if(null != rsp){
-                            log.info("code = {} , msg = {}" , rsp.getCode() , rsp.getMsg());
-                        }
-                        throw new CommonBaseException(ResultCodeEnum.D101 , "更新看看场景状态失败");
+            List<String> sceneNumList = panoService.getKanKanSceneNums(dbHouse.getId() , getToken());
+            log.info("720返回的房源的[{}]对应的四维场景码列表为:{}" , dbHouse.getSceneNum() , JSON.toJSONString(sceneNumList));
+            if(!CollectionUtils.isEmpty(sceneNumList)){
+                //上线
+                map.put("status" , 1);
+                map.put("sceneNum" , sceneNumList.stream().collect(Collectors.joining(";")));
+                log.info("上送四维看看的参数为:{}" , JSON.toJSONString(map));
+                SceneRspBean rsp = sceneFeign.updateSceneStatus(map , getToken());
+                log.info("四维看看翻转状态返回为:{}" , JSON.toJSONString(rsp));
+                if(null == rsp || rsp.getCode() != 0){
+                    log.info("调用看看的更新场景[{}]状态微服务失败" , JSON.toJSONString(sceneNumList));
+                    if(null != rsp){
+                        log.info("code = {} , msg = {}" , rsp.getCode() , rsp.getMsg());
                     }
-
+                    throw new CommonBaseException(ResultCodeEnum.D101 , "更新看看场景状态失败");
                 }
 
             }
             //2、通知720，翻转场景码的状态
-            panoService.noticeVrAuditStatus(dbHouse.getId() , getToken());
+            panoService.noticeVrAuditStatus(dbHouse.getId() , getToken() , 4);
 
         }else if(AuditStatus.REJECT.getCode().compareTo(auditRequestBean.getAuditStatus()) == 0){
             auditResultStr = "审核不通过";
@@ -220,38 +220,38 @@ public class AuditController extends BaseController{
             tmHouse.setStatus(HouseStatus.DRAFT.getCode());
         }
         tmHouseService.updateHouse(tmHouse);
-        if(StringUtils.isNotBlank(tmHouse.getSceneNum()) &&
-                tmHouse.getSceneNum().startsWith("HD")){
-            Map<String , Object> map = new HashMap<>();
-            map.put("sceneNum" , tmHouse.getSceneNum());
-            if(online.compareTo(1) == 0){
-                //上线
+        Map<String , Object> map = new HashMap<>();
+        map.put("sceneNum" , tmHouse.getSceneNum());
+        if(online.compareTo(1) == 0){
+            //上线
 
-            }else{
-                //下线
-                List<String> sceneNumList = panoService.getKanKanSceneNums(tmHouse.getId() , getToken());
-                if(!CollectionUtils.isEmpty(sceneNumList)){
-                    map.put("status" , 2);
-                    map.put("sceneNum" , sceneNumList.stream().collect(Collectors.joining(";")));
-                    SceneRspBean rsp = sceneFeign.updateSceneStatus(map , getToken());
-                    log.info("四维看看翻转状态返回为:{}" , JSON.toJSONString(rsp));
-                    if(null == rsp || rsp.getCode() != 0){
-                        log.info("调用看看的更新场景状态微服务失败");
-                        if(null != rsp){
-                            log.info("code = {} , msg = {}" , rsp.getCode() , rsp.getMsg());
-                        }
-                        throw new CommonBaseException(ResultCodeEnum.D101 , "更新看看场景状态失败");
+        }else{
+            //下线
+            List<String> sceneNumList = panoService.getKanKanSceneNums(tmHouse.getId() , getToken());
+            log.info("720返回的房源的[{}]对应的四维场景码列表为:{}" , tmHouse.getSceneNum() , JSON.toJSONString(sceneNumList));
+            if(!CollectionUtils.isEmpty(sceneNumList)){
+                map.put("status" , 2);
+                map.put("sceneNum" , sceneNumList.stream().collect(Collectors.joining(";")));
+                log.info("上送四维看看的参数为:{}" , JSON.toJSONString(map));
+                SceneRspBean rsp = sceneFeign.updateSceneStatus(map , getToken());
+                log.info("四维看看翻转状态返回为:{}" , JSON.toJSONString(rsp));
+                if(null == rsp || rsp.getCode() != 0){
+                    log.info("调用看看的更新场景状态微服务失败");
+                    if(null != rsp){
+                        log.info("code = {} , msg = {}" , rsp.getCode() , rsp.getMsg());
                     }
-
-                }
-                int ins = tmOperationService.addNewWithTypeAndContent(getContextUserInfo() , "审核管理" , "审核管理/审核下线/" + tmHouse.getHouseTitle() );
-                if(ins != 1){
-                    log.info("插入操作记录失败");
-                    throw new CommonBaseException(ResultCodeEnum.D101 , "插入操作记录失败");
+                    throw new CommonBaseException(ResultCodeEnum.D101 , "更新看看场景状态失败");
                 }
+
+            }
+
+            panoService.noticeVrAuditStatus(tmHouse.getId() , getToken() , 3);
+
+            int ins = tmOperationService.addNewWithTypeAndContent(getContextUserInfo() , "审核管理" , "审核管理/审核下线/" + tmHouse.getHouseTitle() );
+            if(ins != 1){
+                log.info("插入操作记录失败");
+                throw new CommonBaseException(ResultCodeEnum.D101 , "插入操作记录失败");
             }
-        }else{
-            log.info("非四维看看场景码，无需翻转传场景码的状态");
         }
         return Result.success();
     }

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

@@ -1,7 +1,6 @@
 package fcb.project.manager.core.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import fcb.project.manager.base.entity.*;
 import fcb.project.manager.base.enums.AuditStatus;
@@ -12,12 +11,11 @@ import fcb.project.manager.base.service.impl.TmEstateServiceImpl;
 import fcb.project.manager.base.service.impl.TmHouseServiceImpl;
 import fcb.project.manager.base.service.impl.TmOperationServiceImpl;
 import fcb.project.manager.base.utils.DataUtils;
-import fcb.project.manager.core.feignInterfaces.PanoFeign;
+import fcb.project.manager.core.feignInterfaces.SceneFeign;
 import fdage.back.sdk.base.entity.Result;
 import fdage.back.sdk.base.enums.ResultCodeEnum;
 import fdage.back.sdk.base.exception.CommonBaseException;
 import fdage.back.sdk.core.alibabaUtils.AlibabaOssHelper;
-import fdage.back.sdk.utils.FileUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -28,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -36,7 +35,9 @@ import java.io.File;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 2 * @Author: Abner
@@ -88,6 +89,9 @@ public class HouseManagerController extends BaseController{
     @Autowired
     private PanoService panoService;
 
+    @Autowired
+    private SceneFeign sceneFeign;
+
 
 
     @GetMapping("/queryOrSearchList")
@@ -376,6 +380,27 @@ public class HouseManagerController extends BaseController{
         if(delete != 1){
             return Result.failure("删除失败");
         }
+        List<String> sceneNumList = panoService.getKanKanSceneNums(dbHouse.getId() , getToken());
+        log.info("720返回的房源的[{}]对应的四维场景码列表为:{}" , dbHouse.getSceneNum() , JSON.toJSONString(sceneNumList));
+        if(!CollectionUtils.isEmpty(sceneNumList)){
+            Map<String , Object> map = new HashMap<>();
+            map.put("status" , 2);
+            map.put("sceneNum" , sceneNumList.stream().collect(Collectors.joining(";")));
+            log.info("上送四维看看的参数为:{}" , JSON.toJSONString(map));
+            SceneRspBean rsp = sceneFeign.updateSceneStatus(map , getToken());
+            log.info("四维看看翻转状态返回为:{}" , JSON.toJSONString(rsp));
+            if(null == rsp || rsp.getCode() != 0){
+                log.info("调用看看的更新场景状态微服务失败");
+                if(null != rsp){
+                    log.info("code = {} , msg = {}" , rsp.getCode() , rsp.getMsg());
+                }
+                throw new CommonBaseException(ResultCodeEnum.D101 , "更新看看场景状态失败");
+            }
+
+        }
+
+        panoService.noticeVrAuditStatus(houseId , getToken() , 3);
+
         panoService.noticeDeleteVr(houseId , getToken());
         return Result.success("删除房源成功");
 

src/main/java/fcb/project/manager/core/feignInterfaces/PanoFeign.java

@@ -17,8 +17,8 @@ public interface PanoFeign {
     public SevenTwoZeroSceneRspBean getFdkanaknSceneNum(@RequestHeader(name = "token") String token , @PathVariable(name = "") String
             houseId , @PathVariable(name = "status") String status , @PathVariable(name = "type")String type);
 
-    @GetMapping("/fcb/pano/scene/house/audit/{houseId}")
-    public CommonRspBean auditedVrNotice(@PathVariable String houseId , @RequestHeader(name = "token") String token );
+    @GetMapping("/fcb/pano/scene/house/audit/{houseId}/{status}")
+    public CommonRspBean auditedVrNotice(@PathVariable String houseId , @PathVariable Integer status, @RequestHeader(name = "token") String token );
 
     @GetMapping("/fcb/pano/scene/house/remove/{houseId}")
     public CommonRspBean deleteVrNotice(@PathVariable String houseId , @RequestHeader(name = "token") String token );