Commit 69215fca authored by zhuxiang's avatar zhuxiang
Browse files

draw增加nodenum数量

parent 74bb6da3
......@@ -23,8 +23,9 @@ public class NodeVO {
private int degree;
public NodeVO(String node, String label, boolean publicAccountFlag, boolean verifyAccountFlag) {
public NodeVO(String node, int nodeNum, String label, boolean publicAccountFlag, boolean verifyAccountFlag) {
this.node = node;
this.nodeNum = nodeNum;
this.label = label;
this.publicAccountFlag = publicAccountFlag;
this.verifyAccountFlag = verifyAccountFlag;
......
......@@ -79,13 +79,13 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
userFlag = excelDataEntityListNew.get(0).getUserFlag();
}
UserEntity user = userService.getByUserName(entry.getKey(), caseDTO.getId());
if(!ObjectUtils.isEmpty( user)){
if (!ObjectUtils.isEmpty(user)) {
caseVOList.add(CaseVO.builder().excelDataList(excelDataEntityListNew)
.payUserName(entry.getKey())
.userFlag(userFlag)
.idCard(user.getIdCard())
.build());
}else if (CollUtil.isNotEmpty(excelDataEntityListNew)) {
} else if (CollUtil.isNotEmpty(excelDataEntityListNew)) {
caseVOList.add(CaseVO.builder().excelDataList(excelDataEntityListNew)
.payUserName(entry.getKey())
.userFlag(userFlag)
......@@ -174,6 +174,7 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
Map<String, EdgeVO> edgeMap = new HashMap<>();
Map<String, Boolean> publicAccountMap = new HashMap<>();
Map<String, Boolean> verifyAccountMap = new HashMap<>();
Map<String, Integer> nodeNum = new HashMap<>();
List<VerifyAccountEntity> verifyAccountEntityList = verifyAccountService.queryByCaseId(caseDTO.getId());
verifyAccountEntityList.forEach(verifyAccountEntity -> verifyAccountMap.put(verifyAccountEntity.getAccountName(), true));
......@@ -187,6 +188,14 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
return graph;
}
//处理用户相关节点数量
for (ExcelDataEntity excelDataEntity : excelDataEntityList) {
String payUser = excelDataEntity.getPayUserName();
String payee = excelDataEntity.getPayeeName();
nodeNum.merge(payUser, 1, Integer::sum);
nodeNum.merge(payee, 1, Integer::sum);
}
// 处理原始数据
processRawData(excelDataEntityList, uf, uniqueUserName, edgeMap, publicAccountMap, caseDTO.getId());
......@@ -194,7 +203,7 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
Map<String, String> userAndLabel = getUserLabels(uniqueUserName, caseDTO.getId());
// 添加节点
addNodesToGraph(graph, uniqueUserName, userAndLabel, publicAccountMap, verifyAccountMap);
addNodesToGraph(graph, uniqueUserName, userAndLabel, publicAccountMap, verifyAccountMap, nodeNum);
// 过滤有效边
List<EdgeVO> validEdges = filterValidEdges(edgeMap, uf);
......@@ -393,12 +402,14 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
Set<String> uniqueUserName,
Map<String, String> userAndLabel,
Map<String, Boolean> publicAccountMap,
Map<String, Boolean> verifyAccountMap) {
Map<String, Boolean> verifyAccountMap,
Map<String, Integer> nodeNumMap) {
for (String userName : uniqueUserName) {
String label = userAndLabel.getOrDefault(userName, "");
boolean publicAccount = publicAccountMap.getOrDefault(userName, false);
boolean verifyAccount = verifyAccountMap.getOrDefault(userName, false);
graph.addNode(new NodeVO(userName, label, publicAccount, verifyAccount));
int nodeNum = nodeNumMap.getOrDefault(userName, 0);
graph.addNode(new NodeVO(userName, nodeNum, label, publicAccount, verifyAccount));
}
}
......
......@@ -147,7 +147,7 @@ public class GroupDetailServiceImpl extends ServiceImpl<GroupDetailMapper, Group
excelDataEntityListNew.forEach(excelDataVO -> userAndLabel.put(excelDataVO.getPayUserName(), excelDataVO.getLabel()));
// 添加去重后的节点
for (String node : uniqueNodes) {
graph.addNode(new NodeVO(node, userAndLabel.get(node), false, false));
graph.addNode(new NodeVO(node, 0, userAndLabel.get(node), false, false));
}
// 添加边
......
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