lyhzzz 1 gadu atpakaļ
vecāks
revīzija
45dbb76fec

+ 1 - 1
src/main/java/com/fdkankan/fusion/service/impl/CaseNumServiceImpl.java

@@ -108,7 +108,7 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
 //                    model.setModelType("b3dm");
 //                    model.setModelDateType("b3dm");
                     model.setCreateStatus(2);
-                    threadService.objToB3dm(num,model.getModelId());
+                    threadService.objToB3dm(num,param.getType());
                 }
                 model.setNum(num);
                 modelList.add(model);

+ 4 - 3
src/main/java/com/fdkankan/fusion/service/impl/ThreadService.java

@@ -188,7 +188,7 @@ public class ThreadService {
     }
 
     @Async
-    public void objToB3dm(String num,Integer modelId) {
+    public void objToB3dm(String num,Integer type) {
         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<>();
@@ -201,10 +201,11 @@ public class ThreadService {
                 ShellUtil.yunUpload(localGlbPath,ossPath);
                 ossGlbPaths.add(queryPath +ossPath+"/tileset.json");
             }
-            log.info("转换完成修改数据库:{}:{}",ossGlbPaths,modelId);
+            log.info("转换完成修改数据库:{}:{}:{}",ossGlbPaths,num,type);
             String ossGlbPath =  JSONArray.toJSONString(ossGlbPaths);
             LambdaUpdateWrapper<Model> wrapper = new LambdaUpdateWrapper<>();
-            wrapper.eq(Model::getModelId,modelId);
+            wrapper.eq(Model::getType,type);
+            wrapper.eq(Model::getNum,num);
             wrapper.set(Model::getModelGlbUrl,ossGlbPath);
             wrapper.set(Model::getModelDateType,"b3dm");
             wrapper.set(Model::getModelType,"b3dm");