Commit 9ca4f4a2 authored by zhuxiang's avatar zhuxiang
Browse files

信息查询接口优化

parent 6d6063cd
package com.platform.mapper; package com.platform.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.platform.model.dto.CaseDTO;
import com.platform.model.entity.UserEntity; import com.platform.model.entity.UserEntity;
import com.platform.model.vo.ExcelDataVO; import com.platform.model.vo.ExcelDataVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
...@@ -14,4 +15,6 @@ public interface UserMapper extends BaseMapper<UserEntity> { ...@@ -14,4 +15,6 @@ public interface UserMapper extends BaseMapper<UserEntity> {
@Param("caseId") Integer id); @Param("caseId") Integer id);
void saveUserBatch(@Param("userList") List<UserEntity> userList); void saveUserBatch(@Param("userList") List<UserEntity> userList);
List<ExcelDataVO> queryList(CaseDTO caseDTO);
} }
package com.platform.service; package com.platform.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.platform.model.dto.CaseDTO;
import com.platform.model.dto.UserDTO; import com.platform.model.dto.UserDTO;
import com.platform.model.entity.ExcelDataEntity; import com.platform.model.entity.ExcelDataEntity;
import com.platform.model.entity.UserEntity; import com.platform.model.entity.UserEntity;
...@@ -42,4 +43,6 @@ public interface UserService extends IService<UserEntity> { ...@@ -42,4 +43,6 @@ public interface UserService extends IService<UserEntity> {
List<ExcelDataVO> queryUserLabel(List<String> userNameList, Integer id); List<ExcelDataVO> queryUserLabel(List<String> userNameList, Integer id);
void saveUserBatch(List<UserEntity> userList); void saveUserBatch(List<UserEntity> userList);
List<ExcelDataVO> queryList(CaseDTO caseDTO);
} }
...@@ -55,7 +55,7 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem ...@@ -55,7 +55,7 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
if (StringUtils.isNotEmpty(excelDataVO.getPayUserName()) if (StringUtils.isNotEmpty(excelDataVO.getPayUserName())
&& StringUtils.isNotEmpty(excelDataVO.getPayeeName()) && StringUtils.isNotEmpty(excelDataVO.getPayeeName())
&& excelDataVO.getPayUserName().equals(excelDataVO.getPayeeName())) { && excelDataVO.getPayUserName().equals(excelDataVO.getPayeeName())) {
}else { } else {
excelDataEntityList1.add(excelDataVO); excelDataEntityList1.add(excelDataVO);
} }
} }
...@@ -558,13 +558,15 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem ...@@ -558,13 +558,15 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
@Override @Override
public List<NodeVO> info(CaseDTO caseDTO) { public List<NodeVO> info(CaseDTO caseDTO) {
// 使用Set去重
Set<String> uniqueNodes = new HashSet<>();
// 使用Map来统计每个人关联的节点数量 // 使用Map来统计每个人关联的节点数量
Map<String, Integer> nodeDegreeMap = new HashMap<>(); Map<String, Integer> nodeDegreeMap = new HashMap<>();
Map<String, String> nodeAndUser = new HashMap<>(); Map<String, String> nodeAndUser = new HashMap<>();
List<ExcelDataEntity> excelDataEntityList = excelDataService.queryInfoList(caseDTO); List<ExcelDataVO> excelDataVOList = userService.queryList(caseDTO);
List<String> userNameList = new ArrayList<>();
excelDataVOList.forEach(excelDataVO -> userNameList.add(excelDataVO.getPayUserName()));
List<ExcelDataEntity> excelDataEntityList = filterInfoExcelData(caseDTO);
// 遍历结果集 // 遍历结果集
for (ExcelDataEntity excelDataEntity : excelDataEntityList) { for (ExcelDataEntity excelDataEntity : excelDataEntityList) {
...@@ -573,9 +575,6 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem ...@@ -573,9 +575,6 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
if (StringUtils.isEmpty(payee) || StringUtils.isEmpty(payer)) { if (StringUtils.isEmpty(payee) || StringUtils.isEmpty(payer)) {
continue; continue;
} }
// 添加节点
uniqueNodes.add(payer);
uniqueNodes.add(payee);
// 更新每个人关联的节点数量 // 更新每个人关联的节点数量
String key = payer + payee; String key = payer + payee;
if (nodeAndUser.get(key) == null) { if (nodeAndUser.get(key) == null) {
...@@ -584,10 +583,6 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem ...@@ -584,10 +583,6 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
nodeAndUser.put(key, key); nodeAndUser.put(key, key);
} }
} }
//查看每个人的账号类型
List<String> userNameList = new ArrayList<>(uniqueNodes);
//查看每个人的账号标签
List<ExcelDataVO> excelDataEntityListNew = userService.queryUserLabel(userNameList, caseDTO.getId());
//查看是否存在白名单 //查看是否存在白名单
List<WhiteEntity> whiteEntityList = whiteService.queryByNameList(userNameList); List<WhiteEntity> whiteEntityList = whiteService.queryByNameList(userNameList);
...@@ -595,7 +590,7 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem ...@@ -595,7 +590,7 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
Map<String, Integer> whiteMap = new HashMap<>(); Map<String, Integer> whiteMap = new HashMap<>();
whiteEntityList.forEach(whiteEntity -> whiteMap.put(whiteEntity.getName(), whiteEntity.getId())); whiteEntityList.forEach(whiteEntity -> whiteMap.put(whiteEntity.getName(), whiteEntity.getId()));
for (ExcelDataVO dataVO : excelDataEntityListNew) { for (ExcelDataVO dataVO : excelDataVOList) {
for (Map.Entry<String, Integer> entry : nodeDegreeMap.entrySet()) { for (Map.Entry<String, Integer> entry : nodeDegreeMap.entrySet()) {
String key = entry.getKey(); String key = entry.getKey();
Integer value = entry.getValue(); Integer value = entry.getValue();
...@@ -612,7 +607,7 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem ...@@ -612,7 +607,7 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
dataVO.setWhiteId(whiteId); dataVO.setWhiteId(whiteId);
} }
Iterator<ExcelDataVO> iterator = excelDataEntityListNew.iterator(); Iterator<ExcelDataVO> iterator = excelDataVOList.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
ExcelDataVO excelDataVO = iterator.next(); ExcelDataVO excelDataVO = iterator.next();
if (caseDTO.getMinTransaction() != null && caseDTO.getMaxTransaction() != null) { if (caseDTO.getMinTransaction() != null && caseDTO.getMaxTransaction() != null) {
...@@ -628,7 +623,7 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem ...@@ -628,7 +623,7 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
} }
List<NodeVO> result = Lists.newArrayList(); List<NodeVO> result = Lists.newArrayList();
excelDataEntityListNew.forEach(excelDataVO -> { excelDataVOList.forEach(excelDataVO -> {
NodeVO org = new NodeVO(); NodeVO org = new NodeVO();
if (excelDataVO.getAccountType().equals("银联")) { if (excelDataVO.getAccountType().equals("银联")) {
...@@ -651,6 +646,50 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem ...@@ -651,6 +646,50 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
return result; return result;
} }
private List<ExcelDataEntity> filterInfoExcelData(CaseDTO caseDTO) {
List<ExcelDataEntity> excelDataEntityList = excelDataService.queryList(caseDTO);
if (CollUtil.isEmpty(excelDataEntityList)) {
return excelDataEntityList;
}
// 使用迭代器安全删除
Iterator<ExcelDataEntity> iterator = excelDataEntityList.iterator();
while (iterator.hasNext()) {
ExcelDataEntity excelDataEntity = iterator.next();
// 过滤付款人类型
if (caseDTO.getNodeType() != null) {
if (caseDTO.getNodeType().equals("银联") && excelDataEntity.getPayeeName().contains("公司")) {
iterator.remove();
continue;
}
if (caseDTO.getNodeType().equals("个人") && !excelDataEntity.getPayeeName().contains("公司")) {
iterator.remove();
continue;
}
}
// 过滤金额范围
if (!isWithinAmountRange(excelDataEntity, caseDTO.getMinAmount(), caseDTO.getMaxAmount())) {
iterator.remove();
continue;
}
// 过滤交易次数
if (!isWithinTransactionRange(excelDataEntity, caseDTO.getMinTransaction(), caseDTO.getMaxTransaction())) {
iterator.remove();
}
}
// 白名单过滤
if (caseDTO.getWhiteFlag() != null && caseDTO.getWhiteFlag()) {
filterWhite(excelDataEntityList);
}
return excelDataEntityList;
}
// 检查团体是否有实际连接(非孤立节点) // 检查团体是否有实际连接(非孤立节点)
private boolean hasConnections(Set<String> members, GraphVO graph) { private boolean hasConnections(Set<String> members, GraphVO graph) {
return graph.getEdges().stream() return graph.getEdges().stream()
......
...@@ -10,6 +10,7 @@ import com.google.common.collect.Maps; ...@@ -10,6 +10,7 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.platform.exception.BusinessException; import com.platform.exception.BusinessException;
import com.platform.mapper.UserMapper; import com.platform.mapper.UserMapper;
import com.platform.model.dto.CaseDTO;
import com.platform.model.dto.UserDTO; import com.platform.model.dto.UserDTO;
import com.platform.model.entity.ExcelDataEntity; import com.platform.model.entity.ExcelDataEntity;
import com.platform.model.entity.UserAccountEntity; import com.platform.model.entity.UserAccountEntity;
...@@ -256,7 +257,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme ...@@ -256,7 +257,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
PageHelper.startPage(userDTO.getPageNum(), userDTO.getPageSize()); PageHelper.startPage(userDTO.getPageNum(), userDTO.getPageSize());
if(!ObjectUtils.isEmpty(oneselfAccountList) && !ObjectUtils.isEmpty(otherAccountList)){ if (!ObjectUtils.isEmpty(oneselfAccountList) && !ObjectUtils.isEmpty(otherAccountList)) {
List<ExcelDataEntity> details = excelDataService.relationPage(oneselfAccountList, otherAccountList); List<ExcelDataEntity> details = excelDataService.relationPage(oneselfAccountList, otherAccountList);
everyoneVO.setDetails(details); everyoneVO.setDetails(details);
} }
...@@ -312,4 +313,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme ...@@ -312,4 +313,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
public void saveUserBatch(List<UserEntity> userList) { public void saveUserBatch(List<UserEntity> userList) {
baseMapper.saveUserBatch(userList); baseMapper.saveUserBatch(userList);
} }
@Override
public List<ExcelDataVO> queryList(CaseDTO caseDTO) {
return baseMapper.queryList(caseDTO);
}
} }
...@@ -54,6 +54,12 @@ ...@@ -54,6 +54,12 @@
<if test="endTime != null"> <if test="endTime != null">
and time &lt;= #{endTime} and time &lt;= #{endTime}
</if> </if>
<if test="startTime != null and endTime == null">
and time >= #{startTime}
</if>
<if test="startTime == null and endTime != null">
and time <![CDATA[ <= ]]> #{startTime}
</if>
group by pay_user_name,payee_name group by pay_user_name,payee_name
</select> </select>
<select id="selectFinancialTransactions" resultType="com.platform.model.vo.AssociationVO"> <select id="selectFinancialTransactions" resultType="com.platform.model.vo.AssociationVO">
......
...@@ -23,4 +23,26 @@ ...@@ -23,4 +23,26 @@
LEFT JOIN LEFT JOIN
user u ON u.user_name = v.userName AND u.case_id = #{caseId} user u ON u.user_name = v.userName AND u.case_id = #{caseId}
</select> </select>
<select id="queryList" resultType="com.platform.model.vo.ExcelDataVO">
select
u.user_name payUserName,
u.label label
from
user u
left join
user_account ua
on
u.user_name = ua.user_name
<where>
and u.case_id = #{id}
<if test="nodeName != null and nodeName != ''">
and (u.user_name like concat('%',#{nodeName},'%') or u.id_card like concat('%',#{nodeName},'%') or ua.code like concat('%',#{nodeName},'%') )
</if>
<if test="label != null and label != ''">
and u.label like concat('%',#{label},'%')
</if>
</where>
group by u.user_name
</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