瀏覽代碼

优化项目关系数据查询

zhangqiankun 3 年之前
父節點
當前提交
5eb377857c
共有 1 個文件被更改,包括 10 次插入17 次删除
  1. 10 17
      src/main/java/com/persagy/proxy/adm/service/impl/RelationReportService.java

+ 10 - 17
src/main/java/com/persagy/proxy/adm/service/impl/RelationReportService.java

@@ -1,25 +1,17 @@
 package com.persagy.proxy.adm.service.impl;
 
 import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.stream.Collectors;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.persagy.dmp.basic.dto.GraphParentMes;
-import com.persagy.dmp.common.context.AppContext;
-import com.persagy.dmp.common.utils.JsonHelper;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -30,6 +22,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.Lists;
+import com.persagy.dmp.basic.dto.GraphParentMes;
 import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.common.context.AppContext;
@@ -52,7 +45,6 @@ import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmObjectType;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
 import com.persagy.proxy.adm.constant.GraphCodeEnum;
-import com.persagy.proxy.adm.constant.ObjTypeMapping;
 import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.model.EquipmentExcel;
 import com.persagy.proxy.adm.service.IRelationReportService;
@@ -61,6 +53,7 @@ import com.persagy.proxy.adm.strategy.relationdata.RelationObjectStrategy;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 
 /**
@@ -142,7 +135,7 @@ public class RelationReportService implements IRelationReportService {
 		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);
+			//AdmRelationTypeEnum relationTypeEnum = AdmCommonConstant.GRAPH_RELATION_TYPE_MAP.get(graphCode + AdmCommonConstant.UNDERLINE + relCode);
 			result.add(this.fillRelationProjectCal(objectNode, graphCode,relCode,graphRelTypeMap, relationDefineMap));
 		}
 		return result;
@@ -453,7 +446,7 @@ public class RelationReportService implements IRelationReportService {
 		objectNode.put("zoneType", zoneType);	// 业务分区类型
 		objectNode.put("systemType", relationDefine.getSystemType());	// 风系统1,水系统0
 		objectNode.put("computeVersion", 0);	// 计算版本
-		objectNode.put("mepSystemType", CollUtil.isNotEmpty(relationDefine.getMepSystemType())
+		objectNode.putPOJO("mepSystemType", CollUtil.isNotEmpty(relationDefine.getMepSystemType())
 						? objectMapper.valueToTree(relationDefine.getMepSystemType()) :objectMapper.createArrayNode());	// 机电系统类型
 		objectNode.put("creator", AdmCommonConstant.USER_ID);	// 创建人
 		objectNode.put("modifier", AdmCommonConstant.USER_ID);	// 最后修改人
@@ -492,7 +485,7 @@ public class RelationReportService implements IRelationReportService {
 	 * @param content
 	 */
 	private void getGraphRelationProjectTree(List<JSONObject> parentList, String groupCode, String projectId, String content) {
-		boolean isQuery = StringUtils.isNotBlank(content);
+		//boolean isQuery = StringUtils.isNotBlank(content);
 		// 1.获取所有的一级,二级图类型定义
 		QueryCriteria parentCriteria = new QueryCriteria();
 		List<GraphDefine> graphDefines = DigitalGraphDefineFacade.query(groupCode, projectId,
@@ -660,8 +653,8 @@ public class RelationReportService implements IRelationReportService {
 		result.put("id",relationProject.has("id")?relationProject.get("id").asText():null);
 		result.put("manual",relationProject.has("manual")?relationProject.get("manual").asText():null);
 		result.put("projectId",relationProject.has("projectId")?relationProject.get("projectId").asText():null);
-		result.put("relationType",typeEnum.getRelationType());
-		result.put("relManualType",typeEnum.getRelationType());
+		result.put("relationType", typeEnum == null ? null : typeEnum.getRelationType());
+		result.put("relManualType",typeEnum == null ? null : typeEnum.getRelationType());
 		result.put("relationTypeCode",relationProject.has("relCode")?relationProject.get("relCode").asText():null);
 		result.put("code", relationProject.has("relCode")?relationProject.get("relCode").asText():null);
 		result.put("relationTypeName",relationProject.has("relCodeName")?relationProject.get("relCodeName").asText():null);