合并场景删除， 初始化删除功能

laser/src/main/java/com/fdkankan/indoor/core/mapper/MergeInfoMapper.java

@@ -22,4 +22,6 @@ public interface MergeInfoMapper extends MongoRepository<MergeInfoEntity, String
     List<MergeInfoEntity> findBySceneCodeAndMergeCode(String sceneCode, String mergeCode);
 
     void deleteBySceneCodeAndMergeCode(String sceneCode, String mergeCode);
+
+    void deleteBySceneCode(String sceneCode);
 }

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

@@ -20,4 +20,6 @@ public interface MergeInfoService {
     List<MergeInfoEntity> findBySceneCodeAndMergeCode(String sceneCode, String mergeCode);
 
     void removeSceneCodeAndMergeCode(String sceneCode, String mergeCode);
+
+    void removeBySceneCode(String sceneCode);
 }

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

@@ -10,6 +10,7 @@ public interface MergeSceneService {
 
     Result getExist(String sceneCode);
 
-
     Result removeByMergeCode(String sceneCode, String mergeCode);
+
+
 }

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

@@ -88,6 +88,9 @@ public class InitServiceImpl implements InitService {
     @Autowired
     TiledMapService tiledMapService;
 
+    @Autowired
+    MergeInfoService mergeInfoService;
+
     /**
      * initDataStep1
      * 有顺序分，不能乱
@@ -480,6 +483,9 @@ public class InitServiceImpl implements InitService {
 
         // 2021-08-20
         tiledMapService.remove(sceneCode);
+        // 2021-08-28 场景合并信息
+        mergeInfoService.removeBySceneCode(sceneCode);
+
         log.info("删除初始化数据完成");
 
     }

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

@@ -55,4 +55,9 @@ public class MergeInfoServiceImpl extends IBaseServiceImpl implements MergeInfoS
     }
 
 
+    @Override
+    public void removeBySceneCode(String sceneCode) {
+        entityMapper.deleteBySceneCode(sceneCode);
+    }
+
 }

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

@@ -217,6 +217,8 @@ public class MergeSceneServiceImpl extends IBaseServiceImpl implements MergeScen
         return Result.success();
     }
 
+
+
     private Integer  mergeDateSet(String sceneCode, String mergeCode, List<Integer> siteModeIds, String mergePath){
 
         // 获取原场景数据