"src/main/java/git@gitlab.ruzhoukj.com:wujipeng/relation.git" did not exist on "02f71096577b2f4b87d790a009cb6b10c8d73100"
Commit eb634572 authored by zhuxiang's avatar zhuxiang
Browse files

白名单过滤、人员关系

parent 79bc8081
...@@ -3,6 +3,9 @@ package com.platform.mapper; ...@@ -3,6 +3,9 @@ package com.platform.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.platform.model.entity.UserRelationEntity; import com.platform.model.entity.UserRelationEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* @author : wujipeng * @author : wujipeng
...@@ -12,4 +15,7 @@ import org.apache.ibatis.annotations.Mapper; ...@@ -12,4 +15,7 @@ import org.apache.ibatis.annotations.Mapper;
*/ */
@Mapper @Mapper
public interface UserRelationMapper extends BaseMapper<UserRelationEntity> { public interface UserRelationMapper extends BaseMapper<UserRelationEntity> {
List<UserRelationEntity> queryListByUserNameList(@Param("caseId") int caseId,
@Param("nodeList") List<String> nodeList);
} }
...@@ -23,4 +23,6 @@ public interface WhiteMapper extends BaseMapper<WhiteEntity> { ...@@ -23,4 +23,6 @@ public interface WhiteMapper extends BaseMapper<WhiteEntity> {
* @return List<WhiteVO> * @return List<WhiteVO>
*/ */
List<WhiteVO> pageWhite(WhiteDTO whiteDTO); List<WhiteVO> pageWhite(WhiteDTO whiteDTO);
List<String> queryList();
} }
...@@ -33,6 +33,8 @@ public class CaseDTO extends CaseEntity { ...@@ -33,6 +33,8 @@ public class CaseDTO extends CaseEntity {
private Double maxAmount; private Double maxAmount;
private Double minAmount; private Double minAmount;
private Boolean whiteFlag;
@ApiModelProperty(value = "主体类型 1、个人 2、对公") @ApiModelProperty(value = "主体类型 1、个人 2、对公")
private Integer principal; private Integer principal;
......
...@@ -13,6 +13,7 @@ public class EdgeVO { ...@@ -13,6 +13,7 @@ public class EdgeVO {
private String target; private String target;
private String relation;
// 总汇款笔数 // 总汇款笔数
private int totalTransactions; private int totalTransactions;
......
...@@ -2,6 +2,9 @@ package com.platform.service; ...@@ -2,6 +2,9 @@ package com.platform.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.platform.model.entity.UserRelationEntity; import com.platform.model.entity.UserRelationEntity;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* @author : wujipeng * @author : wujipeng
...@@ -10,4 +13,13 @@ import com.platform.model.entity.UserRelationEntity; ...@@ -10,4 +13,13 @@ import com.platform.model.entity.UserRelationEntity;
* @Desc : 描述信息 * @Desc : 描述信息
*/ */
public interface UserRelationService extends IService<UserRelationEntity> { public interface UserRelationService extends IService<UserRelationEntity> {
/**
* 查看与节点用户相关的用户关系
*
* @param nodeList nodeList
* @param caseId
* @return List<UserRelationEntity>
*/
List<UserRelationEntity> queryListByUserNameList(int caseId, List<String> nodeList);
} }
...@@ -45,4 +45,6 @@ public interface WhiteService extends IService<WhiteEntity> { ...@@ -45,4 +45,6 @@ public interface WhiteService extends IService<WhiteEntity> {
* @param list list * @param list list
*/ */
void importExcel(List<WhiteEntity> list); void importExcel(List<WhiteEntity> list);
List<String> queryList();
} }
...@@ -8,10 +8,9 @@ import com.platform.model.dto.ExcelDataDTO; ...@@ -8,10 +8,9 @@ import com.platform.model.dto.ExcelDataDTO;
import com.platform.model.entity.CaseEntity; import com.platform.model.entity.CaseEntity;
import com.platform.model.entity.ExcelDataEntity; import com.platform.model.entity.ExcelDataEntity;
import com.platform.model.entity.GroupDetailEntity; import com.platform.model.entity.GroupDetailEntity;
import com.platform.model.entity.UserRelationEntity;
import com.platform.model.vo.*; import com.platform.model.vo.*;
import com.platform.service.CaseService; import com.platform.service.*;
import com.platform.service.ExcelDataService;
import com.platform.service.GroupService;
import com.platform.utils.StringUtils; import com.platform.utils.StringUtils;
import org.apache.commons.compress.utils.Lists; import org.apache.commons.compress.utils.Lists;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -24,10 +23,14 @@ import java.util.stream.Collectors; ...@@ -24,10 +23,14 @@ import java.util.stream.Collectors;
@Service @Service
public class CaseServiceImpl extends ServiceImpl<CaseMapper, CaseEntity> implements CaseService { public class CaseServiceImpl extends ServiceImpl<CaseMapper, CaseEntity> implements CaseService {
@Resource
private WhiteService whiteService;
@Resource @Resource
private ExcelDataService excelDataService; private ExcelDataService excelDataService;
@Resource @Resource
private GroupService groupService; private GroupService groupService;
@Resource
private UserRelationService userRelationService;
@Override @Override
public List<CaseVO> queryDataList(String id) { public List<CaseVO> queryDataList(String id) {
...@@ -108,6 +111,10 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CaseEntity> impleme ...@@ -108,6 +111,10 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CaseEntity> impleme
// 查询案件数据 // 查询案件数据
List<ExcelDataEntity> excelDataEntityList = excelDataService.queryList(caseDTO); List<ExcelDataEntity> excelDataEntityList = excelDataService.queryList(caseDTO);
if (caseDTO.getWhiteFlag() != null && caseDTO.getWhiteFlag()) {
//过滤白名单
filterWhite(excelDataEntityList);
}
if (CollUtil.isEmpty(excelDataEntityList)) { if (CollUtil.isEmpty(excelDataEntityList)) {
return graph; // 无数据直接返回空图 return graph; // 无数据直接返回空图
...@@ -150,6 +157,7 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CaseEntity> impleme ...@@ -150,6 +157,7 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CaseEntity> impleme
// 第二步:过滤节点 // 第二步:过滤节点
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)) { if (shouldIncludeNode(node, caseDTO)) {
validNodes.add(node); validNodes.add(node);
...@@ -307,11 +315,36 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CaseEntity> impleme ...@@ -307,11 +315,36 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CaseEntity> impleme
memberDetails memberDetails
)); ));
} }
//处理付款人与收款人的关系
disposeUserRelation(caseDTO.getId(), validNodes, graph.getEdges());
//保存团体数据 //保存团体数据
groupService.saveGroup(caseDTO.getId(), graph.getGroups()); groupService.saveGroup(caseDTO.getId(), graph.getGroups());
return graph; return graph;
} }
private void disposeUserRelation(int caseId, Set<String> validNodes, List<EdgeVO> edges) {
//查看用户关系表
List<String> nodeList = new ArrayList<>(validNodes);
List<UserRelationEntity> userRelationEntityList = userRelationService.queryListByUserNameList(caseId, nodeList);
//查看与节点用户相关的用户关系
edges.forEach(edgeVO -> userRelationEntityList.forEach(userRelationEntity -> {
String source = edgeVO.getSource();
String target = edgeVO.getTarget();
String relationSource = userRelationEntity.getUserName();
String relationTarget = userRelationEntity.getOtherName();
if (source.equals(relationSource) && target.equals(relationTarget)) {
edgeVO.setRelation(userRelationEntity.getRelationShip());
}
}));
}
private void filterWhite(List<ExcelDataEntity> excelDataEntityList) {
//查看白名单
List<String> whiteUser = whiteService.queryList();
// 如果 name 属性值存在于白名单中,则移除该元素
excelDataEntityList.removeIf(entity -> whiteUser.contains(entity.getPayUserName()));
}
@Override @Override
public Boolean removeBatchCase(List<String> ids) { public Boolean removeBatchCase(List<String> ids) {
return baseMapper.removeBatchCase(ids); return baseMapper.removeBatchCase(ids);
...@@ -408,12 +441,12 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CaseEntity> impleme ...@@ -408,12 +441,12 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CaseEntity> impleme
@Override @Override
public Boolean saveOrUpdateCase(CaseDTO caseDTO) { public Boolean saveOrUpdateCase(CaseDTO caseDTO) {
if(ObjectUtils.isEmpty(caseDTO.getId())){ if (ObjectUtils.isEmpty(caseDTO.getId())) {
caseDTO.setCreateTime(new Date()); caseDTO.setCreateTime(new Date());
caseDTO.setLastUpdateTime(new Date()); caseDTO.setLastUpdateTime(new Date());
caseDTO.setStatus("1"); caseDTO.setStatus("1");
return baseMapper.saveCase(caseDTO); return baseMapper.saveCase(caseDTO);
}else { } else {
caseDTO.setLastUpdateTime(new Date()); caseDTO.setLastUpdateTime(new Date());
return baseMapper.updateCase(caseDTO); return baseMapper.updateCase(caseDTO);
} }
......
...@@ -6,6 +6,8 @@ import com.platform.model.entity.UserRelationEntity; ...@@ -6,6 +6,8 @@ import com.platform.model.entity.UserRelationEntity;
import com.platform.service.UserRelationService; import com.platform.service.UserRelationService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* @author : wujipeng * @author : wujipeng
* @date : 2025/8/1 14:28 * @date : 2025/8/1 14:28
...@@ -14,4 +16,8 @@ import org.springframework.stereotype.Service; ...@@ -14,4 +16,8 @@ import org.springframework.stereotype.Service;
*/ */
@Service @Service
public class UserRelationServiceImpl extends ServiceImpl<UserRelationMapper, UserRelationEntity> implements UserRelationService { public class UserRelationServiceImpl extends ServiceImpl<UserRelationMapper, UserRelationEntity> implements UserRelationService {
@Override
public List<UserRelationEntity> queryListByUserNameList(int caseId, List<String> nodeList) {
return baseMapper.queryListByUserNameList(caseId,nodeList);
}
} }
...@@ -42,4 +42,9 @@ public class WhiteServiceImpl extends ServiceImpl<WhiteMapper, WhiteEntity> impl ...@@ -42,4 +42,9 @@ public class WhiteServiceImpl extends ServiceImpl<WhiteMapper, WhiteEntity> impl
public void importExcel(List<WhiteEntity> list) { public void importExcel(List<WhiteEntity> list) {
saveBatch(list); saveBatch(list);
} }
@Override
public List<String> queryList() {
return baseMapper.queryList();
}
} }
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.platform.mapper.UserRelationMapper">
<select id="queryListByUserNameList" resultType="com.platform.model.entity.UserRelationEntity">
select
user_name,
other_name,
relation_ship
from
user_relation
where
case_id = #{caseId}
and
user_name in
<foreach collection="nodeList" item="userName" open="(" separator="," close=")">
#{userName}
</foreach>
</select>
</mapper>
...@@ -17,4 +17,11 @@ ...@@ -17,4 +17,11 @@
</if> </if>
</where> </where>
</select> </select>
<select id="queryList" resultType="java.lang.String">
select
name
from
white
</select>
</mapper> </mapper>
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