add recount

src/main/java/com/fdkankan/openApi/controller/www/SceneController.java

@@ -8,9 +8,10 @@ import com.fdkankan.openApi.aop.RedisLimit;
 import com.fdkankan.openApi.aop.ValidateApi;
 import com.fdkankan.openApi.common.PageInfo;
 import com.fdkankan.openApi.controller.BaseController;
+import com.fdkankan.openApi.entity.laser.SceneEntity;
 import com.fdkankan.openApi.entity.www.ScenePlus;
-import com.fdkankan.openApi.service.system.SceneDataDownloadService;
 import com.fdkankan.openApi.service.laser.SceneService;
+import com.fdkankan.openApi.service.system.SceneDataDownloadService;
 import com.fdkankan.openApi.service.www.IScenePlusService;
 import com.fdkankan.openApi.vo.BaseSceneParamVo;
 import com.fdkankan.openApi.vo.www.PageScenesParamVo;
@@ -140,7 +141,8 @@ public class SceneController extends BaseController {
         if (ObjectUtils.isEmpty(scenePlus)) {
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
-        return sceneDataDownloadService.sceneDownloadDepthMapAndPly(param.getSceneCode(),this.getUserId());
+        SceneEntity sceneEntity = sceneService.findBySceneCode(param.getSceneCode());
+        return sceneDataDownloadService.sceneDownloadDepthMapAndPly(param.getSceneCode(),this.getUserId(),sceneEntity);
     }
 
 }

src/main/java/com/fdkankan/openApi/service/laser/impl/SceneServiceImpl.java

@@ -50,7 +50,6 @@ public class SceneServiceImpl extends ServiceImpl<SceneMapper, SceneEntity> impl
 
 
     @Override
-    @DS("laser")
     public SceneEntity findBySceneCode(String sceneCode) {
         LambdaQueryWrapper<SceneEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(SceneEntity::getSceneCode, sceneCode);

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

@@ -2,6 +2,7 @@ package com.fdkankan.openApi.service.system;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.openApi.entity.laser.SceneEntity;
 import com.fdkankan.openApi.entity.system.SceneDataDownloadEntity;
 import com.fdkankan.web.response.ResultData;
 
@@ -11,7 +12,7 @@ import java.util.List;
  * Created by Xiewj on 2022年11月21日11:22:02
  */
 public interface SceneDataDownloadService extends IService<SceneDataDownloadEntity> {
-    ResultData sceneDownloadDepthMapAndPly(String sceneCode, Long userId);
+    ResultData sceneDownloadDepthMapAndPly(String sceneCode, Long userId, SceneEntity sceneEntity);
     List<SceneDataDownloadEntity> findByOssDeleteIsNull();
 
     List<SceneDataDownloadEntity>  findByOssDeleteIsNullBySceneCode(String sceneCode);

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

@@ -3,6 +3,7 @@ package com.fdkankan.openApi.service.system.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -33,6 +34,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
+@DS("system")
 public class SceneDataDownloadServiceImpl extends ServiceImpl<SceneDataDownloadMapper, SceneDataDownloadEntity> implements SceneDataDownloadService {
     @Value("${laserConfig.defaultFolder}")
     private String laserDefaultFolder;
@@ -50,9 +52,8 @@ public class SceneDataDownloadServiceImpl extends ServiceImpl<SceneDataDownloadM
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResultData sceneDownloadDepthMapAndPly(String sceneCode, Long userId) {
+    public ResultData sceneDownloadDepthMapAndPly(String sceneCode, Long userId,SceneEntity sceneEntity) {
         List<SceneDataDownloadEntity> sceneDataDownloadEntityList = findByOssDeleteIsNullBySceneCode(sceneCode);
-        SceneEntity sceneEntity = sceneService.findBySceneCode(sceneCode);
         if (ObjectUtil.isNotNull(sceneEntity)&&sceneEntity.getLocation()==6){
             throw new BusinessException(-1,"不支持slam场景原始数据下载");
         }