合并数据集前校验重复添加的

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

@@ -91,9 +91,11 @@ public class MergeSceneServiceImpl extends IBaseServiceImpl implements MergeScen
     @Override
     public Result merge(String sceneCode, String mergeCode) {
 
-        List<MergeInfoEntity> mergeList =  mergeInfoService.findByMergeCode(mergeCode);
+//        List<MergeInfoEntity> mergeList =  mergeInfoService.findByMergeCode(mergeCode);
+        List<MergeInfoEntity> mergeList =  mergeInfoService.findBySceneCodeAndMergeCode(sceneCode, mergeCode);
+
         if (mergeList.size() > 0) {
-            Result.failure("此场景已合并：" + mergeCode);
+            return Result.failure("此场景已合并：" + mergeCode);
         }
 
 
@@ -204,12 +206,13 @@ public class MergeSceneServiceImpl extends IBaseServiceImpl implements MergeScen
         filterService.save(filterEntity);
         log.info("filter数据删除完成, dataSetId:{}", dataSetId);
 
-        // 删除siteModel
-        SiteModelEntity siteModelEntity = siteModelService.findById(sceneCode);
-        if (siteModelEntity == null) {
-            return Result.failure("siteModel数据不存在");
-        }
-        List<SiteDto> siteModelData = siteModelEntity.getData();
+        // 删除siteModel, 2021-10-14 目前没有删除
+        if (siteModelId !=null) {
+            SiteModelEntity siteModelEntity = siteModelService.findById(sceneCode);
+            if (siteModelEntity == null) {
+                return Result.failure("siteModel数据不存在");
+            }
+            List<SiteDto> siteModelData = siteModelEntity.getData();
 
             log.info("需要删除siteModelId: {}", siteModelId);
             for (SiteDto bulid : siteModelData) {
@@ -224,6 +227,8 @@ public class MergeSceneServiceImpl extends IBaseServiceImpl implements MergeScen
             siteModelEntity.setData(siteModelData);
             siteModelEntity.setUpdateTime(LocalDateTime.now());
             siteModelService.save(siteModelEntity);
+        }
+
             log.info("siteModel数据删除完成, dataSetId:{}", dataSetId);
 
         // 删除dataSet数据