修改建筑点位树SQL

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/BuildingController.java

@@ -154,9 +154,9 @@ public class BuildingController extends AbstractBaseController {
     @GetMapping(value = "/pointTree")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "建筑装备树", notes = "楼层点位图使用")
-    public Object getBuildTree(@RequestParam(required = false) String bizOrgCode) {
+    public Object getBuildTree(@RequestParam(required = false) String bizOrgCode,@RequestParam(required = false) String instanceId) {
 
-        return buildService.getBuildTree(bizOrgCode);
+        return buildService.getBuildTree(bizOrgCode,instanceId);
     }
     @GetMapping(value = "/pointTreeNotEqu")
     @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/BuildingMapper.java

@@ -67,7 +67,7 @@ public interface BuildingMapper extends BaseMapper<Building> {
      * @return
      * @param bizOrgCode
      */
-    List<PointTreeVo> getBuildList(@Param("bizOrgCode") String bizOrgCode);
+    List<PointTreeVo> getBuildList(@Param("bizOrgCode") String bizOrgCode,@Param("instanceId") String instanceId);
 
     /**
      * 获取建筑树主干

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java

@@ -75,7 +75,7 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
      *
      * @return
      */
-    List<PointTreeVo> getPointData(@Param("id") String id);
+    List<PointTreeVo> getPointData(@Param("id") String id,@Param("instanceId") String instanceId);
 
     /**
      * 获取装备数据

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

@@ -109,7 +109,7 @@ public interface IBuilldService extends IService<Building> {
      * @return
      * @param bizOrgCode
      */
-    List<PointTreeVo> getBuildTree(String bizOrgCode);
+    List<PointTreeVo> getBuildTree(String bizOrgCode,String instanceId);
     List<PointTreeVo> getBuildTreeNot(String bizOrgCode);
     /**
      * 获取 建筑装备树

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

@@ -549,15 +549,15 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     }
 
     @Override
-    public List<PointTreeVo> getBuildTree(String bizOrgCode) {
-        List<PointTreeVo> responses = this.baseMapper.getBuildList(bizOrgCode);
+    public List<PointTreeVo> getBuildTree(String bizOrgCode,String instanceId) {
+        List<PointTreeVo> responses = this.baseMapper.getBuildList(bizOrgCode,instanceId);
         // id为null 避免查询时按系统点位图逻辑查询
-        return fireFightingSystemService.transferListToPointTree(responses, null);
+        return fireFightingSystemService.transferListToPointTree(responses, null,instanceId);
     }
 
     @Override
     public List<PointTreeVo> getBuildTreeNot(String bizOrgCode) {
-        List<PointTreeVo> responses = this.baseMapper.getBuildList(bizOrgCode);
+        List<PointTreeVo> responses = this.baseMapper.getBuildList(bizOrgCode,null);
         List<PointTreeVo> treeList = new ArrayList<>();
 
         for (PointTreeVo tree : responses) {
@@ -580,7 +580,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
 
     @Override
     public List<PointTreeVo> get3dBuildTree() {
-        List<PointTreeVo> responses = this.baseMapper.getBuildList(null);
+        List<PointTreeVo> responses = this.baseMapper.getBuildList(null,null);
         return fireFightingSystemService.transferListTo3dPointTree(responses);
     }
 

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

@@ -399,8 +399,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
 //            responses.add(p);
 //        });
 //        List<PointTreeVo> regionList = responses.stream().filter(r -> "TRUE".equals(r.getIsRegion())).collect(Collectors.toList());
-        List<PointTreeVo> buildList = buildingMapper.getBuildList(orgCode);
-        return transferListToPointTree(buildList, id);
+        List<PointTreeVo> buildList = buildingMapper.getBuildList(orgCode,null);
+        return transferListToPointTree(buildList, id,null);
     }
 
     @Override
@@ -480,9 +480,9 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
      * @param id
      * @return
      */
-    public List<PointTreeVo> transferListToPointTree(List<PointTreeVo> allRiskSource, String id) {
+    public List<PointTreeVo> transferListToPointTree(List<PointTreeVo> allRiskSource, String id,String instanceId) {
         //TODO id为空，为消防建筑使用；id不为空，为点位图使用
-        List<PointTreeVo> pointData = fireFightingSystemMapper.getPointData(id);
+        List<PointTreeVo> pointData = fireFightingSystemMapper.getPointData(id,instanceId);
         if (!CollectionUtils.isEmpty(pointData)) {
             // 查询所有wl_source_scene，判断是否绑定
             List<SourceScene> sourceSceneList = sourceSceneMapper.selectList(null);

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

@@ -146,7 +146,7 @@ public class RiskSourceSceneServiceImpl extends ServiceImpl<RiskSourceSceneMappe
 
     @Override
     public List<PointTreeVo> getImportantEquip(String orgCode) {
-        List<PointTreeVo> allRiskSource = buildingMapper.getBuildList(null);
+        List<PointTreeVo> allRiskSource = buildingMapper.getBuildList(null,null);
 
         List<PointTreeVo> treeList = new ArrayList<>();
         List<PointTreeVo> pointData = this.baseMapper.getAllImportantEquip();