Commit 05bcfa64 authored by zhuxiang's avatar zhuxiang
Browse files

画布接口优化

parent 2819ef80
...@@ -20,7 +20,7 @@ public class CaseRuleConfigController extends BaseController { ...@@ -20,7 +20,7 @@ public class CaseRuleConfigController extends BaseController {
} }
@GetMapping("/data/{caseId}") @GetMapping("/data/{caseId}")
public Result data(@PathVariable String caseId) { public Result data(@PathVariable int caseId) {
return Result.data(caseRuleConfigService.getByCaseId(caseId)); return Result.data(caseRuleConfigService.getByCaseId(caseId));
} }
} }
...@@ -30,7 +30,7 @@ public class CaseRuleConfigEntity { ...@@ -30,7 +30,7 @@ public class CaseRuleConfigEntity {
private Date endTime; private Date endTime;
private String principal; private int principal;
private boolean whiteFlag; private boolean whiteFlag;
} }
...@@ -4,5 +4,5 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -4,5 +4,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.platform.model.entity.CaseRuleConfigEntity; import com.platform.model.entity.CaseRuleConfigEntity;
public interface CaseRuleConfigService extends IService<CaseRuleConfigEntity> { public interface CaseRuleConfigService extends IService<CaseRuleConfigEntity> {
CaseRuleConfigEntity getByCaseId(String caseId); CaseRuleConfigEntity getByCaseId(int caseId);
} }
...@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; ...@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
@Service @Service
public class CaseRuleServiceImpl extends ServiceImpl<CaseRuleConfigMapper, CaseRuleConfigEntity> implements CaseRuleConfigService { public class CaseRuleServiceImpl extends ServiceImpl<CaseRuleConfigMapper, CaseRuleConfigEntity> implements CaseRuleConfigService {
@Override @Override
public CaseRuleConfigEntity getByCaseId(String caseId) { public CaseRuleConfigEntity getByCaseId(int caseId) {
return baseMapper.selectOne(new LambdaQueryWrapper<CaseRuleConfigEntity>() return baseMapper.selectOne(new LambdaQueryWrapper<CaseRuleConfigEntity>()
.eq(CaseRuleConfigEntity::getCaseId, caseId)); .eq(CaseRuleConfigEntity::getCaseId, caseId));
} }
......
...@@ -33,6 +33,8 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem ...@@ -33,6 +33,8 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
@Resource @Resource
private GroupService groupService; private GroupService groupService;
@Resource @Resource
private CaseRuleConfigService caseRuleConfigService;
@Resource
private UserRelationService userRelationService; private UserRelationService userRelationService;
@Override @Override
...@@ -138,8 +140,37 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem ...@@ -138,8 +140,37 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
// 存储边信息,键为payer-payee组合 // 存储边信息,键为payer-payee组合
Map<String, EdgeVO> edgeMap = new HashMap<>(); Map<String, EdgeVO> edgeMap = new HashMap<>();
//查看案件是否有配置的规则
CaseRuleConfigEntity caseRuleConfigEntity = caseRuleConfigService.getByCaseId(caseDTO.getId());
if (caseRuleConfigEntity != null) {
caseDTO.setMinTransaction(caseRuleConfigEntity.getMinTransaction());
caseDTO.setMaxTransaction(caseRuleConfigEntity.getMaxTransaction());
caseDTO.setMinAmount(caseRuleConfigEntity.getMinAmount());
caseDTO.setMaxAmount(caseRuleConfigEntity.getMaxAmount());
caseDTO.setStartTime(caseRuleConfigEntity.getStartTime());
caseDTO.setEndTime(caseRuleConfigEntity.getEndTime());
caseDTO.setPrincipal(caseRuleConfigEntity.getPrincipal());
caseDTO.setWhiteFlag(caseRuleConfigEntity.isWhiteFlag());
}
// 查询案件数据 // 查询案件数据
List<ExcelDataEntity> excelDataEntityList = excelDataService.queryList(caseDTO); List<ExcelDataEntity> excelDataEntityList = excelDataService.queryList(caseDTO);
Iterator<ExcelDataEntity> iterator = excelDataEntityList.iterator();
while (iterator.hasNext()) {
ExcelDataEntity excelDataEntity = iterator.next();
if (caseDTO.getPrincipal() != null) {
if (caseDTO.getPrincipal() == 1 && excelDataEntity.getPayeeName().contains("公司")) {
//移除被付款人是公司
iterator.remove(); // 安全移除元素
}
if (caseDTO.getPrincipal() == 2 && !excelDataEntity.getPayeeName().contains("公司")) {
//移除被付款人是公司
iterator.remove(); // 安全移除元素
}
}
}
if (caseDTO.getWhiteFlag() != null && caseDTO.getWhiteFlag()) { if (caseDTO.getWhiteFlag() != null && caseDTO.getWhiteFlag()) {
//过滤白名单 //过滤白名单
filterWhite(excelDataEntityList); filterWhite(excelDataEntityList);
...@@ -194,11 +225,9 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem ...@@ -194,11 +225,9 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
Set<String> validNodes = new HashSet<>(); Set<String> validNodes = new HashSet<>();
for (String node : uf.getParent().keySet()) { for (String node : uf.getParent().keySet()) {
if (shouldIncludeNode(node, caseDTO)) {
validNodes.add(node); validNodes.add(node);
String label = userAndLabel.get(node); String label = userAndLabel.get(node);
graph.addNode(new NodeVO(node,label)); graph.addNode(new NodeVO(node, label));
}
} }
// 第三步:过滤边 // 第三步:过滤边
...@@ -516,21 +545,6 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem ...@@ -516,21 +545,6 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
return result; return result;
} }
// 节点过滤逻辑
private boolean shouldIncludeNode(String node, CaseDTO caseDTO) {
if (caseDTO.getPrincipal() == null) {
return true; // 无过滤条件时包含所有节点
}
if (caseDTO.getPrincipal() == 1) {
// 过滤掉收款人名称中带有公司的数据
return !(node.contains("公司"));
} else {
// 过滤掉收款人名称中不含公司的数据
return node.contains("公司");
}
}
// 检查团体是否有实际连接(非孤立节点) // 检查团体是否有实际连接(非孤立节点)
private boolean hasConnections(Set<String> members, GraphVO graph) { private boolean hasConnections(Set<String> members, GraphVO graph) {
return graph.getEdges().stream() return graph.getEdges().stream()
......
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