1

src/main/java/com/fdkankan/fusion/httpClient/FdService.java

@@ -7,6 +7,7 @@ import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.common.util.DateUtils;
 import com.fdkankan.fusion.common.util.RedisKeyUtil;
+import com.fdkankan.fusion.entity.CaseEntity;
 import com.fdkankan.fusion.entity.TmCamera;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.httpClient.client.FdKKClient;
@@ -20,6 +21,7 @@ import com.fdkankan.fusion.httpClient.response.FdRoomVo;
 import com.fdkankan.fusion.httpClient.response.FdkkLoginVo;
 import com.fdkankan.fusion.httpClient.response.FdkkResponse;
 import com.fdkankan.fusion.response.CameraVo;
+import com.fdkankan.fusion.service.ICaseService;
 import com.fdkankan.redis.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -149,8 +151,14 @@ public class FdService {
             throw new BusinessException(code,message);
         }
     }
+    @Autowired
+    ICaseService caseService;
 
     public  void checkCaseAuth(String caseId,String pageType,String token) {
+        CaseEntity caseEntity = caseService.getById(caseId);
+        if(caseEntity == null){
+            throw new BusinessException(ResultCode.CASE_NOT_EXIST);
+        }
         if(StringUtils.isBlank(pageType) || StringUtils.isBlank(caseId)|| StringUtils.isBlank(token)){
             throw new BusinessException(ResultCode.NOT_PERMISSION);
         }

src/main/java/com/fdkankan/fusion/mq/consumer/OsgbToB3dmConsumer.java

@@ -1,5 +1,6 @@
 package com.fdkankan.fusion.mq.consumer;
 
+import cn.hutool.core.io.FileUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.fusion.common.FilePath;
 import com.fdkankan.fusion.common.util.FileWriterUtil;
@@ -65,6 +66,8 @@ public class OsgbToB3dmConsumer {
             ShellUtil.yunUpload(sourcePath,ossPath);
             String url = ossUrlPrefix + b3dmJsonPath.replace("/mnt/","");
             commonUploadService.updateByPath(localPath,url);
+            FileUtil.del(localPath);
+            FileUtil.del(sourcePath);
         }catch (Exception e){
             log.info("osgbToB3dm-status----消费失败",e);
         }finally {

src/main/java/com/fdkankan/fusion/response/CaseTagPointVo.java

@@ -39,4 +39,6 @@ public class CaseTagPointVo extends CaseTag {
     private String lineHeight;
 
     private Integer visibilityRange;
+
+    private String normal;
 }

src/main/java/com/fdkankan/fusion/service/impl/CaseNumServiceImpl.java

@@ -139,7 +139,7 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
 
 
     private String getGlbUrl(Integer type, String num,Model model) {
-        if(type == 0 || type == 1 || type == 4 || type == 6){ //看看，看见
+        if(type == 0 || type == 1 || type == 4 || type == 6 || type == 7){ //看看，看见
             String objPath = String.format(FilePath.OBJ_LOCAL_PATH ,environment,num);
             ShellUtil.yunDownload(String.format(FilePath.OBJ_OSS_PATH, num)+"/data/mesh" ,objPath);
             List<String> localGlbPaths = new ArrayList<>();