|
@@ -166,6 +166,7 @@ public class DataStaticService extends Ops {
|
|
|
|
|
|
List<Map<String, Object>> partyDataList = new ArrayList<>();
|
|
List<Map<String, Object>> partyDataList = new ArrayList<>();
|
|
List<Map<String, Object>> relationshipGraphList = new ArrayList<>();
|
|
List<Map<String, Object>> relationshipGraphList = new ArrayList<>();
|
|
|
|
+ List<Map<String, Object>> relationshipGraphListnew = new ArrayList<>();
|
|
List<DataMap> dataMapDetail = this.mongoTemplate.find(query, DataMap.class);
|
|
List<DataMap> dataMapDetail = this.mongoTemplate.find(query, DataMap.class);
|
|
|
|
|
|
List<String> userList = new ArrayList<>();
|
|
List<String> userList = new ArrayList<>();
|
|
@@ -230,7 +231,8 @@ public class DataStaticService extends Ops {
|
|
userAllId = one + "-" + two;
|
|
userAllId = one + "-" + two;
|
|
}
|
|
}
|
|
|
|
|
|
- } else if (jdlx.equals("贷")) {
|
|
|
|
|
|
+ }
|
|
|
|
+ else if (jdlx.equals("贷")) {
|
|
List<DataMap> dataMaps1 = personzhmcMap.get(jythm);
|
|
List<DataMap> dataMaps1 = personzhmcMap.get(jythm);
|
|
List<DataMap> dataMaps2 = personMap.get(jydszh);
|
|
List<DataMap> dataMaps2 = personMap.get(jydszh);
|
|
if(CollectionUtils.isNotEmpty(dataMaps1)&&CollectionUtils.isNotEmpty(dataMaps2)){
|
|
if(CollectionUtils.isNotEmpty(dataMaps1)&&CollectionUtils.isNotEmpty(dataMaps2)){
|
|
@@ -259,19 +261,46 @@ public class DataStaticService extends Ops {
|
|
String jyje = String.valueOf(dataMap1.get("交易金额"));
|
|
String jyje = String.valueOf(dataMap1.get("交易金额"));
|
|
sum.add(new BigDecimal(jyje));
|
|
sum.add(new BigDecimal(jyje));
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ relationData.put("modelId",modelId);
|
|
|
|
+ relationData.put("fileId",dateFileId);
|
|
|
|
+ relationData.put("jythm",jythm);
|
|
|
|
+ relationData.put("jydszh",jydszh);
|
|
relationData.put("jeTotal", sum);
|
|
relationData.put("jeTotal", sum);
|
|
relationData.put("sum", dataDetailList.size());
|
|
relationData.put("sum", dataDetailList.size());
|
|
total.put("party1", party1);
|
|
total.put("party1", party1);
|
|
total.put("party2", party2);
|
|
total.put("party2", party2);
|
|
total.put("relationData", relationData);
|
|
total.put("relationData", relationData);
|
|
- total.put("relationships", dataDetailList);
|
|
|
|
|
|
+ total.put("userAllId", userAllId);
|
|
|
|
+ //total.put("relationships", dataDetailList);
|
|
relationshipGraphList.add(total);
|
|
relationshipGraphList.add(total);
|
|
userAllList.add(userAllId);
|
|
userAllList.add(userAllId);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ for (Map<String, Object> stringObjectMap : relationshipGraphList) {
|
|
|
|
+ Map<String, Object> party1 = (Map) stringObjectMap.get("party1");
|
|
|
|
+ Map<String, Object> party2 = (Map) stringObjectMap.get("party2");
|
|
|
|
+ String name1 = String.valueOf(party1.get("name"));
|
|
|
|
+ String name2 = String.valueOf(party2.get("name"));
|
|
|
|
+ String value1=name2+"-"+name1;
|
|
|
|
+ stringObjectMap.put("type",1);
|
|
|
|
+ for (Map<String, Object> objectMap : relationshipGraphList) {
|
|
|
|
+ Map<String, Object> party11 = (Map) objectMap.get("party1");
|
|
|
|
+ Map<String, Object> party21 = (Map) objectMap.get("party2");
|
|
|
|
+ String name11 = String.valueOf(party11.get("name"));
|
|
|
|
+ String name21 = String.valueOf(party21.get("name"));
|
|
|
|
+ String value11=name11+"-"+name21;
|
|
|
|
+ if(value1.equals(value11)){
|
|
|
|
+ stringObjectMap.put("type",2);
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ relationshipGraphListnew.add(stringObjectMap);
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
dataMap.put("partyData", partyDataList);
|
|
dataMap.put("partyData", partyDataList);
|
|
- dataMap.put("relationshipGraph", relationshipGraphList);
|
|
|
|
|
|
+ dataMap.put("relationshipGraph", relationshipGraphListnew);
|
|
Mapped mapped = Mapped.OK();
|
|
Mapped mapped = Mapped.OK();
|
|
if(partyDataList.size()>300){
|
|
if(partyDataList.size()>300){
|
|
return Mapped.ERROR("节点超过300个,请重新查询");
|
|
return Mapped.ERROR("节点超过300个,请重新查询");
|