修改场景数据基础路径

laser/src/main/java/com/fdkankan/indoor/core/controller/CutModelController.java

@@ -34,6 +34,21 @@ public class CutModelController {
         return  result.getData();
     }
 
+    /**
+     * 2021-09-23
+     * 更新，支持多数据集点云剪裁
+     * @param sceneCode
+     * @param param
+     * @return
+     */
+//    @WebControllerLog(description = "剪切模型-剪切模型")
+//    @ApiOperation("剪切模型")
+//    @PostMapping("indoor/{sceneCode}/api/pointcloud/crop")
+//    public Object crop(@PathVariable String sceneCode, @RequestBody CropDto param){
+//        Result result = entityService.multipleCrop(sceneCode, param);
+//        return  result.getData();
+//    }
+
     @WebControllerLog(description = "剪切模型-查询详情")
     @ApiOperation("查询详情")
     @GetMapping("indoor/{sceneCode}/api/jobs/{dataId}")

laser/src/main/java/com/fdkankan/indoor/core/service/CutModelService.java

@@ -18,4 +18,6 @@ public interface CutModelService {
     Result crop(String sceneCode, CropDto param);
 
     Result findByDataId(String sceneCode, Integer dataId);
+
+    Result multipleCrop(String sceneCode, CropDto param);
 }

laser/src/main/java/com/fdkankan/indoor/core/service/impl/CutModelServiceImpl.java

@@ -162,7 +162,8 @@ public class CutModelServiceImpl extends IBaseServiceImpl implements CutModelSer
         }
 
         String path = entity.getPath();
-        String basePath = path + "/laserData/";
+//        String basePath = path + "/laserData/";
+        String basePath = path ;
 
         String savePath = basePath + "cut_param.json";
         log.info("剪切参数：{}", savePath);
@@ -247,6 +248,20 @@ public class CutModelServiceImpl extends IBaseServiceImpl implements CutModelSer
         return Result.success(data.get(0));
     }
 
+    /**
+     * 2021-9-23
+     * 多点云剪裁
+     * @param sceneCode
+     * @param param
+     * @return
+     */
+    @Override
+    public Result multipleCrop(String sceneCode, CropDto param) {
+        // 1. 合并场景表(t_merge_info)获取dataSetId, 场景码
+        // 2. 根据dataSetId 将dataSet表location(需要转本地坐标), orientation, path， 封装到merge_cut_model.json
+        return null;
+    }
+
     private List<CutModelDto> getDataBySceneCode(String sceneCode){
         CutModelEntity entity = findById(sceneCode);
         if (entity != null) {

laser/src/main/java/com/fdkankan/indoor/core/service/impl/DataSetServiceImpl.java

@@ -434,7 +434,8 @@ public class DataSetServiceImpl extends IBaseServiceImpl implements DataSetServi
 
 
         // 原场景码地址
-        String sceneCodePath = redisPath(sceneCode) + "/laserData";
+//        String sceneCodePath = redisPath(sceneCode) + "/laserData";
+        String sceneCodePath = redisPath(sceneCode);
         if ("dev".equals(configConstant.active)) {
             sceneCodePath = "F:\\test\\ngin\\age_laser_data\\" + sceneCode + "\\results\\laserData";
         }

laser/src/main/java/com/fdkankan/indoor/core/service/impl/InitServiceImpl.java

@@ -125,8 +125,8 @@ public class InitServiceImpl implements InitService {
 
             if ("recount".equals(from)) {
                 log.info("进行手动重新");
-                path = init.getPath();
-                title = init.getTitle();
+//                path = init.getPath();
+//                title = init.getTitle();
             }
         } else {
             // 新场景
@@ -161,7 +161,8 @@ public class InitServiceImpl implements InitService {
         }
 
 
-        String laserDataPath = path + "/laserData";
+//        String laserDataPath = path + "/laserData";
+        String laserDataPath = path ;
         log.info("laserDataPath: {}", laserDataPath);
 
         // step1 创建t_route表(路径规划)
@@ -247,7 +248,8 @@ public class InitServiceImpl implements InitService {
         removeInitDataStep2(sceneCode);
 
         String path = init.getPath();
-        String laserDataPath = path + "/laserData";
+//        String laserDataPath = path + "/laserData";
+        String laserDataPath = path;
         log.info("laserDataPath: {}", laserDataPath);
 
         // step:0 获取控制点
@@ -307,7 +309,7 @@ public class InitServiceImpl implements InitService {
             throw new BaseRuntimeException("初始化数据不存在：" + sceneCode);
         }
         String path = initEntity.getPath();
-        path = path + "/laserData";
+//        path = path + "/laserData";
 
         processCould(sceneCode, path, controlPoint);
 
@@ -872,7 +874,7 @@ public class InitServiceImpl implements InitService {
         mergeDto.setSite_model_entity_ids(site_model_entity_ids);
         mergeDto.setSceneNum(sceneCode);
 
-        laserDataPath = StrUtil.subBefore(laserDataPath, "/results", true);
+//        laserDataPath = StrUtil.subBefore(laserDataPath, "/results", true);
 
         mergeDto.setPath(laserDataPath);
 

laser/src/main/java/com/fdkankan/indoor/core/service/impl/MergeSceneServiceImpl.java

@@ -180,7 +180,8 @@ public class MergeSceneServiceImpl extends IBaseServiceImpl implements MergeScen
         if ("dev".equals(configConstant.active)) {
             mergePath = configConstant.serverBasePath  + "/" + mergeCode + "/results/laserData";
         } else {
-            mergePath = redisPath(mergeCode) + "/laserData";
+//            mergePath = redisPath(mergeCode) + "/laserData";
+            mergePath = redisPath(mergeCode);
         }
         log.info("合并场景路径：{}", mergePath);
 

laser/src/main/java/com/fdkankan/indoor/core/service/impl/TiledMapServiceImpl.java

@@ -76,7 +76,8 @@ public class TiledMapServiceImpl extends IBaseServiceImpl implements TiledMapSer
         }
 
         entity.setStatus(0);
-        entity.setDisplay(0);
+        // 平面图默认打开
+        entity.setDisplay(1);
         this.save(entity);
 
         log.info("TiledMap数据初始化完成");
@@ -108,7 +109,8 @@ public class TiledMapServiceImpl extends IBaseServiceImpl implements TiledMapSer
             log.error("文件名： {}", originalFilename);
             return Result.failure("文件不能为空， 或者不是zip文件");
         }
-        String basePath = redisPath(sceneCode) + "/laserData/upload_cover";
+//        String basePath = redisPath(sceneCode) + "/laserData/upload_cover";
+        String basePath = redisPath(sceneCode) + "/upload_cover";
         String savePath = basePath + "/cover.zip";
         if ("dev".equals(configConstant.active)) {
             savePath = configConstant.serverBasePath + "/" + sceneCode + "/results/laserData/upload_cover/cover.zip";
@@ -268,7 +270,8 @@ public class TiledMapServiceImpl extends IBaseServiceImpl implements TiledMapSer
      * @return
      */
     private List<TiledMapDto> initData(String sceneCode, String from){
-        String path = redisPath(sceneCode) + "/laserData";
+//        String path = redisPath(sceneCode) + "/laserData";
+        String path = redisPath(sceneCode);
         if ("dev".equals(configConstant.active)) {
             path = "F:\\test\\ngin\\age_laser_data\\" + sceneCode + "\\results\\laserData";
         }
@@ -384,7 +387,8 @@ public class TiledMapServiceImpl extends IBaseServiceImpl implements TiledMapSer
 
     // 将cover上传oss
     private void uploadCover(String sceneCode){
-        String path = redisPath(sceneCode) + "/laserData";
+//        String path = redisPath(sceneCode) + "/laserData";
+        String path = redisPath(sceneCode) ;
         // 11=floor_id值：site_model.type:floor的id
         String bundlePath = "data/bundle_" + sceneCode +"/building_1/map_tiles/11";
         String ossTarget = "data/" + sceneCode + "/" + bundlePath;