|
@@ -130,13 +130,13 @@ public class RelationReportService implements IRelationReportService {
|
|
|
return Lists.newArrayList();
|
|
|
}
|
|
|
List<JSONObject> result = Lists.newArrayList();
|
|
|
- Map<String, AdmRelationTypeEnum> graphRelTypeMap = AdmRelationTypeEnum.getGraphRelTypeMap();
|
|
|
+ Map<String, AdmRelationTypeEnum> graphRelTypeMap = AdmCommonConstant.GRAPH_RELATION_TYPE_MAP;
|
|
|
Map<String, RelationDefine> relationDefineMap = queryAllRelationDefineMap(groupCode, projectId);
|
|
|
for (ObjectNode objectNode : projectList) {
|
|
|
String graphCode = objectNode.get("graphCode") == null ? null : objectNode.get("graphCode").asText();
|
|
|
String relCode = objectNode.get("relCode") == null ? null : objectNode.get("relCode").asText();
|
|
|
//AdmRelationTypeEnum relationTypeEnum = AdmCommonConstant.GRAPH_RELATION_TYPE_MAP.get(graphCode + AdmCommonConstant.UNDERLINE + relCode);
|
|
|
- result.add(this.fillRelationProjectCal(objectNode, graphCode,relCode,graphRelTypeMap, relationDefineMap));
|
|
|
+ result.add(this.fillRelationProjectCal(objectNode, graphCode, relCode, graphRelTypeMap, relationDefineMap, groupCode, projectId));
|
|
|
}
|
|
|
return result;
|
|
|
}
|
|
@@ -153,7 +153,7 @@ public class RelationReportService implements IRelationReportService {
|
|
|
}
|
|
|
// 获取此图类型对应项目计算数据
|
|
|
List<JSONObject> resultList = new ArrayList<>();
|
|
|
- Map<String, AdmRelationTypeEnum> graphRelTypeMap = AdmRelationTypeEnum.getGraphRelTypeMap();
|
|
|
+ Map<String, AdmRelationTypeEnum> graphRelTypeMap = AdmCommonConstant.GRAPH_RELATION_TYPE_MAP;
|
|
|
Map<String, RelationDefine> relationDefineMap = queryAllRelationDefineMap(groupCode, projectId);
|
|
|
for (GraphDefine graphDefine : secondList) {
|
|
|
String graphCode = graphDefine.getCode();
|
|
@@ -175,7 +175,7 @@ public class RelationReportService implements IRelationReportService {
|
|
|
List<JSONObject> tempList = new ArrayList<>();
|
|
|
for (ObjectNode objectNode : projectList) {
|
|
|
String relCode = objectNode.get("relCode") == null ? null : objectNode.get("relCode").asText();
|
|
|
- tempList.add(this.fillRelationProjectCal(objectNode,graphDefine.getCode(),relCode,graphRelTypeMap,relationDefineMap));
|
|
|
+ tempList.add(this.fillRelationProjectCal(objectNode, graphDefine.getCode(), relCode, graphRelTypeMap,relationDefineMap, groupCode, projectId));
|
|
|
}
|
|
|
graphObject.put("relationTypeProjectList", projectList);
|
|
|
resultList.add(graphObject);
|
|
@@ -195,10 +195,10 @@ public class RelationReportService implements IRelationReportService {
|
|
|
|
|
|
ObjectNode objectNode = this.getRelationProjectCal(groupCode, projectId, relationTypeEnum.getGraphCode(),
|
|
|
relationTypeEnum.getRelCode(), null);
|
|
|
- Map<String, AdmRelationTypeEnum> graphRelTypeMap = AdmRelationTypeEnum.getGraphRelTypeMap();
|
|
|
+ Map<String, AdmRelationTypeEnum> graphRelTypeMap = AdmCommonConstant.GRAPH_RELATION_TYPE_MAP;
|
|
|
Map<String, RelationDefine> relationDefineMap = queryAllRelationDefineMap(groupCode, projectId);
|
|
|
if (objectNode != null) {
|
|
|
- return this.fillRelationProjectCal(objectNode,groupCode,relationTypeEnum.getRelCode(),graphRelTypeMap,relationDefineMap);
|
|
|
+ return this.fillRelationProjectCal(objectNode, relationTypeEnum.getGraphCode(), relationTypeEnum.getRelCode(), graphRelTypeMap, relationDefineMap, groupCode, projectId);
|
|
|
}
|
|
|
|
|
|
return new JSONObject();
|
|
@@ -513,7 +513,7 @@ public class RelationReportService implements IRelationReportService {
|
|
|
continue;
|
|
|
}
|
|
|
List<JSONObject> sonList = levelMap.getOrDefault(graphCode, new ArrayList<>());
|
|
|
- JSONObject son = this.fillRelationProjectCal(projectRel, graphCode,relCode,graphRelTypeMap,relationDefineMap);
|
|
|
+ JSONObject son = this.fillRelationProjectCal(projectRel, graphCode,relCode,graphRelTypeMap,relationDefineMap, null, null);
|
|
|
sonList.add(son);
|
|
|
sonList.sort(Comparator.comparing(b -> b.getString("relationTypeCode")));
|
|
|
levelMap.put(graphCode,sonList);
|
|
@@ -643,11 +643,17 @@ public class RelationReportService implements IRelationReportService {
|
|
|
*/
|
|
|
private JSONObject fillRelationProjectCal(ObjectNode relationProject, String graphicId, String relCode,
|
|
|
Map<String, AdmRelationTypeEnum> graphRelTypeMap,
|
|
|
- Map<String, RelationDefine> relationDefineMap) {
|
|
|
+ Map<String, RelationDefine> relationDefineMap,
|
|
|
+ String groupCode, String projectId) {
|
|
|
String key = graphicId + StrUtil.UNDERLINE + relCode;
|
|
|
AdmRelationTypeEnum typeEnum = graphRelTypeMap.get(key);
|
|
|
RelationDefine relationDefine = relationDefineMap.getOrDefault(key,new RelationDefine());
|
|
|
JSONObject result = new JSONObject();
|
|
|
+ if (StrUtil.isAllNotBlank(groupCode, projectId)) {
|
|
|
+ String zoneType = relationProject.has("zoneType") ? relationProject.get("zoneType").asText() : null;
|
|
|
+ long count = this.countRelationObject(groupCode, projectId, graphicId, relCode, zoneType);
|
|
|
+ result.put("count", count);
|
|
|
+ }
|
|
|
result.put("graphicId", graphicId);
|
|
|
result.put("computationalState",relationProject.has("computationalState")?relationProject.get("computationalState").asText():null);
|
|
|
result.put("id",relationProject.has("id")?relationProject.get("id").asText():null);
|