房车宝更改

fcb-project-manager-core/src/main/java/fcb/project/manager/core/controller/AuditController.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;
@@ -13,7 +12,6 @@ import fcb.project.manager.base.service.impl.TmAuditServiceImpl;
 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;
@@ -26,7 +24,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
@@ -36,7 +33,6 @@ import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.TreeMap;
 import java.util.stream.Collectors;
 
 /**
@@ -61,9 +57,6 @@ public class AuditController extends BaseController{
     private TmHouseServiceImpl tmHouseService;
 
     @Autowired
-    private RedisTemplate redisTemplate;
-
-    @Autowired
     private SceneFeign sceneFeign;
 
     @Autowired
@@ -72,8 +65,6 @@ public class AuditController extends BaseController{
     @Autowired
     private TmOperationServiceImpl tmOperationService;
 
-    @Autowired
-    private PanoFeign panoFeign;
 
     @GetMapping("/queryOrSearchList")
     @ApiOperation(value = "根据条件拉取所有审批记录")
@@ -124,29 +115,14 @@ public class AuditController extends BaseController{
     @Transactional(rollbackFor = Exception.class)
     public Result<Object> audit(@RequestBody AuditRequestBean auditRequestBean , HttpServletRequest request){
 
-        if(null == auditRequestBean){
-            return Result.failure("请求体为空");
-        }
-        if(null == auditRequestBean.getId() || null == auditRequestBean.getAuditStatus()){
-            return Result.failure("审核记录ID或者审核结果不能为空");
-        }
-        if(AuditStatus.AUDITED.getCode().compareTo(auditRequestBean.getAuditStatus()) != 0
-          && AuditStatus.REJECT.getCode().compareTo(auditRequestBean.getAuditStatus()) != 0){
-            return Result.failure("审核结果非法");
-        }
-        TmAudit tmAudit = tmAuditService.getById(auditRequestBean.getId());
-        if(null == tmAudit){
-            return Result.failure("审核记录不存在");
-        }
+        Result errorResult = judgeParam(auditRequestBean);
+        if (errorResult != null) return errorResult;
 
-        if(StringUtils.isBlank(tmAudit.getVrId())){
-            return Result.failure("该审核记录未绑定房源，无需处理");
-        }
+        TmAudit tmAudit;
         ContextTokenBean tokenMap = getContextUserInfo();
 
         TmAuditLog tmAuditLog = new TmAuditLog();
         //这里要先锁定当前审核记录
-        tmAudit = null;
         tmAudit = tmAuditService.selectForUpdate(auditRequestBean.getId());
         if(null == tmAudit){
             log.info("更新审核状态环节，审核记录[{}]抢锁失败" , auditRequestBean.getId());
@@ -202,9 +178,10 @@ public class AuditController extends BaseController{
         }
         String auditResultStr = "";
         Map<String , Object> map = new HashMap<>();
-        if(AuditStatus.AUDITED.getCode().compareTo(auditRequestBean.getAuditStatus()) == 0){
+        // 准备集团审核通过时才触发通知全景图和场景码状态
+        if(AuditStatus.AUDITED.getCode().equals(auditRequestBean.getAuditStatus())
+                && AuditStatus.WAITING_AUDIT.getCode().equals(tmAudit.getAuditStatus())){
             auditResultStr = "审核通过";
-
             dbHouse.setOnline(1);
             //1、通知看看，翻转场景码的状态
             List<String> sceneNumList = panoService.getKanKanSceneNums(dbHouse.getId() , getToken());
@@ -227,7 +204,6 @@ public class AuditController extends BaseController{
             }
             //2、通知720，翻转场景码的状态
             panoService.noticeVrAuditStatus(dbHouse.getId() , getToken() , 4);
-
         }else if(AuditStatus.REJECT.getCode().compareTo(auditRequestBean.getAuditStatus()) == 0){
             auditResultStr = "审核不通过";
         }
@@ -269,6 +245,33 @@ public class AuditController extends BaseController{
         return Result.success("审核成功" , resMap);
     }
 
+    /**
+     * 判断是否符合数据规则
+     * @param auditRequestBean
+     * @return
+     */
+    private Result judgeParam(AuditRequestBean auditRequestBean) {
+        if(null == auditRequestBean){
+            return Result.failure("请求体为空");
+        }
+        if(null == auditRequestBean.getId() || null == auditRequestBean.getAuditStatus()){
+            return Result.failure("审核记录ID或者审核结果不能为空");
+        }
+        if(AuditStatus.AUDITED.getCode().compareTo(auditRequestBean.getAuditStatus()) != 0
+          && AuditStatus.REJECT.getCode().compareTo(auditRequestBean.getAuditStatus()) != 0){
+            return Result.failure("审核结果非法");
+        }
+        TmAudit tmAudit = tmAuditService.getById(auditRequestBean.getId());
+        if(null == tmAudit){
+            return Result.failure("审核记录不存在");
+        }
+
+        if(StringUtils.isBlank(tmAudit.getVrId())){
+            return Result.failure("该审核记录未绑定房源，无需处理");
+        }
+        return null;
+    }
+
     @PostMapping("/online")
     @ApiOperation(value = "上线/下线")
     @ApiImplicitParams({

pom.xml

@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.4dage</groupId>
             <artifactId>4dage-back-sdk</artifactId>
-            <version>1.0.3.1-RELEASE</version>
+            <version>1.0.3.0-RELEASE</version>
             <exclusions>
                 <exclusion>
                     <groupId>io.lettuce</groupId>