审核区分二手房，新房

fcb-project-manager-core/src/main/java/fcb/project/manager/base/entity/AuditRequestBean.java

@@ -17,4 +17,8 @@ public class AuditRequestBean implements Serializable {
     private Integer auditStatus;
     private String auditRemark;
 
+
+    //1 - 二手房
+    private String auditHouseType;
+
 }

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

@@ -119,6 +119,7 @@ public class AuditController extends BaseController{
             @ApiImplicitParam(name = "id", value = "审核记录ID", paramType = "query", required = true, dataType = "String"),
             @ApiImplicitParam(name = "auditStatus", value = "审核状态: 0->待审核;1->已审核;-1->不通过", paramType = "query", required = true, dataType = "Integer"),
             @ApiImplicitParam(name = "auditRemark", value = "审核备注", paramType = "query", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "auditHouseType", value = "房源类型 0-> 二手房  1-> 新房", paramType = "query", required = true, dataType = "String"),
     })
     @Transactional(rollbackFor = Exception.class)
     public Result<Object> audit(@RequestBody AuditRequestBean auditRequestBean , HttpServletRequest request){
@@ -129,6 +130,10 @@ public class AuditController extends BaseController{
         if(null == auditRequestBean.getId() || null == auditRequestBean.getAuditStatus()){
             return Result.failure("审核记录ID或者审核结果不能为空");
         }
+
+        if(StringUtils.isEmpty(auditRequestBean.getAuditHouseType())){
+            return Result.failure("审核房源类型不能为空");
+        }
         if(AuditStatus.AUDITED.getCode().compareTo(auditRequestBean.getAuditStatus()) != 0
                 && AuditStatus.REJECT.getCode().compareTo(auditRequestBean.getAuditStatus()) != 0){
             return Result.failure("审核结果非法");
@@ -179,8 +184,12 @@ public class AuditController extends BaseController{
 
                 auditResultStr = "审核通过";
 
-//                dbHouse.setOnline(1);
-                dbHouse.setOnline(0);
+                if(auditRequestBean.getAuditHouseType().equals("0")){
+                    dbHouse.setOnline(0);
+                }else {
+                    dbHouse.setOnline(1);
+                }
+//
 //                1、通知看看，翻转场景码的状态
                 List<String> sceneNumList = panoService.getKanKanSceneNums(dbHouse.getId() , getToken());
                 log.info("720返回的房源的[{}]对应的四维场景码列表为:{}" , dbHouse.getSceneNum() , JSON.toJSONString(sceneNumList));
@@ -201,7 +210,12 @@ public class AuditController extends BaseController{
 
                 }
                 //2、通知720，翻转场景码的状态(审核通过/上线:4， 下线：3)
-                panoService.noticeVrAuditStatus(dbHouse.getId() , getToken() , 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);
+                }
             }
         }
         if(auditRequestBean.getAuditStatus().compareTo(AuditStatus.REJECT.getCode()) == 0){

fcb-project-manager-core/src/main/java/fcb/project/manager/core/controller/TmRedirectWebController.java

@@ -36,7 +36,6 @@ public class TmRedirectWebController extends BaseController{
         Instant stepTwoStart = Instant.now();
         String str = "";
         try {
-            ContextTokenBean tokenMap = getContextUserInfo();
             log.info("二手房接口转发 ： " + name);
 
             String timestamp = String.valueOf(new Date().getTime());
@@ -44,30 +43,6 @@ public class TmRedirectWebController extends BaseController{
             String nonce = DateUtil.randonNum(5);
             String secret = "fcb2021";
 
-            if(object.containsKey("companyName")){
-                if(StringUtils.isNotEmpty(tokenMap.getDepartmentName())){
-                    object.put("companyName",tokenMap.getDepartmentName());
-                }else{
-                    object.put("companyName","");
-                }
-            }
-
-            if(object.containsKey("operatorCompanyId")){
-                if(StringUtils.isNotEmpty(tokenMap.getDepartmentId())){
-                    object.put("operatorCompanyId",tokenMap.getDepartmentId());
-                }else{
-                    object.put("operatorCompanyId","");
-                }
-            }
-
-            if(object.containsKey("operatorCompanyName")){
-                if(StringUtils.isNotEmpty(tokenMap.getDepartmentName())){
-                    object.put("operatorCompanyName",tokenMap.getDepartmentName());
-                }else{
-                    object.put("operatorCompanyName","");
-                }
-            }
-
             String params = object.toJSONString();
             String[] strary = new String[]{secret,timestamp,nonce,params,apiNumber};
             Arrays.sort(strary);