修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/ISourceSceneService.java

@@ -16,4 +16,5 @@ public interface ISourceSceneService extends IService<SourceScene> {
      * @Date 2020/12/19 15:25
      */
     List<SourceScene> findBySourceId(Long sourceId);
+    List<SourceScene> findByType(String type);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java

@@ -1295,18 +1295,38 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     @Override
     public List<EquiplistSpecificBySystemVO> getPointInFloor(Long floorId) {
         //0.查询画布信息，todo 建筑可标记点类型为装备、摄像头
-        List<SourceScene> sourceScenes = sourceSceneService.findBySourceId(floorId);
-        SourceScene sourceScene = sourceScenes.size() > 0 ? sourceScenes.get(0) : new SourceScene();
-        //0.1已标记装备点
-        String equipPointInScene = sourceScene.getPointInScene() != null ? sourceScene.getPointInScene() : "";
-        //0.2已标记视频点
-        String videoPointInScene = sourceScene.getVideoInScene() != null ? sourceScene.getVideoInScene() : "";
+      //  List<SourceScene> sourceScenes = sourceSceneService.findBySourceId(floorId);
+        //查询所有画布
+        List<SourceScene> sourceScenes = sourceSceneService.findByType("building");
+
+
+//        SourceScene sourceScene = sourceScenes.size() > 0 ? sourceScenes.get(0) : new SourceScene();
+////        //0.1已标记装备点
+////        String equipPointInScene = sourceScene.getPointInScene() != null ? sourceScene.getPointInScene() : "";
+////        //0.2已标记视频点
+////        String videoPointInScene = sourceScene.getVideoInScene() != null ? sourceScene.getVideoInScene() : "";
+
         //1.查询楼层下的所有装备list
         List<EquiplistSpecificBySystemVO> equipmentSpecifics = equipmentSpecificMapper.getListByWarehouseStructureId(floorId);
 
         equipmentSpecifics.forEach(e -> {
             //已经标记则为已绑定
-            e.setIsBound(equipPointInScene.contains(e.getId().toString()));
+
+
+
+            if(sourceScenes!=null&&sourceScenes.size()>0){
+                Boolean isBound=false;
+                for (SourceScene sourceScene : sourceScenes) {
+                    String equipPointInScene = sourceScene.getPointInScene() != null ? sourceScene.getPointInScene() : "";
+                    isBound= equipPointInScene.contains(e.getId().toString());
+                    if(isBound){
+                       break;
+                    }
+                }
+                e.setIsBound(isBound);
+            }
+
+
             e.setType("装备点");
         });
         List<EquiplistSpecificBySystemVO> bySystemVOS = new ArrayList<>(equipmentSpecifics);
@@ -1321,7 +1341,18 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
             vo.setEquipmentName(v.getName());
             vo.setType("视频点");
             //已经标记则为已绑定
-            vo.setIsBound(videoPointInScene.contains(v.getId().toString()));
+            if(sourceScenes!=null&&sourceScenes.size()>0){
+                Boolean isBound=false;
+                for (SourceScene sourceScene : sourceScenes) {
+                    String videoPointInScene = sourceScene.getVideoInScene() != null ? sourceScene.getVideoInScene() : "";
+                    isBound= videoPointInScene.contains(v.getId().toString());
+                    if(isBound){
+                        break;
+                    }
+                }
+                vo.setIsBound(isBound);
+            }
+
             bySystemVOS.add(vo);
         });
         return bySystemVOS;

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/SourceSceneServiceImpl.java

@@ -27,4 +27,10 @@ public class SourceSceneServiceImpl extends ServiceImpl<SourceSceneMapper, Sourc
         Optional.ofNullable(sourceId).orElseThrow(() -> new BadRequest("sourceId为空"));
         return this.list(new QueryWrapper<SourceScene>().lambda().eq(SourceScene::getSourceId,sourceId));
     }
+
+    @Override
+    public List<SourceScene> findByType(String type) {
+        Optional.ofNullable(type).orElseThrow(() -> new BadRequest("type为空"));
+        return this.list(new QueryWrapper<SourceScene>().lambda().eq(SourceScene::getSourceType,type));
+    }
 }