添加单位树查询接口

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -106,6 +106,8 @@ public class OrgUsrController extends BaseController {
 	String deptKey;
 	@Value("special-deptType")
 	String deptTypeKey;
+
+	private static final String AUTH_SPECIAL_KEY = "fire_build_video_info";
 	/**
 	 * 新增单位信息
 	 *
@@ -772,12 +774,11 @@ public class OrgUsrController extends BaseController {
 		List<String> objects = new ArrayList<>();
 		list.stream().forEach(e->objects.add(e.getCode()));
 		//判断当前登录人权限是否处于特殊类型
-		if (objects.contains(authKey)){
+		if (objects.contains(authKey) || AUTH_SPECIAL_KEY.equals(authKey)){
 			//判断当前登录人部门是否处于特殊部门
-				if (objects.contains(personIdentity.getCompanyId())) {
+				if (objects.contains(personIdentity.getCompanyId()) || AUTH_SPECIAL_KEY.equals(authKey)) {
 					//查询当前登录人所属单位/部门
 					OrgUsr orgUsr = orgUsrMapper.selectById(personIdentity.getCompanyId());
-
 					//查询当前登录人父级单位
 					LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
 					wrapper.eq(OrgUsr::getSequenceNbr,orgUsr.getParentId());

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

@@ -325,6 +325,13 @@ public class BuildingController extends AbstractBaseController {
         return buildService.getCompanyBuildingTree(null);
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation("单位树")
+    @GetMapping(value = "/selectCompanyTree")
+    public List<BuildingTreeVo> selectCompanyTree(@RequestParam(value = "authKey", required = false) String authKey ) {
+        return buildService.selectCompanyTree(authKey);
+    }
+
     @ApiOperation(value = "查询指定单位的建筑树")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/{bizOrgCode}/tree")

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

@@ -301,6 +301,14 @@ public interface IBuilldService extends IService<Building> {
      */
     List<BuildingTreeVo> getCompanyBuildingTree(String authKey);
 
+    /**
+     * 获取单位树
+     * @param authKey
+     * @return
+     */
+    List<BuildingTreeVo> selectCompanyTree(String authKey);
+
+
     List<BuildingTreeVo> getBuildingVideoTreeNew();
 
 	List<Map<String, Object>> getBuildingDetaiList();

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

@@ -102,6 +102,9 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     @Autowired
     ISourceSceneService sourceSceneService;
 
+    @Autowired
+    IVideoService iVideoService;
+
     @Value("${morphic.projectSeq}")
     private Long projectSeq;
 
@@ -1215,6 +1218,37 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         return companyBuildingList.stream().filter(a -> companyBuildingList.stream().noneMatch(c -> c.getId().toString().equals(a.getParentId()))).peek(b -> b.setChildren(getCompanyBuildingChildrenTree(b.getId().toString(), companyBuildingList))).collect(Collectors.toList());
     }
 
+    @Override
+    public List<BuildingTreeVo> selectCompanyTree(String authKey) {
+        if (StringUtils.isEmpty(authKey)) {
+            authKey = this.authKey;
+        }
+        Map<String, Long> countMap = iVideoService.getVideoCountMap();
+        // 1.获取公司list
+        List<OrgUsrDto> orgUsrLists = jcsRemoteService.getCompanyDeptListWithAuth(authKey, "COMPANY");
+        if (orgUsrLists.isEmpty()) {
+            return new ArrayList<>();
+        }
+        // 2.数据结构转换
+        List<BuildingTreeVo> companyList = orgUsrLists.stream().map(orgUsrDto -> {
+            BuildingTreeVo vo = new BuildingTreeVo();
+            vo.setGroupType("allBuilding");
+            vo.setGroupCode("allBuilding");
+            vo.setInstanceName(orgUsrDto.getBizOrgName());
+            vo.setBizOrgCode(orgUsrDto.getBizOrgCode());
+            vo.setInstanceId(orgUsrDto.getSequenceNbr());
+            vo.setParentId(orgUsrDto.getParentId());
+            vo.setName(orgUsrDto.getBizOrgName());
+            vo.setId(orgUsrDto.getSequenceNbr());
+            vo.setBizOrgName(orgUsrDto.getBizOrgName());
+            vo.setTotal(countMap.get(orgUsrDto.getBizOrgCode()) == null ? 0L : countMap.get(orgUsrDto.getBizOrgCode()));
+            return vo;
+        }).collect(Collectors.toList());
+        return companyList.stream().filter(a -> companyList.stream().noneMatch(c -> c.getId().toString().equals(a.getParentId()))).peek(b -> b.setChildren(getCompanyBuildingChildrenTree(b.getId().toString(), companyList))).collect(Collectors.toList());
+
+    }
+
+
     private List<BuildingTreeVo> buildBuildingAndCompanyListVos(String authKey) {
         if (StringUtils.isEmpty(authKey)) {
             authKey = this.authKey;