feat: 添加组织结构相关逻辑

project-interface/src/main/java/com/dituhui/pea/order/IOrganization.java

+package com.dituhui.pea.order;
+
+import java.util.List;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.dituhui.pea.common.Result;
+
+/**
+ * 组织结构相关接口
+ * 
+ */
+@FeignClient(value = "project-order", contextId = "org")
+@RequestMapping("/pea-order")
+public interface IOrganization {
+
+	/**
+	 * 获取指定等级下的所有组织
+	 * 
+	 * @param levelType       大区/分部/分站/小组
+	 * @param organizationIds 组织编号
+	 * @return
+	 */
+	@RequestMapping(value = "/organization/list", method = RequestMethod.GET)
+	public Result<?> getAllOrganizations(@RequestParam("levelType") String levelType,
+			@RequestParam("organizationIds") List<String> organizationIds);
+
+}

project-interface/src/main/java/com/dituhui/pea/pojo/OrganizationDTO.java

+package com.dituhui.pea.pojo;
+
+import lombok.Data;
+
+@Data
+public class OrganizationDTO {
+
+	/**
+	 * ID
+	 */
+	private String id;
+	/**
+	 * 名称
+	 */
+	private String name;
+	/**
+	 * 类型
+	 */
+	private String type;
+
+	public OrganizationDTO(String id, String name, String type) {
+		this.id = id;
+		this.name = name;
+		this.type = type;
+	}
+}

project-interface/src/main/java/com/dituhui/pea/pojo/UserLoginDTO.java

@@ -24,6 +24,7 @@ public class UserLoginDTO {
 	private String token;
 	
 	private List<RoleInfo> roles;
-	private List<ResourceInfo> resources;
+	private List<ResourceInfo> menus;
+	private List<OrganizationDTO> auths;
 
 }

project-order/src/main/java/com/dituhui/pea/order/controller/PublicOrganizationController.java

+package com.dituhui.pea.order.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.nacos.client.naming.utils.CollectionUtils;
+import com.dituhui.pea.common.BusinessException;
+import com.dituhui.pea.common.Result;
+import com.dituhui.pea.order.IOrganization;
+import com.dituhui.pea.order.service.OrganizationService;
+import com.dituhui.pea.pojo.OrganizationDTO;
+
+/**
+ * 对外组织结构服务
+ * 
+ */
+@RestController
+public class PublicOrganizationController implements IOrganization {
+
+	@Autowired
+	private OrganizationService organizationService;
+
+	@Override
+	public Result<?> getAllOrganizations(String levelType, List<String> organizationIds) {
+		if (StringUtils.isEmpty(levelType)) {
+			return Result.failed("缺少参数levelType");
+		}
+		if (CollectionUtils.isEmpty(organizationIds)) {
+			return Result.failed("缺少参数organizationIds");
+		}
+
+		Result<?> res = null;
+		try {
+			List<OrganizationDTO> orgs = organizationService.getAllOrganizations(levelType, organizationIds);
+			res = Result.success(orgs);
+		} catch (BusinessException e) {
+			return Result.failed(e.getMessage());
+		}
+		return res;
+	}
+
+}

project-order/src/main/java/com/dituhui/pea/order/dao/OrgBranchDao.java

@@ -14,4 +14,6 @@ public interface OrgBranchDao  extends JpaRepository<OrgBranchEntity, Integer> {
     List<OrgBranchEntity> findAllByClusterId(String clusterId);
 
     OrgBranchEntity getByBranchId(String branchId);
+    
+    public List<OrgBranchEntity> findByBranchIdIn(List<String> ids);
 }

project-order/src/main/java/com/dituhui/pea/order/dao/OrgClusterDao.java

 package com.dituhui.pea.order.dao;
 
 import com.dituhui.pea.order.entity.OrgClusterEntity;
+
+import java.util.List;
+
 import org.hibernate.annotations.Where;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
@@ -10,4 +13,6 @@ import org.springframework.stereotype.Repository;
 public interface OrgClusterDao extends JpaRepository <OrgClusterEntity, Integer> {
 
     OrgClusterEntity getByClusterId(String clusterId);
+    
+    public List<OrgClusterEntity> findByClusterIdIn(List<String> ids);
 }

project-order/src/main/java/com/dituhui/pea/order/dao/OrgGroupDao.java

@@ -16,4 +16,6 @@ public interface OrgGroupDao  extends JpaRepository<OrgGroupEntity, Integer> {
     List<OrgGroupEntity> findAllByClusterId(String clusterId);
 
     OrgGroupEntity getByGroupId(String groupId);
+    
+    public List<OrgGroupEntity> findByGroupIdIn(List<String> ids);
 }

project-order/src/main/java/com/dituhui/pea/order/dao/OrgTeamDao.java

 package com.dituhui.pea.order.dao;
 
 import com.dituhui.pea.order.entity.OrgTeamEntity;
-import org.hibernate.annotations.Where;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -36,4 +35,6 @@ public interface OrgTeamDao extends JpaRepository<OrgTeamEntity, Integer> {
     @Modifying
     @Query("UPDATE OrgTeamEntity tt SET tt.status = :status WHERE tt.teamId = :teamId")
     void updateStatusByTeamId(String teamId, int status);
+    
+    public List<OrgTeamEntity> findByTeamIdIn(List<String> ids);
 }

project-order/src/main/java/com/dituhui/pea/order/enums/OrganizationType.java

+package com.dituhui.pea.order.enums;
+
+/**
+ * 组织等级类型
+ * 
+ */
+public enum OrganizationType {
+
+	/**
+	 * 大区
+	 */
+	cluster("cluster"),
+	/**
+	 * 分部
+	 */
+	branch("branch"),
+	/**
+	 * 分站
+	 */
+	group("group"),
+	/**
+	 * 工作队
+	 */
+	team("team");
+
+	private String value;
+
+	private OrganizationType(String value) {
+		this.value = value;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+}

project-order/src/main/java/com/dituhui/pea/order/service/OrganizationService.java

 package com.dituhui.pea.order.service;
 
 import com.dituhui.pea.common.Result;
+import com.dituhui.pea.pojo.OrganizationDTO;
 
 import java.util.List;
 
@@ -12,4 +13,6 @@ public interface OrganizationService {
     Result<?> getTeamsByLevel(String levelType, String levelValue);
 
     Result<?> getEngineersByLevel(String levelType, String levelValue);
+
+    public List<OrganizationDTO> getAllOrganizations(String levelType, List<String> organizationIds);
 }

project-user/src/main/java/com/dituhui/pea/user/service/UserService.java

 package com.dituhui.pea.user.service;
 
+import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
@@ -16,10 +17,13 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.dituhui.pea.common.Result;
+import com.dituhui.pea.common.ResultEnum;
 import com.dituhui.pea.enums.RedisKeyGroup;
 import com.dituhui.pea.enums.StatusCodeEnum;
 import com.dituhui.pea.enums.ThirdPartyEnum;
 import com.dituhui.pea.exception.BusinessException;
+import com.dituhui.pea.order.IOrganization;
+import com.dituhui.pea.pojo.OrganizationDTO;
 import com.dituhui.pea.pojo.ResourceInfo;
 import com.dituhui.pea.pojo.RoleInfo;
 import com.dituhui.pea.pojo.ThirdUserInfo;
@@ -40,6 +44,7 @@ import com.dituhui.pea.user.entity.UserRoleEntity;
 import com.dituhui.pea.user.factory.ThirdStrategy;
 import com.dituhui.pea.user.factory.ThirdStrategyFactory;
 import com.dituhui.pea.user.utils.TextHelper;
+import com.google.common.collect.Lists;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
@@ -82,6 +87,9 @@ public class UserService {
 
 	@Autowired
 	ResourceDao resourceDao;
+	
+	@Autowired
+	IOrganization organizationService;
 
 	public Result<?> userLogin(String account, String password) {
 		UserEntity user = userDao.findByAccountAndPassword(account, SecureUtil.md5(password));
@@ -118,30 +126,46 @@ public class UserService {
 					List<String> resourceIds = roleResources.stream().map(r -> r.getResourceId())
 							.collect(Collectors.toList());
 					List<ResourceEntity> resources = resourceDao.findAllById(resourceIds);
-					// 子菜单嵌套处理+菜单排序
+
+					// 菜单嵌套处理+菜单排序
 					List<ResourceInfo> levelOne = resources.stream()
 							.filter(r -> StringUtils.isEmpty(r.getParentId()) && r.getType() == 1)
 							.map(r -> BeanUtil.copyProperties(r, ResourceInfo.class)).collect(Collectors.toList());
 					for (ResourceInfo resourceInfo : levelOne) {
-						splitExtra(resourceInfo);
+						splitMenuExtra(resourceInfo);
 						List<ResourceEntity> levelTow = resourceDao.findByParentId(resourceInfo.getId());
 						List<ResourceInfo> levelTowResourceInfo = levelTow.stream().map(r -> {
 							ResourceInfo res = BeanUtil.copyProperties(r, ResourceInfo.class);
-							splitExtra(res);
+							splitMenuExtra(res);
 							return res;
 						}).sorted(Comparator.comparing(ResourceInfo::getOrder)).collect(Collectors.toList());
 						resourceInfo.setChildren(levelTowResourceInfo);
 					}
 					levelOne = levelOne.stream().sorted(Comparator.comparing(ResourceInfo::getOrder))
 							.collect(Collectors.toList());
-					userDTO.setResources(levelOne);
+					userDTO.setMenus(levelOne);
+
+					// 获取组织架构资源
+					List<OrganizationDTO> allOrgs = resources.stream().filter(r -> r.getType() == 3)
+							// 暂时只允许一种角色
+							.limit(1).map(r -> {
+								List<OrganizationDTO> orgs = Lists.newArrayList();
+								String[] temp = r.getExtra().split("|");
+								Result<?> result = organizationService.getAllOrganizations(temp[0],
+										Arrays.asList(temp[1].split(",")));
+								if (StringUtils.equals(ResultEnum.SUCCESS.getCode(), result.getCode())) {
+									orgs = (List<OrganizationDTO>) result.getResult();
+								}
+								return orgs;
+							}).flatMap(a -> a.stream()).collect(Collectors.toList());
+					userDTO.setAuths(allOrgs);
 				}
 			}
 		}
 		return userDTO;
 	}
 
-	private void splitExtra(ResourceInfo resourceInfo) {
+	private void splitMenuExtra(ResourceInfo resourceInfo) {
 		String[] temp = resourceInfo.getExtra().split(",");
 		resourceInfo.setCode(temp[0]);
 		resourceInfo.setOrder(Integer.parseInt(temp[1]));