|
@@ -168,11 +168,36 @@ public class DataStaticService extends Ops {
|
|
|
List<Map<String, Object>> relationshipGraphList = new ArrayList<>();
|
|
|
List<Map<String, Object>> relationshipGraphListnew = new ArrayList<>();
|
|
|
List<DataMap> dataMapDetail = this.mongoTemplate.find(query, DataMap.class);
|
|
|
+ //先去判断从是否有大于2的数据
|
|
|
+
|
|
|
+ Map<String,List<DataMap>>dsMap=new HashMap<>();
|
|
|
+ for (DataMap map : dataMapDetail) {
|
|
|
+ String jydszh = String.valueOf(map.get("交易对手账号"));
|
|
|
+ if (StringUtils.isBlank(jydszh) || "null".equals(jydszh)) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ List<DataMap> dataMaps1 = dsMap.get(jydszh);
|
|
|
+ if(CollectionUtils.isEmpty(dataMaps1)){
|
|
|
+ dsMap.put(jydszh,Lists.newArrayList(map));
|
|
|
+ }else {
|
|
|
+ dataMaps1.add(map);
|
|
|
+ dsMap.put(jydszh,dataMaps1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(dsMap==null){
|
|
|
+ return Mapped.ERROR("数据有误,请重新查询");
|
|
|
+ }
|
|
|
+ List<DataMap>newList=Lists.newArrayList();
|
|
|
+ for (Map.Entry<String,List<DataMap>> entry : dsMap.entrySet()) {
|
|
|
+ if(entry.getValue().size()>1){
|
|
|
+ newList.addAll(entry.getValue());
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
List<String> userList = new ArrayList<>();
|
|
|
List<String> usermcList = new ArrayList<>();
|
|
|
List<String> userAllList = new ArrayList<>();
|
|
|
- for (DataMap map : dataMapDetail) {
|
|
|
+ for (DataMap map : newList) {
|
|
|
String jythm = String.valueOf(map.get("交易主体户名"));
|
|
|
String jydszh = String.valueOf(map.get("交易对手账号"));
|
|
|
if (StringUtils.isBlank(jythm) || "null".equals(jythm)) {
|