1

src/main/java/com/fdkankan/fusion/controller/TmDepartmentController.java

@@ -3,9 +3,15 @@ package com.fdkankan.fusion.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.ObjectUtil;
+import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
+import com.fdkankan.fusion.entity.CaseEntity;
 import com.fdkankan.fusion.entity.TmDepartment;
+import com.fdkankan.fusion.entity.TmProject;
+import com.fdkankan.fusion.exception.BusinessException;
+import com.fdkankan.fusion.service.ICaseService;
 import com.fdkankan.fusion.service.ITmDepartmentService;
+import com.fdkankan.fusion.service.ITmProjectService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
@@ -30,6 +36,10 @@ public class TmDepartmentController {
 
     @Autowired
     private ITmDepartmentService departmentService;
+    @Autowired
+    private ICaseService caseService;
+    @Autowired
+    ITmProjectService tmProjectService;
 
 
     /**
@@ -45,8 +55,20 @@ public class TmDepartmentController {
      * 获取部门下拉树列表
      */
     @GetMapping("/treeselect")
-    public ResultData treeselect(@RequestParam(required = false) String deptId) {
-        if(StringUtils.isNotBlank(deptId)){
+    public ResultData treeselect(@RequestParam(required = false) String caseId) {
+        if(StringUtils.isNotBlank(caseId)){
+            CaseEntity caseEntity = caseService.getById(caseId);
+            if(caseEntity == null ){
+                throw new BusinessException(ResultCode.CASE_NOT_EXIST);
+            }
+            String deptId = caseEntity.getDeptId();
+            if(caseEntity.getType() == 1){
+                TmProject tmProject = tmProjectService.getById(caseEntity.getTmProjectId());
+                if(tmProject == null || StringUtils.isBlank(tmProject.getDeptId())){
+                    throw new BusinessException(ResultCode.CASE_NOT_EXIST);
+                }
+                deptId = tmProject.getDeptId();
+            }
             return ResultData.ok(departmentService.getDeptList(deptId));
         }
         return ResultData.ok(departmentService.getDeptList());

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

@@ -78,7 +78,6 @@ public class ThreadService {
             }
             redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"20");
 
-            String ossPath = String.format(FilePath.MODEL_OSS_PATH,environment, model.getModelId());
 
             String name = file1.getName();
             if(name.contains("obj") || name.contains("OBJ")){
@@ -98,7 +97,7 @@ public class ThreadService {
                 OBJToGLBUtil.objToGlb2(file1.getPath(),localPath);
                 redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"65");
                 uploadToOssUtil.uploadOss(localPath,localPath.replace("/mnt/",""));
-                if(!uploadToOssUtil.existKey(ossPath)){
+                if(!uploadToOssUtil.existKey(localPath.replace("/mnt/",""))){
                     throw new BusinessException(-1,"缺少.glb文件");
                 }
 
@@ -114,7 +113,7 @@ public class ThreadService {
 
             if("las".equals(model.getModelType()) || "ply".equals(model.getModelType()) ){
                 mntFile =  OBJToGLBUtil.lasOrPlyToBin(file1);
-                ossPath = mntFile.getPath().replace("/mnt/","")+"/webcloud";
+                String ossPath = mntFile.getPath().replace("/mnt/","")+"/webcloud";
                 redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"65");
                 uploadToOssUtil.uploadFileOss(mntFile );
                 model.setModelGlbUrl(JSONArray.toJSONString(Arrays.asList(queryPath + ossPath)));