Selaa lähdekoodia

更新:
场景列表轮询检查,改为30秒一次,返回值增加isCheck

wuweihao 4 vuotta sitten
vanhempi
commit
3c7790914d

+ 5 - 0
cms_pano_fcb/gis_service/src/main/java/com/gis/service/SceneService.java

@@ -1,6 +1,7 @@
 package com.gis.service;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.*;
 import com.gis.domain.entity.SceneEntity;
@@ -54,4 +55,8 @@ public interface SceneService extends IBaseService<SceneEntity, String> {
     Result houseAudit(String houseId, String status);
 
     Result findAllHouseIdIndex(HouseIndexPageDto param);
+
+//    Result checkStatus(String houseId, String status);
+
+    JSONObject jsonSearch(ScenePageDto param);
 }

+ 44 - 0
cms_pano_fcb/gis_service/src/main/java/com/gis/service/impl/SceneServiceImpl.java

@@ -273,6 +273,46 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
         return Result.success(page);
     }
 
+
+    /***
+     * 针对轮询做特别处理返回值
+     * 添加isCheck 字段
+     * @param param
+     * @return
+     */
+    @Override
+    public JSONObject jsonSearch(ScenePageDto param) {
+        startPage(param);
+        List<SceneEntity> search = entityMapper.search(param);
+        PageInfo<SceneEntity> page = new PageInfo<>(search);
+        log.info("page size: " + page.getSize());
+        log.info("page total: " + page.getTotal());
+
+        JSONObject result = new JSONObject();
+        result.put("code", 0);
+        result.put("data", page);
+        result.put("msg", "操作成功");
+        // 是否存在计算中的场景, true: 需要轮询, false:不轮询
+        result.put("isCheck", checkStatus(param.getHouseId(), "1"));
+        return result;
+    }
+
+
+    /**
+     * 检查是否有计算中的场景
+     * @param houseId
+     * @param status
+     * @return true: 有, false:没有
+     */
+    public Boolean checkStatus(String houseId, String status) {
+        List<SceneEntity> entities = entityMapper.findByHouseIdAndStatus(houseId, status);
+        boolean flag = false;
+        if (entities.size() > 0) {
+            flag = true;
+        }
+        return flag;
+    }
+
     /**
      * 编辑场景
      * house字段更新伟玉房源接口
@@ -453,6 +493,10 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
         return Result.success(page);
     }
 
+
+
+
+
     /**
      * 添加VR模型
      * @return

+ 21 - 2
cms_pano_fcb/gis_web/src/main/java/com/gis/web/controller/SceneController.java

@@ -1,6 +1,7 @@
 package com.gis.web.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.*;
 import com.gis.domain.entity.SceneEntity;
@@ -42,14 +43,32 @@ public class SceneController extends BaseController {
     @Autowired
     private SceneMapper sceneMapper;
 
+    /**
+     * 改VR项目有计算中的模型,允许轮询,否则停止轮询
+     * 30s 轮询一次
+     */
+//    @WebControllerLog(description = "场景管理-场景列表")
+//    @ApiOperation(value = "场景列表", position = 1)
+//    @PostMapping("list")
+//    public Result list(@RequestBody ScenePageDto param) {
+//        return sceneService.search(param);
+//    }
 
+    /**
+     * 改VR项目有计算中的模型,允许轮询,否则停止轮询
+     * 30s 轮询一次
+     * VR项目有计算中的模型,(true)允许轮询,(false)否则停止轮询
+     */
     @WebControllerLog(description = "场景管理-场景列表")
     @ApiOperation(value = "场景列表", position = 1)
     @PostMapping("list")
-    public Result list(@RequestBody ScenePageDto param) {
-        return sceneService.search(param);
+    public JSONObject list(@RequestBody ScenePageDto param) {
+        return sceneService.jsonSearch(param);
     }
 
+
+
+
     /**
      * 创建场景
      *

+ 8 - 1
cms_pano_fcb/remark.md

@@ -97,10 +97,17 @@ sit:
    
    更新代码工具
    
-   
+   何颖
    ex_031306460
    4Dade_hy01
    
+   伟玉
+   云桌面网页登录链接:vdi.evergrande.com
+   云桌面账号:ex_092814960
+   云桌面密码:4Dade_hwy01
+   jumpserver登录链接:https://jumpserver.fcb.com.cn
+   
+   
    /tmp/a/
    
    进入mysql : mysql -h 10.71.184.146 -u user_4dkankan_rw -p