|
@@ -125,9 +125,6 @@ public class DataStaticService extends Ops {
|
|
|
String[] split = jyzthm.split(";");
|
|
|
for (int i = 0; i < split.length; i++) {
|
|
|
String s = split[i];
|
|
|
- if(s.equals("朱光振")){
|
|
|
- System.out.println("");
|
|
|
- }
|
|
|
List<DataMap> dataMaps = personzhmcMap.get(s);
|
|
|
if (CollectionUtils.isEmpty(dataMaps)) {
|
|
|
DataMap datamapnew = new DataMap();
|
|
@@ -249,7 +246,7 @@ public class DataStaticService extends Ops {
|
|
|
Map<String, List<DataMap>> dsMap = new HashMap<>();
|
|
|
Map<String, Set<String>> zh = new HashMap<>();
|
|
|
|
|
|
- Map<String, Set<String>> jyzthmMap = new HashMap<>();
|
|
|
+ Map<String, List<DataMap>> jyzthmMap = new HashMap<>();
|
|
|
while (cursor.hasNext()) {
|
|
|
// 写法1(建议)
|
|
|
try {
|
|
@@ -262,14 +259,21 @@ public class DataStaticService extends Ops {
|
|
|
continue;
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(jyzthm)){
|
|
|
- Set<String> strings = jyzthmMap.get(jyzthm);
|
|
|
- if (CollectionUtils.isEmpty(strings)) {
|
|
|
- strings = new HashSet<>();
|
|
|
- strings.add(jyztzh);
|
|
|
- } else {
|
|
|
- strings.add(jyztzh);
|
|
|
+ List<DataMap> dataMaps1 = personzhmcMap.get(jyzthm);
|
|
|
+ List<DataMap> dataMaps2 = jyzthmMap.get(jyzthm);
|
|
|
+ for (DataMap dataMap1 : dataMaps1) {
|
|
|
+ String jyztzh1 = String.valueOf(dataMap1.get("交易主体账号"));
|
|
|
+ if(StringUtils.isNotBlank(jyztzh1)&&jyztzh.equals(jyztzh1)){
|
|
|
+ if(CollectionUtils.isEmpty(dataMaps2)){
|
|
|
+ List<DataMap> dataMaps3 = new ArrayList<>();
|
|
|
+ dataMaps3.add(dataMap1);
|
|
|
+ jyzthmMap.put(jyzthm,dataMaps3);
|
|
|
+ }else {
|
|
|
+ dataMaps2.add(dataMap1);
|
|
|
+ jyzthmMap.put(jyzthm,dataMaps2);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
- jyzthmMap.put(jyzthm, strings);
|
|
|
}
|
|
|
Set<String> strings = zh.get(jydszh);
|
|
|
if (CollectionUtils.isEmpty(strings)) {
|
|
@@ -288,21 +292,6 @@ public class DataStaticService extends Ops {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- //组装数据
|
|
|
- Map<String, List<DataMap>> personzhmcMapNew = new HashMap<>();
|
|
|
- for (Map.Entry<String, Set<String>> entry : jyzthmMap.entrySet()) {
|
|
|
- String key = entry.getKey();
|
|
|
- Set<String> value = entry.getValue();
|
|
|
- List<DataMap>dataListNew = new ArrayList<>();
|
|
|
- for (String s : value) {
|
|
|
- DataMap dataMap1=new DataMap();
|
|
|
- dataMap1.put("交易主体户名",key);
|
|
|
- dataMap1.put("交易主体账号",s);
|
|
|
- dataListNew.add(dataMap1);
|
|
|
- }
|
|
|
- personzhmcMapNew.put(key,dataListNew);
|
|
|
- }
|
|
|
-
|
|
|
/* for (DataMap map : dataMapDetail) {
|
|
|
String jydszh = String.valueOf(map.get("交易对手账号"));
|
|
|
String jyzthm = String.valueOf(map.get("交易主体户名"));
|
|
@@ -355,7 +344,7 @@ public class DataStaticService extends Ops {
|
|
|
}
|
|
|
|
|
|
//获取节点名称
|
|
|
- List<DataMap> dataMapsparty1 = personzhmcMap.get(jythm);
|
|
|
+ List<DataMap> dataMapsparty1 = jyzthmMap.get(jythm);
|
|
|
List<DataMap> dataMapsparty2 = personMap.get(jydszh);
|
|
|
if (CollectionUtils.isEmpty(dataMapsparty1) || CollectionUtils.isEmpty(dataMapsparty2)) {
|
|
|
continue;
|