1

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

@@ -47,5 +47,11 @@ public class CaseImgController {
         return ResultData.ok(caseImgService.removeById(caseImg.getId()));
     }
 
+    @PostMapping("/updateSort")
+    public ResultData updateSort(@RequestBody CaseImgParam param){
+        caseImgService.updateSort(param);
+        return ResultData.ok();
+    }
+
 }
 

src/main/java/com/fdkankan/fusion/request/CaseImgParam.java

@@ -3,9 +3,16 @@ package com.fdkankan.fusion.request;
 import com.fdkankan.fusion.common.RequestBase;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class CaseImgParam extends RequestBase {
     private Integer caseId;
     private Integer status;
     private String  orderBy;
+
+    private Integer id;
+    private Integer sort;
+
+    private List<CaseImgParam> paramList;
 }

src/main/java/com/fdkankan/fusion/service/ICaseImgService.java

@@ -17,4 +17,6 @@ import java.util.List;
 public interface ICaseImgService extends IService<CaseImg> {
 
     List<CaseImg> getByCaseId(CaseImgParam param);
+
+    void updateSort(CaseImgParam param);
 }

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

@@ -1,6 +1,7 @@
 package com.fdkankan.fusion.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.entity.CaseImg;
 import com.fdkankan.fusion.exception.BusinessException;
@@ -41,4 +42,18 @@ public class CaseImgServiceImpl extends ServiceImpl<ICaseImgMapper, CaseImg> imp
         }
         return this.list(wrapper);
     }
+
+
+    @Override
+    public void updateSort(CaseImgParam param) {
+        if(param.getParamList() == null || param.getParamList().isEmpty()){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        for (CaseImgParam caseImgParam : param.getParamList()) {
+            LambdaUpdateWrapper<CaseImg> wrapper = new LambdaUpdateWrapper<>();
+            wrapper.eq(CaseImg::getId,caseImgParam.getId());
+            wrapper.set(CaseImg::getSort,caseImgParam.getSort());
+            this.update(wrapper);
+        }
+    }
 }

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

@@ -309,6 +309,7 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
             copyOssResource(modelGlbUrl,oldId,modelEntity.getModelId());
             String newModelObjUrl = modelGlbUrl.replaceAll(oldId+"",modelEntity.getModelId()+"");
             modelEntity.setModelGlbUrl(newModelObjUrl);
+            modelEntity.setModelTitle(modelEntity.getModelTitle() +"(copy)");
             this.updateById(modelEntity);
         }
 

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

@@ -98,13 +98,7 @@ public class ThreadService {
                 model.setModelDateType("las");
                 model.setModelType("las");
             }
-            if(name.contains(".laz")){
-                model.setModelDateType("laz");
-                model.setModelType("laz");
-                redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"65");
-                ShellUtil.yunUpload(objPathFile.getPath(),objPathFile.getPath().replace(FilePath.LOCAL_BASE_PATH,"fusion/"));
-                model.setModelGlbUrl((JSONArray.toJSONString(Arrays.asList(queryPath +  objPathFile.getPath().replace(FilePath.LOCAL_BASE_PATH,"fusion/")))));
-            }
+
             if("las".equals(model.getModelType()) || "ply".equals(model.getModelType()) ){
                 mntFile =  OBJToGLBUtil.lasOrPlyToBin(file1);
                 glbOssPath = mntFile.getPath().replace("/mnt/","")+"/webcloud";
@@ -144,6 +138,13 @@ public class ThreadService {
                 ShellUtil.yunUpload(objPathFile.getPath(),b3dmPath);
                 model.setModelGlbUrl((JSONArray.toJSONString(Arrays.asList(queryPath +  b3dmJsonPath.replace(FilePath.LOCAL_BASE_PATH,"fusion/")))));
             }
+            if(name.contains(".laz")){
+                model.setModelDateType("laz");
+                model.setModelType("laz");
+                redisUtil.set(RedisKeyUtil.modelUpload+model.getModelId(),"65");
+                ShellUtil.yunUpload(objPathFile.getPath(),objPathFile.getPath().replace(FilePath.LOCAL_BASE_PATH,"fusion/"));
+                model.setModelGlbUrl((JSONArray.toJSONString(Arrays.asList(queryPath +  objPathFile.getPath().replace(FilePath.LOCAL_BASE_PATH,"fusion/") + "/cloud.js"))));
+            }
 
             setCreateStatus(model,1);
             modelService.saveOrUpdate(model);