1

doc/fd_fusion-local.sql

@@ -1030,4 +1030,10 @@ ALTER TABLE `laser`.`t_case`
 
 ALTER TABLE `laser`.`t_case`
     ADD COLUMN `offline_start_time` timestamp NULL AFTER `offline_path`,
-    ADD COLUMN `offline_end_time` timestamp NULL AFTER `offline_start_time`;
+    ADD COLUMN `offline_end_time` timestamp NULL AFTER `offline_start_time`;
+
+ALTER TABLE `laser`.`t_model2`
+    ADD COLUMN `upload_id` int NULL DEFAULT null AFTER `gcj02`;
+
+ALTER TABLE `laser`.`t_case_files`
+    ADD COLUMN `upload_id` int NULL DEFAULT null AFTER `content`;

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

@@ -79,6 +79,7 @@ public class CaseFilesController extends BaseController{
         caseFiles.setFilesUrl(commonUpload.getFileUrl());
         caseFiles.setContent(param.getContent());
         caseFiles.setImgType(param.getImgType());
+        caseFiles.setUploadId(commonUpload.getId());
         caseFilesService.saveOrUpdate(caseFiles);
         return ResultData.ok(caseFiles);
     }
@@ -103,6 +104,7 @@ public class CaseFilesController extends BaseController{
             caseFiles.setFilesUrl(commonUpload.getFileUrl());
             caseFiles.setContent(param.getContent());
             caseFiles.setImgType(param.getImgType());
+            caseFiles.setUploadId(commonUpload.getId());
             caseFilesList.add(caseFiles);
         }
         if(!caseFilesList.isEmpty()){

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

@@ -79,6 +79,7 @@ public class ModelController extends BaseController{
         model.setModelType(commonUpload.getResultFileFormat());
         model.setWgs84(commonUpload.getWgs84());
         model.setGcj02(commonUpload.getGcj02());
+        model.setUploadId(commonUpload.getId());
 
         JSONArray jsonArray = new JSONArray();
         jsonArray.add(commonUpload.getFileUrl());

src/main/java/com/fdkankan/fusion/entity/CaseFiles.java

@@ -85,5 +85,7 @@ public class CaseFiles implements Serializable {
     @TableField("content")
     private String content;
 
+    @TableField("upload_id")
+    private Integer uploadId;
 
 }

src/main/java/com/fdkankan/fusion/entity/Model.java

@@ -104,4 +104,7 @@ public class Model implements Serializable {
 
     @TableField("convert_type")
     private Integer convertType =1;
+
+    @TableField("upload_id")
+    private Integer uploadId;
 }

src/main/java/com/fdkankan/fusion/task/InitService.java

@@ -125,16 +125,14 @@ public class InitService {
                 }
                 if(StringUtils.isNotBlank(commonUpload.getFileUrl())){
                     LambdaQueryWrapper<Model> wrapper = new LambdaQueryWrapper<>();
-                    JSONArray jsonArray = new JSONArray();
-                    jsonArray.add(commonUpload.getFileUrl());
-                    wrapper.like(Model::getModelGlbUrl,jsonArray.toJSONString());
+                    wrapper.eq(Model::getUploadId,commonUpload.getId());
                     List<Model> list = modelService.list(wrapper);
 
                     List<Integer> modelIds = list.stream().map(Model::getModelId).collect(Collectors.toList());
                     List<FusionNum> fusionNums = fusionNumService.getByModelId(modelIds);
 
                     LambdaQueryWrapper<CaseFiles> wrapper2 = new LambdaQueryWrapper<>();
-                    wrapper2.like(CaseFiles::getFilesUrl,commonUpload.getFileUrl());
+                    wrapper2.eq(CaseFiles::getUploadId,commonUpload.getId());
                     Long count2 = caseFilesService.count(wrapper2);
                     if(fusionNums.size() + count2 <=0){
                         delUploadList.add(commonUpload);