|
|
@@ -1,11 +1,14 @@
|
|
|
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;
|
|
|
import fcb.project.manager.base.enums.DeleteStatus;
|
|
|
import fcb.project.manager.base.enums.HouseStatus;
|
|
|
+import fcb.project.manager.base.param.usedEstate.QueryUsedAudit;
|
|
|
+import fcb.project.manager.base.param.usedEstate.RequestOnline;
|
|
|
import fcb.project.manager.base.service.custom.PanoService;
|
|
|
import fcb.project.manager.base.service.impl.TmAuditLogServiceImpl;
|
|
|
import fcb.project.manager.base.service.impl.TmAuditServiceImpl;
|
|
|
@@ -18,6 +21,7 @@ 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.base.uuid.SnowFlakeUUidUtils;
|
|
|
+import fdage.back.sdk.utils.HttpClientUtil;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiImplicitParam;
|
|
|
import io.swagger.annotations.ApiImplicitParams;
|
|
|
@@ -25,6 +29,7 @@ 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.beans.factory.annotation.Value;
|
|
|
import org.springframework.data.redis.core.RedisTemplate;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
@@ -67,6 +72,9 @@ public class AuditController extends BaseController{
|
|
|
@Autowired
|
|
|
private TmOperationServiceImpl tmOperationService;
|
|
|
|
|
|
+ @Value("${fcb.main.url}")
|
|
|
+ private String fcbmainurl;
|
|
|
+
|
|
|
@GetMapping("/queryOrSearchList")
|
|
|
@ApiOperation(value = "根据条件拉取所有审批记录")
|
|
|
@ApiImplicitParams({
|
|
|
@@ -171,13 +179,14 @@ public class AuditController extends BaseController{
|
|
|
|
|
|
auditResultStr = "审核通过";
|
|
|
|
|
|
- dbHouse.setOnline(1);
|
|
|
- //1、通知看看，翻转场景码的状态
|
|
|
+// dbHouse.setOnline(1);
|
|
|
+ dbHouse.setOnline(0);
|
|
|
+// 1、通知看看，翻转场景码的状态
|
|
|
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("status" , 2);
|
|
|
map.put("sceneNum" , sceneNumList.stream().collect(Collectors.joining(";")));
|
|
|
log.info("上送四维看看的参数为:{}" , JSON.toJSONString(map));
|
|
|
SceneRspBean rsp = sceneFeign.updateSceneStatus(map , getToken());
|
|
|
@@ -191,8 +200,8 @@ public class AuditController extends BaseController{
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- //2、通知720，翻转场景码的状态
|
|
|
- panoService.noticeVrAuditStatus(dbHouse.getId() , getToken() , 4);
|
|
|
+ //2、通知720，翻转场景码的状态(审核通过/上线:4， 下线：3)
|
|
|
+ panoService.noticeVrAuditStatus(dbHouse.getId() , getToken() , 3);
|
|
|
}
|
|
|
}
|
|
|
if(auditRequestBean.getAuditStatus().compareTo(AuditStatus.REJECT.getCode()) == 0){
|
|
|
@@ -267,29 +276,52 @@ public class AuditController extends BaseController{
|
|
|
@ApiImplicitParam(name = "online", value = "是否上线：1->上线;-0->下线", paramType = "query", required = false, dataType = "Integer"),
|
|
|
})
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public Result<Object> online(String id , Integer online){
|
|
|
+ public Result<Object> online(@RequestBody QueryUsedAudit queryUsedAudit){
|
|
|
|
|
|
- if(StringUtils.isBlank(id) || null == online){
|
|
|
+ if(StringUtils.isBlank(queryUsedAudit.getHouseId()) || null == queryUsedAudit.getOnline()){
|
|
|
return Result.failure("房源ID或者状态不能为空");
|
|
|
}
|
|
|
- if(online.compareTo(1) != 0 &&
|
|
|
- online.compareTo(0) != 0){
|
|
|
+ if(queryUsedAudit.getOnline().compareTo(1) != 0 &&
|
|
|
+ queryUsedAudit.getOnline().compareTo(0) != 0){
|
|
|
return Result.failure("上下线状态非法");
|
|
|
}
|
|
|
- TmHouse tmHouse = tmHouseService.getById(id);
|
|
|
+ TmHouse tmHouse = tmHouseService.getById(queryUsedAudit.getHouseId());
|
|
|
if(null == tmHouse){
|
|
|
return Result.failure("房源不存在在");
|
|
|
}
|
|
|
- tmHouse.setOnline(online);
|
|
|
- if(online.compareTo(0) == 0){
|
|
|
+ tmHouse.setOnline(queryUsedAudit.getOnline());
|
|
|
+ if(queryUsedAudit.getOnline().compareTo(0) == 0){
|
|
|
tmHouse.setStatus(HouseStatus.DRAFT.getCode());
|
|
|
}
|
|
|
tmHouseService.updateHouse(tmHouse);
|
|
|
Map<String , Object> map = new HashMap<>();
|
|
|
map.put("sceneNum" , tmHouse.getSceneNum());
|
|
|
- if(online.compareTo(1) == 0){
|
|
|
+ if(queryUsedAudit.getOnline().compareTo(1) == 0){
|
|
|
//上线
|
|
|
+ List<String> sceneNumList = panoService.getKanKanSceneNums(tmHouse.getId() , getToken());
|
|
|
+ log.info("720返回的房源的[{}]对应的四维场景码列表为:{}" , tmHouse.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("调用看看的更新场景状态微服务失败");
|
|
|
+ if(null != rsp){
|
|
|
+ log.info("code = {} , msg = {}" , rsp.getCode() , rsp.getMsg());
|
|
|
+ }
|
|
|
+ throw new CommonBaseException(ResultCodeEnum.D101 , "更新看看场景状态失败");
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ //通知720,告知房源下线(审核通过/上线:4， 下线：3)
|
|
|
+ panoService.noticeVrAuditStatus(tmHouse.getId() , getToken() , 4);
|
|
|
|
|
|
+ int ins = tmOperationService.addNewWithTypeAndContent(getContextUserInfo() , "审核管理" , "审核管理/审核上线/" + tmHouse.getHouseTitle());
|
|
|
+ if(ins != 1){
|
|
|
+ log.info("插入操作记录失败");
|
|
|
+ }
|
|
|
}else{
|
|
|
//下线
|
|
|
List<String> sceneNumList = panoService.getKanKanSceneNums(tmHouse.getId() , getToken());
|
|
|
@@ -316,7 +348,37 @@ public class AuditController extends BaseController{
|
|
|
if(ins != 1){
|
|
|
log.info("插入操作记录失败");
|
|
|
}
|
|
|
+
|
|
|
+ //将上架信息通知fcb
|
|
|
}
|
|
|
+
|
|
|
+ try {
|
|
|
+ //将上/下架信息通知fcb
|
|
|
+ if(queryUsedAudit.getRequestOnlineList()!=null && queryUsedAudit.getRequestOnlineList().size()>0){
|
|
|
+ List<RequestOnline> requestOnlineList = queryUsedAudit.getRequestOnlineList();
|
|
|
+
|
|
|
+ for(RequestOnline ro:requestOnlineList){
|
|
|
+ ro.setProId(tmHouse.getEstateId());
|
|
|
+ }
|
|
|
+
|
|
|
+ String param = JSON.toJSONString(queryUsedAudit.getRequestOnlineList());
|
|
|
+
|
|
|
+ String url = fcbmainurl;
|
|
|
+ if(queryUsedAudit.getOnline().compareTo(1) == 0){
|
|
|
+ url += "/pic/saveOrUpdate";
|
|
|
+ }else {
|
|
|
+ url += "/pic/remove";
|
|
|
+ }
|
|
|
+
|
|
|
+ String returnMsg = HttpClientUtil.doPostJson(url, param);
|
|
|
+
|
|
|
+ log.info("========上下架信息同步房车宝，param: {}, url ：{}, 返回结果 ： {}",param,url,returnMsg);
|
|
|
+ }
|
|
|
+ }catch (Exception e){
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
return Result.success();
|
|
|
}
|
|
|
|
by su