Merge branch 'feature-20231229-xwj' into test

src/main/java/com/fdkankan/openApi/service/system/SceneDataDownloadService.java

@@ -14,6 +14,7 @@ import java.util.List;
 public interface SceneDataDownloadService extends IService<SceneDataDownloadEntity> {
     ResultData sceneDownloadDepthMapAndPly(String sceneCode, Long userId, SceneEntity sceneEntity);
     List<SceneDataDownloadEntity> findByOssDeleteIsNull();
+    void removeBySceneCode(String sceneCode);
 
     List<SceneDataDownloadEntity>  findByOssDeleteIsNullBySceneCode(String sceneCode);
     SceneDataDownloadEntity  findBySceneCodeAndFileNameAndOssDeleteIsNull(String sceneCode,String fileName);

src/main/java/com/fdkankan/openApi/service/system/impl/SceneDataDownloadServiceImpl.java

@@ -111,6 +111,7 @@ public class SceneDataDownloadServiceImpl extends ServiceImpl<SceneDataDownloadM
                 copyFiles.add(copyUrl);
             }
             if ((has_png && has_cloud )|| (has_png && e57Flag)){
+                removeBySceneCode(sceneCode);
                 return  saveAndDownLoad(sceneCode, copyFiles,userId,sceneEntity.getRecount());
             }else if (!has_png  && !has_cloud ){
                 throw new BusinessException(-1,"数据不全，请重算后再尝试下载");
@@ -176,4 +177,11 @@ public class SceneDataDownloadServiceImpl extends ServiceImpl<SceneDataDownloadM
         wrapper.eq(SceneDataDownloadEntity::getFileName,fileName);
         return getOne(wrapper);
     }
+
+    @Override
+    public void removeBySceneCode(String sceneCode) {
+        LambdaQueryWrapper<SceneDataDownloadEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(SceneDataDownloadEntity::getSceneCode,sceneCode);
+        remove(wrapper);
+    }
 }