Merge branch 'develop_ccs' of http://172.16.10.76/moa/amos-boot-biz into develop_ccs

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

@@ -154,15 +154,24 @@ public class BuildingController extends AbstractBaseController {
     @GetMapping(value = "/pointTree")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "建筑装备树", notes = "楼层点位图使用")
-    public List<PointTreeVo> getBuildTree(@RequestParam(required = false) String bizOrgCode) {
+    public Object getBuildTree(@RequestParam(required = false) String bizOrgCode) {
 
+        return buildService.getBuildTree(bizOrgCode);
+    }
+    @GetMapping(value = "/pointTreeNotEqu")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "建筑装备树", notes = "楼层点位")
+    public Object pointTreeNotEqu(@RequestParam(required = false) String bizOrgCode) {
         if(vedioFormat.equals("hls")){
-            bizOrgCode =null;
+            bizOrgCode=null;
         }
-        return buildService.getBuildTree(bizOrgCode);
+        return buildService.getBuildTreeNot(bizOrgCode);
+    }
+
+
+
 
 
-    }
 
     @GetMapping(value = "/3dPointTree")
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -110,6 +110,7 @@ public interface IBuilldService extends IService<Building> {
      * @param bizOrgCode
      */
     List<PointTreeVo> getBuildTree(String bizOrgCode);
+    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

@@ -485,6 +485,29 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     }
 
     @Override
+    public List<PointTreeVo> getBuildTreeNot(String bizOrgCode) {
+        List<PointTreeVo> responses = this.baseMapper.getBuildList(bizOrgCode);
+        List<PointTreeVo> treeList = new ArrayList<>();
+
+        for (PointTreeVo tree : responses) {
+            if (tree.getParentId() == null || tree.getParentId() == -1) {
+                treeList.add(tree);
+            }
+            for (PointTreeVo treeNode : responses) {
+                if (tree.getSequenceNbr().equals(treeNode.getParentId())) {
+                    if (tree.getChildren() == null) {
+                        tree.setChildren(new ArrayList<>());
+                    }
+                    tree.getChildren().add(treeNode);
+                }
+            }
+        }
+
+
+        return treeList;
+    }
+
+    @Override
     public List<PointTreeVo> get3dBuildTree() {
         List<PointTreeVo> responses = this.baseMapper.getBuildList(null);
         return fireFightingSystemService.transferListTo3dPointTree(responses);