Commit 7ebfe4a1 authored by zhuxiang's avatar zhuxiang
Browse files

画布接口增加团体

parent 2754c5e0
......@@ -93,92 +93,156 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CaseEntity> impleme
public GraphVO draw(CaseDTO caseDTO) {
// 初始化画布
GraphVO graph = new GraphVO();
// 使用并查集来管理团体
UnionFindVO uf = new UnionFindVO();
// 使用Map来存储边的信息,键为payer-payee组合,值为Edge对象
Map<String, EdgeVO> edgeMap = new HashMap<>();
//查看案件所有的人员
// 查看案件所有的人员
List<ExcelDataEntity> excelDataEntityList = excelDataService.queryList(caseDTO);
if (CollUtil.isNotEmpty(excelDataEntityList)) {
//初始化set集合
// 使用Set去重
Set<String> uniqueNodes = new HashSet<>();
excelDataEntityList.forEach(excelDataEntity -> {
if (StringUtils.isNotEmpty(excelDataEntity.getPayUserName())
&& StringUtils.isNotEmpty(excelDataEntity.getPayeeName())) {
uniqueNodes.add(excelDataEntity.getPayUserName());
uniqueNodes.add(excelDataEntity.getPayeeName());
String payer = excelDataEntity.getPayUserName();
String payee = excelDataEntity.getPayeeName();
double amount = excelDataEntity.getAmount();
// 添加节点到并查集
uf.makeSet(payer);
uf.makeSet(payee);
// 合并团体
uf.union(payer, payee);
// 生成边的唯一标识
String edgeKey = excelDataEntity.getPayUserName() + "-" + excelDataEntity.getPayeeName();
String edgeKey = payer + "-" + payee;
// 检查是否已经存在这条边
if (edgeMap.containsKey(edgeKey)) {
// 如果存在,更新总笔数和总金额
EdgeVO existingEdge = edgeMap.get(edgeKey);
existingEdge.setTotalTransactions(existingEdge.getTotalTransactions() + 1);
existingEdge.setTotalAmount(existingEdge.getTotalAmount() + excelDataEntity.getAmount());
existingEdge.setTotalAmount(existingEdge.getTotalAmount() + amount);
} else {
// 如果不存在,创建新的边
String edgeId = "line-" + excelDataEntity.getPayUserName() + "-" + excelDataEntity.getPayeeName();
EdgeVO newEdge = new EdgeVO(edgeId, excelDataEntity.getPayUserName(), excelDataEntity.getPayeeName(), 1, excelDataEntity.getAmount());
String edgeId = "line-" + payer + "-" + payee;
EdgeVO newEdge = new EdgeVO(edgeId, payer, payee, 1, amount, uf.find(payer));
edgeMap.put(edgeKey, newEdge);
}
}
});
// 添加去重后的节点
for (String node : uniqueNodes) {
// === 修复1:先完成所有过滤 ===
Set<String> validNodes = new HashSet<>(); // 有效节点集合
// 节点过滤
for (String node : uf.getParent().keySet()) {
if (caseDTO.getPrincipal() != null) {
if (caseDTO.getPrincipal() == 1) {
//过滤掉收款人名称中带有公司的数据
if (node.contains("公司") || node.length() > 4) {
continue;
}
if (node.contains("公司") || node.length() > 4) continue;
} else {
//过滤掉收款人名称中不含公司的数据
if (!node.contains("公司") || node.length() > 4) {
continue;
if (!node.contains("公司") || node.length() > 4) continue;
}
}
graph.addNode(new NodeVO(node));
continue;
}
validNodes.add(node);
graph.addNode(new NodeVO(node));
}
// 添加边
// 边过滤(同时检查两端节点有效性)
for (EdgeVO edge : edgeMap.values()) {
if (caseDTO.getMinAmount() != null && caseDTO.getMaxAmount() != null) {
if (edge.getTotalAmount() >= caseDTO.getMinAmount() && edge.getTotalAmount() <= caseDTO.getMaxAmount()) {
graph.addEdge(edge);
// 检查两端节点是否有效
if (!validNodes.contains(edge.getSource()) ||
!validNodes.contains(edge.getTarget())) {
continue;
}
// 金额/笔数过滤
boolean amountValid = true;
if (caseDTO.getMinAmount() != null && caseDTO.getMaxAmount() != null) {
amountValid = edge.getTotalAmount() >= caseDTO.getMinAmount()
&& edge.getTotalAmount() <= caseDTO.getMaxAmount();
}
boolean transValid = true;
if (caseDTO.getMinTransaction() != null && caseDTO.getMaxTransaction() != null) {
transValid = edge.getTotalTransactions() >= caseDTO.getMinTransaction()
&& edge.getTotalTransactions() <= caseDTO.getMaxTransaction();
}
if (caseDTO.getMaxTransaction() != null && caseDTO.getMinTransaction() != null) {
if (edge.getTotalTransactions() >= caseDTO.getMinTransaction() && edge.getTotalTransactions() <= caseDTO.getMaxTransaction()) {
if (amountValid || transValid) {
graph.addEdge(edge);
continue;
}
}
if (caseDTO.getPrincipal() != null) {
if (caseDTO.getPrincipal() == 1) {
//过滤掉收款人名称中带有公司的数据
if (edge.getTarget().contains("公司") || edge.getTarget().length() > 4) {
continue;
// === 修复2:基于过滤后数据重建团体 ===
Map<String, Set<String>> groupMembers = new HashMap<>();
Map<String, Double> groupTotalAmount = new HashMap<>();
Map<String, Integer> groupTotalTransactions = new HashMap<>();
// 步骤1:为每个有效节点创建独立团体
for (String node : validNodes) {
String root = uf.find(node);
groupMembers.computeIfAbsent(root, k -> new HashSet<>()).add(node);
}
} else {
//过滤掉收款人名称中不含公司的数据
if (!edge.getTarget().contains("公司") || edge.getTarget().length() > 4) {
continue;
// 步骤2:仅用有效边更新团体关系
UnionFindVO filteredUf = new UnionFindVO(); // 新建过滤后的并查集
validNodes.forEach(filteredUf::makeSet);
for (EdgeVO edge : graph.getEdges()) {
filteredUf.union(edge.getSource(), edge.getTarget());
// 更新团体统计
String root = filteredUf.find(edge.getSource());
groupTotalAmount.merge(root, edge.getTotalAmount(), Double::sum);
groupTotalTransactions.merge(root, edge.getTotalTransactions(), Integer::sum);
}
// 步骤3:合并最终团体
for (String node : validNodes) {
String newRoot = filteredUf.find(node);
String oldRoot = uf.find(node);
if (!newRoot.equals(oldRoot)) {
// 合并团体
Set<String> members = groupMembers.remove(oldRoot);
if (members != null) {
groupMembers.computeIfAbsent(newRoot, k -> new HashSet<>()).addAll(members);
}
}
graph.addEdge(edge);
}
// === 修复3:生成最终团体对象 ===
for (Map.Entry<String, Set<String>> entry : groupMembers.entrySet()) {
String groupId = entry.getKey();
Set<String> members = entry.getValue();
// 跳过孤立节点(可选)
if (members.size() == 1 && !hasConnections(members, graph)) {
continue;
}
graph.addEdge(edge);
graph.addGroup(new GroupVO(
groupId,
members.size(),
groupTotalAmount.getOrDefault(groupId, 0.0),
groupTotalTransactions.getOrDefault(groupId, 0)
));
}
}
return graph;
}
// 检查团体是否有实际连接(非孤立节点)
private boolean hasConnections(Set<String> members, GraphVO graph) {
return graph.getEdges().stream()
.anyMatch(edge ->
members.contains(edge.getSource()) &&
members.contains(edge.getTarget()));
}
private Map<String, List<ExcelDataVO>> groupByPayUserName(List<ExcelDataVO> excelDataVOList) {
Map<String, List<ExcelDataVO>> groupedMap = new HashMap<>();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment