mp2jpa

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

@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
 public class BusinessBlockServiceImpl implements BusinessBlockService {
 public class BusinessBlockServiceImpl implements BusinessBlockService {
 
 
 	@Autowired
 	@Autowired
-	private OrgTeamMPDao orgTeamMPDao;
+	private OrgTeamDao orgTeamDao;
 
 
 	@Autowired
 	@Autowired
 	private MapBlockInfoMPDao mapBlockInfoMPDao;
 	private MapBlockInfoMPDao mapBlockInfoMPDao;
@@ -47,6 +47,9 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 	private ISaaSRemoteService saasRemoteService;
 	private ISaaSRemoteService saasRemoteService;
 
 
 	@Autowired
 	@Autowired
+	private MapBlockInfoDao mapBlockInfoDao;
+	
+	@Autowired
 	private OrgGroupDao orgGroupDao;
 	private OrgGroupDao orgGroupDao;
 	
 	
 	@Autowired
 	@Autowired
@@ -62,15 +65,22 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 	String url;
 	String url;
 
 
 	@Override
 	@Override
-	public Result<?> businessServerBlocks(String levelType, String levelValue, long page, long size, String layerId, String teamId) {
+	public Result<?> businessServerBlocks(String levelType, String levelValue, int page, int size, String layerId, String teamId) {
 		BusinessServerBlocksRespDTO resp = new BusinessServerBlocksRespDTO();
 		BusinessServerBlocksRespDTO resp = new BusinessServerBlocksRespDTO();
 
 
-		LambdaQueryWrapper<OrgTeam> lqwTeam = new LambdaQueryWrapper<>();
-		lqwTeam.eq(levelType.equals("cluster"), OrgTeam::getClusterId, levelValue);
-		lqwTeam.eq(levelType.equals("branch"), OrgTeam::getBranchId, levelValue);
-		lqwTeam.eq(levelType.equals("group"), OrgTeam::getGroupId, levelValue);
-		lqwTeam.eq(StringUtils.isNotEmpty(teamId), OrgTeam::getTeamId, teamId);
-		List<OrgTeam> teams = orgTeamMPDao.selectList(lqwTeam);
+		List<OrgTeamEntity> teams = new ArrayList<>();
+		if(levelType.equals("cluster")){
+			teams = orgTeamDao.findAllByClusterId(levelValue);
+		} else if(levelType.equals("branch")){
+			teams = orgTeamDao.findAllByBranchId(levelValue);
+		} else if(levelType.equals("group")){
+			teams = orgTeamDao.findAllByGroupId(levelValue);
+		}
+
+		if(StringUtils.isNotEmpty(teamId))  {
+			teams = teams.stream().filter(t -> t.getTeamId().equals(teamId)).collect(Collectors.toList());
+		}
+
 		if (ListUtils.isEmpty(teams)) {
 		if (ListUtils.isEmpty(teams)) {
 			resp.setTotal(0);
 			resp.setTotal(0);
 			resp.setPages(1);
 			resp.setPages(1);
@@ -82,16 +92,16 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 		}
 		}
 
 
 		// 获得teamId与team的映射
 		// 获得teamId与team的映射
-		Map<String, OrgTeam> teamMapping = new HashMap<>();
-		for (OrgTeam t : teams) {
+		Map<String, OrgTeamEntity> teamMapping = new HashMap<>();
+		for (OrgTeamEntity t : teams) {
 			teamMapping.put(t.getTeamId(), t);
 			teamMapping.put(t.getTeamId(), t);
 		}
 		}
 
 
 		// teamId列表
 		// teamId列表
-		List<String> teamIds = teams.stream().map(OrgTeam::getTeamId).collect(Collectors.toList());
+		List<String> teamIds = teams.stream().map(OrgTeamEntity::getTeamId).collect(Collectors.toList());
 
 
 		// 获取groupId集合
 		// 获取groupId集合
-		Set<String> groupIds = teams.stream().map(OrgTeam::getGroupId).collect(Collectors.toSet());
+		Set<String> groupIds = teams.stream().map(OrgTeamEntity::getGroupId).collect(Collectors.toSet());
 		List<OrgGroup> groups = orgGroupMPDao.selectByGroupIds(new ArrayList<>(groupIds));
 		List<OrgGroup> groups = orgGroupMPDao.selectByGroupIds(new ArrayList<>(groupIds));
 		Map<String, String> groupMapping = groups.stream().collect(Collectors.toMap(OrgGroup::getGroupId, OrgGroup::getGroupName));
 		Map<String, String> groupMapping = groups.stream().collect(Collectors.toMap(OrgGroup::getGroupId, OrgGroup::getGroupName));
 
 
@@ -107,7 +117,7 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 		for (MapBlockInfo b : pg.getRecords()) {
 		for (MapBlockInfo b : pg.getRecords()) {
 			BusinessServerBlocksRespDTO.Block block = new BusinessServerBlocksRespDTO.Block();
 			BusinessServerBlocksRespDTO.Block block = new BusinessServerBlocksRespDTO.Block();
 
 
-			OrgTeam team = teamMapping.get(b.getTeamId());
+			OrgTeamEntity team = teamMapping.get(b.getTeamId());
 			String groupId = team.getGroupId();
 			String groupId = team.getGroupId();
 			String groupName = groupMapping.get(groupId);
 			String groupName = groupMapping.get(groupId);
 
 
@@ -152,7 +162,7 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 			layerName = layer1.getLayer();
 			layerName = layer1.getLayer();
 		}
 		}
 
 
-		OrgTeam team = orgTeamMPDao.getByTeamId(teamId);
+		OrgTeamEntity team = orgTeamDao.getByTeamId(teamId);
 		if (team == null) {
 		if (team == null) {
 			throw new BusinessException("关联小队不存在");
 			throw new BusinessException("关联小队不存在");
 		}
 		}