sit 提交

cms_pano_fcb/gis_domain/src/main/java/com/gis/domain/dto/HouseIndexPageDto.java

@@ -0,0 +1,17 @@
+package com.gis.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * Created by owen on 2021/1/8 0008 16:31
+ */
+@Data
+public class HouseIndexPageDto extends PageDto {
+
+    @ApiModelProperty(value = "房源id列表")
+    private List<String> houseIds;
+}

cms_pano_fcb/gis_domain/src/main/java/com/gis/domain/dto/SceneRroPageDto.java

@@ -21,4 +21,8 @@ public class SceneRroPageDto extends PageDto {
 
     @ApiModelProperty(value = "状态，0：计算完成的")
     private String status;
+
+    @ApiModelProperty(value = "查找场景名称")
+    private String sceneName;
+
 }

cms_pano_fcb/gis_mapper/src/main/java/com/gis/mapper/SceneMapper.java

@@ -55,7 +55,7 @@ public interface SceneMapper extends IBaseMapper<SceneEntity, String> {
     @Update("UPDATE tb_scene SET sort=#{sort} where id = #{id}")
     void setSortById(String id, String sort);
 
-    @Select("select scene_code from tb_scene where is_delete = 0 and status = #{status} and type = #{type} and house_id = #{houseId}")
+    @Select("select scene_code from tb_scene where is_delete = 0 and status >= #{status} and type = #{type} and house_id = #{houseId}")
     List<String> getVrSceneCode(String houseId, String status, String type);
 
     @Update("UPDATE tb_scene SET is_delete = 1 where is_delete = 0 AND house_id = #{houseId}")
@@ -63,4 +63,7 @@ public interface SceneMapper extends IBaseMapper<SceneEntity, String> {
 
     @Update("UPDATE tb_scene SET status = #{status} where is_delete = 0 AND house_id = #{houseId}")
     void houseAudit(String houseId, String status);
+
+    @Select("select * from tb_scene where is_delete = 0 and status = #{status} and house_id = #{houseId}")
+    List<SceneEntity> findByHouseIdAndStatus(String houseId, String status);
 }

cms_pano_fcb/gis_service/src/main/java/com/gis/service/HouseService.java

@@ -0,0 +1,12 @@
+package com.gis.service;
+
+import com.gis.common.util.Result;
+
+/**
+ * Created by owen on 2020/3/11 0011 16:14
+ */
+public interface HouseService  {
+
+
+    Result checkStatus(String houseId, String status);
+}

cms_pano_fcb/gis_service/src/main/java/com/gis/service/SceneService.java

@@ -22,6 +22,8 @@ public interface SceneService extends IBaseService<SceneEntity, String> {
 
     Result findVrModel(SceneRroPageDto param);
 
+    Result findVrModel2(SceneRroPageDto param);
+
     Result saveVrModel(VrModelDto param);
 
 
@@ -50,4 +52,6 @@ public interface SceneService extends IBaseService<SceneEntity, String> {
     Result houseRemove(String houseId);
 
     Result houseAudit(String houseId, String status);
+
+    Result findAllHouseIdIndex(HouseIndexPageDto param);
 }

cms_pano_fcb/gis_service/src/main/java/com/gis/service/impl/HouseServiceImpl.java

@@ -0,0 +1,45 @@
+package com.gis.service.impl;
+
+import com.gis.common.constant.ConfigConstant;
+import com.gis.common.task.AsyncTask;
+import com.gis.common.util.AliyunOssUtil;
+import com.gis.common.util.FileUtils;
+import com.gis.common.util.Result;
+import com.gis.domain.entity.SceneEntity;
+import com.gis.feign.HouseFeign;
+import com.gis.mapper.SceneMapper;
+import com.gis.service.HouseService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/3/11 0011 16:16
+ */
+@Slf4j
+@Service
+public class HouseServiceImpl implements HouseService {
+
+    @Autowired
+    private SceneMapper entityMapper;
+
+
+    @Autowired
+    HouseFeign houseFeign;
+
+
+    @Override
+    public Result checkStatus(String houseId, String status) {
+        List<SceneEntity> entityList = entityMapper.findByHouseIdAndStatus(houseId, status);
+        log.info("计算中的场景： " + entityList);
+        boolean flag = false ;
+        if (entityList.size() > 0) {
+            flag = true;
+        }
+        log.info("是否有计算中的场景： " + flag);
+        return Result.success(flag);
+    }
+}

cms_pano_fcb/gis_service/src/main/java/com/gis/service/impl/SceneServiceImpl.java

@@ -28,10 +28,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.validation.constraints.NotBlank;
 import java.io.*;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 /**
@@ -177,6 +174,14 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
                 houseSceneIndexDto.setUpdateTime(LocalDateTime.now());
                 houseSceneIndexDto.setFcbHouseId(hengdaId);
                 Result result = houseFeign.updateHouseSceneIndex(houseSceneIndexDto);
+
+//                JSONObject jsonObject = new JSONObject();
+//                jsonObject.put("id", houseId);
+//                jsonObject.put("sceneNum", houseId);
+//                jsonObject.put("updateTime", houseId);
+//                jsonObject.put("fcbHouseId", houseId);
+//                jsonObject.put("id", houseId);
+
                 if (result.getCode() == 0) {
                     log.info("新场景码到VR项目完成");
                 } else {
@@ -349,9 +354,12 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
     public Result getIndex(String houseId) {
         List<SceneEntity> index = entityMapper.getIndex(houseId);
         if (index.size() == 0) {
+            log.info("首页场景码不存在");
             return Result.success();
         }
-        return Result.success(index.get(0));
+        SceneEntity entity = index.get(0);
+        log.info("首页场景码: " + entity.getSceneCode());
+        return Result.success(entity);
     }
 
     @Override
@@ -386,7 +394,11 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
 
     @Override
     public Result getVrSceneCode(String houseId, String status, String type) {
-        return Result.success(entityMapper.getVrSceneCode(houseId, status, type));
+        // 需要把状态 3：审查中， 4：审核通过的数据都返回
+        List<String> vrSceneCode = entityMapper.getVrSceneCode(houseId, status, type);
+        log.info("返回给恒大管理后台数据： " +  vrSceneCode);
+
+        return Result.success(vrSceneCode);
     }
 
     @Override
@@ -396,11 +408,40 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
     }
 
     @Override
+    public void startPage(PageDto param) {
+        super.startPage(param);
+    }
+
+    @Override
     public Result houseAudit(String houseId, String status) {
         entityMapper.houseAudit(houseId, status);
         return Result.success();
     }
 
+    @Override
+    public Result findAllHouseIdIndex(HouseIndexPageDto param) {
+        startPage(param);
+        List<String> houseIds = param.getHouseIds();
+        ArrayList<Map<String, Object>> result = new ArrayList<>();
+        if (houseIds.size() > 0) {
+            for (String s : houseIds) {
+                List<SceneEntity> index = entityMapper.getIndex(s);
+                if (index.size() > 0) {
+                    HashMap<String, Object> map = new HashMap<>();
+                    SceneEntity entity = index.get(0);
+                    if (entity != null) {
+                        map.put(entity.getHouseId(), entity.getWebSite());
+                        result.add(map);
+                    }
+                }
+            }
+        }
+        log.info("提供给管理后台数据： " + result);
+        PageInfo page = new PageInfo<>(result);
+
+        return Result.success(page);
+    }
+
     /**
      * 添加VR模型
      * @return
@@ -411,7 +452,62 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
         @NotBlank(message = "token不能为空") String token = param.getToken();
         // 只获取计算成功的， 0：计算成功
         param.setStatus("0");
+        String searchKey = param.getSearchKey();
+        if (StringUtils.isNotBlank(searchKey)){
+            param.setSceneName(searchKey);
+        }
+
+        Result result = sceneProFeign.findByList(param, token);
+
+        // 过滤已添加的数据
+        if (result.getCode() == 0) {
+            log.info("调用四维看看查找场景列表数据成功");
+            Object data = result.getData();
+            PageInfo page = JSON.parseObject(data.toString(), PageInfo.class);
+
+            List<Object> list = page.getList();
+            log.info("list size: " + list.size());
+
+            List<Object> newList = new ArrayList<>();
+
+            for (Object o : list) {
+                JSONObject scenePro = JSON.parseObject(o.toString());
+                String sceneProId = scenePro.getString("id");
+                List<SceneEntity> vrModelId = entityMapper.findByVrModelId2(sceneProId);
+                String use = "0";
+                if (vrModelId.size() > 0) {
+                    use = "1";
+                }
+
+                scenePro.put("isUse", use);
+                newList.add(scenePro);
+            }
+
+            page.setList(newList);
+            log.info("newList size: " + newList.size());
+
+            return Result.success(page);
+        } else {
+            log.error("异常了");
+            return Result.failure(result.getMsg());
+        }
+
+
+    }
+
+    /**
+     * 没有的接口，需要删除
+     * @param param
+     * @return
+     */
+    @Override
+    public Result findVrModel2(SceneRroPageDto param) {
+        // TODO: 2021/1/8 0008 查找4dkk场景数据，当前区域公司下的模型
+        @NotBlank(message = "token不能为空") String token = param.getToken();
+        // 只获取计算成功的， 0：计算成功
+//        param.setStatus("0");
         Result result = sceneProFeign.findByList(param, token);
+        log.info("result: " + result.toString());
 
         // 过滤已添加的数据
         if (result.getCode() == 0) {

cms_pano_fcb/gis_web/src/main/java/com/gis/web/controller/HouseController.java

@@ -0,0 +1,69 @@
+package com.gis.web.controller;
+
+
+import com.gis.common.util.Result;
+import com.gis.domain.dto.*;
+import com.gis.domain.entity.SceneEntity;
+import com.gis.feign.HouseFeign;
+import com.gis.mapper.SceneMapper;
+import com.gis.service.HouseService;
+import com.gis.service.SceneService;
+import com.gis.web.aop.WebControllerLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.Valid;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * Created by owen on 2020/2/18 0018 12:17
+ */
+@Log4j2
+@Api(tags = "VR项目管理")
+@RestController
+@RequestMapping("fcb/pano/house")
+public class HouseController extends BaseController {
+
+    @Autowired
+    private HouseService houseService;
+
+
+    /**
+     * 提供恒大管理后台使用
+     * @param houseId
+     * @param status
+     * @return
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "houseId", value = "房源id", dataType = "String", required = true),
+            @ApiImplicitParam(name = "status", value = "状态， 1:计算中", dataType = "String"),
+    })
+    @ApiOperation(value = "提审检查场景状态")
+    @GetMapping("checkStatus/{houseId}/{status}")
+    public Result checkStatus(@PathVariable String houseId, @PathVariable String status) {
+        log.info("提审检查场景状态");
+        return houseService.checkStatus(houseId, status);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+}

cms_pano_fcb/gis_web/src/main/java/com/gis/web/controller/SceneController.java

@@ -81,6 +81,7 @@ public class SceneController extends BaseController {
     @ApiOperation(value = "场景排序")
     @PostMapping(value = "setSort")
     public Result setSort(@RequestBody Map<String, String> param) {
+        log.info("场景排序");
         return sceneService.setSort(param);
     }
 
@@ -98,12 +99,19 @@ public class SceneController extends BaseController {
         return sceneService.editHouse(param);
     }
 
+    /**
+     * 提供恒大管理后台使用
+     * 更新数据状态
+     * @param houseId
+     * @param status
+     * @return
+     */
     @WebControllerLog(description = "场景管理-VR项目审核通过/下线")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "houseId", value = "房源id", dataType = "String", required = true),
             @ApiImplicitParam(name = "status", value = "状态， 审核通过/上线:4， 下线：3", dataType = "String"),
     })
-    @ApiOperation(value = "VR项目审核通过/下线/上线", position = 3)
+    @ApiOperation(value = "VR项目审核通过/下线", position = 3)
     @GetMapping("house/audit/{houseId}/{status}")
     public Result houseAudit(@PathVariable String houseId, @PathVariable String status) {
         return sceneService.houseAudit(houseId, status);
@@ -113,6 +121,7 @@ public class SceneController extends BaseController {
     @ApiOperation(value = "VR项目删除", position = 3)
     @GetMapping("house/remove/{houseId}")
     public Result houseRemove(@PathVariable String houseId) {
+        log.info("VR项目删除: " + houseId);
         return sceneService.houseRemove(houseId);
     }
 
@@ -136,6 +145,14 @@ public class SceneController extends BaseController {
     }
 
 
+    /**
+     * 提供恒大管理后台使用
+     * 传status=3 ，需要把状态3、4 的数据都返回
+     * @param houseId
+     * @param status
+     * @param type
+     * @return
+     */
     @ApiImplicitParams({
             @ApiImplicitParam(name = "houseId", value = "房源id", dataType = "String", required = true),
             @ApiImplicitParam(name = "type", value = "场景类型， 楼盘:building， 园林：garden, 户型：house", dataType = "String", required = true),
@@ -144,6 +161,7 @@ public class SceneController extends BaseController {
     @ApiOperation(value = "获取场景码列表", position = 3)
     @GetMapping("getVrSceneCode/{houseId}/{status}/{type}")
     public Result getVrSceneCode(@PathVariable String houseId, @PathVariable String status, @PathVariable String type) {
+        log.info("获取场景码列表");
         return sceneService.getVrSceneCode(houseId, status, type);
     }
 
@@ -151,24 +169,48 @@ public class SceneController extends BaseController {
     @ApiOperation(value = "房源详情", position = 3)
     @GetMapping("house/detail/{houseId}")
     public Result houseDetail(@PathVariable String houseId) {
+        log.info("房源详情");
         return houseFeign.findByHouseId(houseId);
     }
 
+    /**
+     * 提供恒大管理后台使用
+     */
+    @ApiOperation(value = "房源首页批量获取", position = 3)
+    @PostMapping("house/findAllHouseId")
+    public Result findAllHouseId(@RequestBody HouseIndexPageDto param) {
+        log.info("房源首页批量获取");
+        return sceneService.findAllHouseIdIndex(param);
+    }
+
 
+    /**
+     * 调用四维看看接口
+     * @param param
+     * @return
+     */
     @ApiOperation(value = "VR模型查找", position = 3)
     @PostMapping("findVrModel")
     public Result findVrModel(@Valid @RequestBody SceneRroPageDto param) {
+        log.info("VR模型查找");
         return sceneService.findVrModel(param);
     }
 
+    /**
+     * 提供四维看看使用
+     * @param sceneCode
+     * @return
+     */
     @ApiOperation(value = "VR模模型-根据场景码查询")
     @GetMapping(value = "fdkk/findBySceneCode")
     public Result vrFindBySceneCode(String sceneCode) {
+        log.info("VR模模型-根据场景码查询： " + sceneCode);
         SceneEntity entity = sceneService.findBySceneCode(sceneCode);
         boolean flag = true;
         if (entity == null) {
             flag = false;
         }
+        log.info("查询结果： " + flag);
         return Result.success(flag);
     }
 
@@ -221,11 +263,11 @@ public class SceneController extends BaseController {
     }
 
 
-    @WebControllerLog(description = "场景管理-删除场景")
-    @ApiOperation("删除")
+    @WebControllerLog(description = "场景管理-场景删除")
+    @ApiOperation("场景删除")
     @GetMapping("removes/{id}")
     public Result remove(@PathVariable String id) {
-
+        log.info("场景删除");
         SceneEntity entity = sceneService.findById(id);
         if (entity.getStatus() == 1) {
             return Result.failure(7004, "执行中的任务不能删除");
@@ -283,56 +325,6 @@ public class SceneController extends BaseController {
         return Result.success();
     }
 
-//    @WebControllerLog(description = "场景管理-删除场景")
-//    @ApiOperation("删除")
-//    @GetMapping("removes/{ids}")
-//    public Result removes(@PathVariable String ids) {
-//        String[] split = ids.split(",");
-//        SceneEntity entity = null;
-//
-//        for (String id: split) {
-//            entity = sceneService.findById(id);
-//            if (entity.getStatus() == 1) {
-//                return  Result.failure(7004, "执行中的任务不能删除");
-//
-//            }
-//            entity.setIsDelete(1);
-//            // 设置场景为0
-//            entity.setIsIndex(0);
-//            entity.setUpdateTime(new Date());
-//            String houseId = entity.getHouseId();
-//            sceneService.update(entity);
-//
-//            // 更新首页
-//               List<SceneEntity> entityList = sceneMapper.findByHouseId(houseId);
-//               if (entityList.size() > 0) {
-//                   SceneEntity sceneEntity = entityList.get(0);
-//                   if (sceneEntity != null) {
-//                       sceneEntity.setIsIndex(1);
-//                       sceneService.update(sceneEntity);
-//                       // 更新首页场景到VR项目
-//                       HouseSceneIndexDto indexDto = new HouseSceneIndexDto();
-//                       indexDto.setId(sceneEntity.getHouseId());
-//                       indexDto.setSceneNum(entity.getSceneCode());
-//                       indexDto.setUpdateTime(LocalDateTime.now());
-//                       indexDto.setFcbHouseId(sceneEntity.getHengdaId());
-//                       Result result = houseFeign.updateHouseSceneIndex(indexDto);
-//                       if (result.getCode() == 0) {
-//                           log.info("更新了初始场景到VR项目完成");
-//                       } else {
-//                           log.error("更新了初始场景到VR项目异常");
-//                           return Result.failure(result.getMsg());
-//                       }
-//                       log.info("result: "+ result);
-//                       log.info("更新了初始场景到VR项目");
-//                   }
-//               }
-//        }
-//
-//
-//        return Result.success();
-//    }
-
 
     private SceneEntity setInitIndex(List<SceneEntity> entityList) {
 

cms_pano_fcb/gis_web/src/main/java/com/gis/web/controller/TestController.java

@@ -8,12 +8,11 @@ import com.gis.common.constant.RabbitConfig;
 import com.gis.common.exception.BaseRuntimeException;
 import com.gis.common.util.FileUtils;
 import com.gis.common.util.Result;
-import com.gis.domain.dto.HouseSceneIndexDto;
-import com.gis.domain.dto.UserDto;
-import com.gis.domain.dto.VrModelDto;
+import com.gis.domain.dto.*;
 import com.gis.domain.entity.SceneEntity;
 import com.gis.feign.HouseFeign;
 import com.gis.feign.UserFeign;
+import com.gis.mapper.SceneMapper;
 import com.gis.service.SceneService;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
@@ -27,6 +26,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -62,6 +62,9 @@ public class TestController extends BaseController {
     HouseFeign houseFeign;
 
     @Autowired
+    SceneMapper sceneMapper;
+
+    @Autowired
     private RedisTemplate<String, String> redisTemplate;
 
 
@@ -319,6 +322,8 @@ public class TestController extends BaseController {
     }
 
 
+
+
     /**
      * 测试，传json是可以的
      * @param houseId
@@ -395,4 +400,30 @@ public class TestController extends BaseController {
 
     }
 
-}
+    @ApiOperation(value = "VR模型查找", position = 3)
+    @PostMapping("findVrModel")
+    public Result findVrModel(@Valid @RequestBody SceneRroPageDto param) {
+        return sceneService.findVrModel2(param);
+    }
+
+    @ApiOperation(value = "房源首页获取", position = 3)
+    @PostMapping("findAllHouseId")
+    public Result findAllHouseId(@RequestBody HouseIndexPageDto param) {
+
+        return sceneService.findAllHouseIdIndex(param);
+    }
+
+
+    @Test
+    public void test2(){
+        List<Object> objects = new ArrayList<>();
+        objects.add("1");
+        objects.add("2");
+        objects.add("3");
+
+        System.out.println(objects);
+
+    }
+
+
+}

cms_pano_fcb/remark.md

@@ -100,6 +100,9 @@ sit:
    4Dade_hy01
    
    /tmp/a/
+   
+   web: 
+   https://vr-web01-uat.fcb.com.cn/evergrande/#/login
 
 # 720yun 需求
  1. 先上传全景图