关联详情修改

knowledgeman-service/src/main/java/com/diagbot/dto/RelationNodeDTO.java

@@ -24,6 +24,21 @@ public class RelationNodeDTO {
 	 */
 	private String conceptName;
 	
+	/**
+	 * 当前概念类型id
+	 */
+	private Long conceptTypeId;
+	
+	/**
+	 * 当前概念类型名称
+	 */
+	private String conceptTypeName;
+	
+	/**
+	 * 当前概念名称(类型)
+	 */
+	private String conceptNameType;
+	
 	/**
 	 * 上一级概念id end_id
 	 */
@@ -34,6 +49,21 @@ public class RelationNodeDTO {
 	 */
 	private String parentConceptName;
 	
+	/**
+	 * 上一级概念类型id
+	 */
+	private Long parentConceptTypeId;
+	
+	/**
+	 * 上一级概念类型名称
+	 */
+	private String parentConceptTypeName;
+	
+	/**
+	 * 上一级概念名称(类型)
+	 */
+	private String parentConceptNameType;
+	
 	/**
 	 * 当前概念(起点术语) 与 上一级概念(终点术语) 关系id
 	 */

knowledgeman-service/src/main/java/com/diagbot/facade/RelationContactFacade.java

@@ -195,7 +195,10 @@ public class RelationContactFacade extends RelationServiceImpl {
 		
 		Concept concept = conceptFacade.getById(relationContactDetailVO.getConceptId());
 		relationNodeDTO.setConceptId(concept.getId());
-		relationNodeDTO.setConceptName(concept.getLibName()+"("+LexiconTypeEnum.getName(concept.getLibType().intValue())+")");
+		relationNodeDTO.setConceptName(concept.getLibName());
+		relationNodeDTO.setConceptTypeId(concept.getLibType());
+		relationNodeDTO.setConceptTypeName(LexiconTypeEnum.getName(concept.getLibType().intValue()));
+		relationNodeDTO.setConceptNameType(concept.getLibName()+"("+LexiconTypeEnum.getName(concept.getLibType().intValue())+")");
 		
 		relationNodeDTO.setNodeList(repairRelationDataForQuery(relationContactDetailVO.getConceptId(), relationContactDetailVO.getRelationId()));
 		
@@ -212,6 +215,11 @@ public class RelationContactFacade extends RelationServiceImpl {
 		List<RelationNodeDTO> relationNodeDTOList = this.baseMapper.getRelationNodeDTOs(conceptId, relationId);
 		
 		relationNodeDTOList.forEach(i->{
+			i.setConceptTypeName(LexiconTypeEnum.getName(i.getConceptTypeId().intValue()));
+			i.setConceptNameType(i.getConceptName()+"("+LexiconTypeEnum.getName(i.getConceptTypeId().intValue())+")");
+			i.setParentConceptTypeName(LexiconTypeEnum.getName(i.getParentConceptTypeId().intValue()));
+			i.setParentConceptNameType(i.getParentConceptName()+"("+LexiconTypeEnum.getName(i.getParentConceptTypeId().intValue())+")");
+			
 			i.setNodeList(repairRelationDataForQuery(i.getConceptId(), relationId));
 		});
 		

knowledgeman-service/src/main/resources/mapper/RelationMapper.xml

@@ -54,8 +54,10 @@
     	SELECT
 			d.id AS conceptId,
 			d.lib_name AS conceptName,
+			d.lib_type AS conceptTypeId,
 			c.id AS parentConceptId,
 			c.lib_name AS parentConceptName,
+			c.lib_type AS parentConceptTypeId,
 			e.id AS relationId,
 			e.`name` AS relationName
 		FROM kl_relation a LEFT JOIN kl_relation_order b ON a.id=b.t_relation_id