关系类型维护修改

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

@@ -27,6 +27,12 @@ public class GetAllConceptDTO {
 	@ApiModelProperty(value="类型")
 	private String type;
 	
+	/**
+	 * 名称(类型)
+	 */
+	@ApiModelProperty(value="名称(类型)")
+	private String nameAndType;
+	
 	/**
 	 * 概念id
 	 */

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

@@ -0,0 +1,34 @@
+package com.diagbot.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description
+ * @author rgb
+ * @time 2018年12月5日下午5:00:34
+ */
+@Getter
+@Setter
+public class GetAllLexiconRelationshipDTO {
+	
+	/**
+	 * 关系id
+	 */
+	@ApiModelProperty(value="关系id")
+	private Long id;
+	
+    /**
+     * 关系名称
+     */
+    @ApiModelProperty(value="关系名称")
+    private String name;
+
+    /**
+     * 关系代码
+     */
+    @ApiModelProperty(value="关系代码")
+    private String code;
+
+}

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

@@ -84,9 +84,12 @@ public class ConceptFacade extends ConceptServiceImpl {
     		libraryInfoQe.like("name", getAllConceptVO.getName());
     	}
     	
-    	List<LibraryInfo> libraryInfoList = libraryinfoFacade.list(libraryInfoQe);
+    	List<GetAllConceptDTO> getAllConceptDTOList = BeanUtil.listCopyTo(libraryinfoFacade.list(libraryInfoQe), GetAllConceptDTO.class);
+    	getAllConceptDTOList.forEach(i->{
+    		i.setNameAndType(i.getName()+"("+i.getType()+")");
+    	});
     	
-    	return BeanUtil.listCopyTo(libraryInfoList, GetAllConceptDTO.class);
+    	return getAllConceptDTOList;
     }
     
     /**

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

@@ -1,16 +1,41 @@
 package com.diagbot.facade;
 
+import java.util.List;
+
 import org.springframework.stereotype.Component;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.GetAllLexiconRelationshipDTO;
+import com.diagbot.entity.LexiconRelationship;
 import com.diagbot.service.impl.LexiconRelationshipServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.GetAllLexiconRelationshipVO;
 
 /**
- * @Description: 术语关系信息业务层
+ * @Description: 术语关系类型业务层
  * @author: Weixuan Huang
  * @time: 2019/1/16 14:17
  */
 @Component
 public class LexiconRelationshipFacade extends LexiconRelationshipServiceImpl {
+	
+	 /**
+     * 获取所有关系类型
+     * @param getAllConceptVO
+     * @return
+     */
+    public List<GetAllLexiconRelationshipDTO> getAllLexiconRelationship(GetAllLexiconRelationshipVO getAllLexiconRelationshipVO){
+    	QueryWrapper<LexiconRelationship> lexiconRelationshipQe = new QueryWrapper<>();
+    	lexiconRelationshipQe.eq("is_deleted", "N");
+    	if(StringUtil.isNotBlank(getAllLexiconRelationshipVO.getName())){
+    		lexiconRelationshipQe.like("name", getAllLexiconRelationshipVO.getName());
+    	}
+    	if(StringUtil.isNotBlank(getAllLexiconRelationshipVO.getCode())){
+    		lexiconRelationshipQe.eq("code", getAllLexiconRelationshipVO.getCode());
+    	}
+    	return BeanUtil.listCopyTo(list(lexiconRelationshipQe), GetAllLexiconRelationshipDTO.class);
+    }
 
 
 }

knowledgeman-service/src/main/java/com/diagbot/vo/GetAllLexiconRelationshipVO.java

@@ -0,0 +1,28 @@
+package com.diagbot.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: Weixuan Huang
+ * @time: 2019/3/14 16:03
+ */
+@Getter
+@Setter
+public class GetAllLexiconRelationshipVO {
+    
+    /**
+     * 关系名称
+     */
+    @ApiModelProperty(value="关系名称")
+    private String name;
+
+    /**
+     * 关系代码
+     */
+    @ApiModelProperty(value="关系代码")
+    private String code;
+    
+}

knowledgeman-service/src/main/java/com/diagbot/web/LexiconRelationshipController.java

@@ -0,0 +1,45 @@
+package com.diagbot.web;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.GetAllLexiconRelationshipDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.LexiconRelationshipFacade;
+import com.diagbot.vo.GetAllLexiconRelationshipVO;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+@RestController
+@RequestMapping("/lexiconRelationship")
+@SuppressWarnings("unchecked")
+@Api(value = "关系类型维护相关API", tags = { "关系类型维护相关API" })
+public class LexiconRelationshipController {
+	
+    @Autowired
+    private LexiconRelationshipFacade lexiconRelationshipFacade;
+    
+    @ApiOperation(value = "获取所有关系类型[by:rengb]")
+    @PostMapping("/getAllLexiconRelationship")
+    @SysLogger("getAllLexiconRelationship")
+    public RespDTO<List<GetAllLexiconRelationshipDTO>> getAllLexiconRelationship(@RequestBody GetAllLexiconRelationshipVO getAllLexiconRelationshipVO) {
+        return RespDTO.onSuc(lexiconRelationshipFacade.getAllLexiconRelationship(getAllLexiconRelationshipVO));
+    }
+    
+    
+}