代码优化调整

aipt-service/src/main/java/com/diagbot/web/ConceptDetailController.java

@@ -6,6 +6,7 @@ import com.diagbot.dto.ConceptIntroduceDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.ConceptDetailFacade;
 import com.diagbot.vo.ConceptIntroduceVO;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -25,11 +26,13 @@ import javax.validation.Valid;
  */
 @RestController
 @RequestMapping("/conceptDetail")
+@Api(value = "提示信息相关API", tags = { "知识库标准化-提示信息相关API" })
+@SuppressWarnings("unchecked")
 public class ConceptDetailController {
     @Autowired
     private ConceptDetailFacade conceptDetailFacade;
 
-    @ApiOperation(value = "获取提示信息[by:zhaops]", notes = "")
+    @ApiOperation(value = "知识库标准化-获取提示信息[by:zhaops]", notes = "")
     @PostMapping("/getConceptDetail")
     @SysLogger("getConceptDetail")
     public RespDTO<ConceptIntroduceDTO> getConceptDetail(@Valid @RequestBody ConceptIntroduceVO conceptIntroduceVO) {

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

@@ -0,0 +1,22 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2019/5/6 15:59
+ */
+@Getter
+@Setter
+public class ConceptRes {
+    //关系起点术语id
+    private Long startId;
+    //关系起点术语名称
+    private String startName;
+    //关系终点术语id
+    private Long endId;
+    //关系终点术语名称
+    private String endName;
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2019/5/6 16:02
+ */
+@Getter
+@Setter
+public class ConceptWithOrderRes extends ConceptRes{
+    //排序号
+    private Integer orderNo;
+}

knowledgeman-service/src/main/java/com/diagbot/entity/wrapper/ConceptWrapper.java

@@ -0,0 +1,28 @@
+package com.diagbot.entity.wrapper;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 概念查询参数
+ * @author: gaodm
+ * @time: 2019/5/6 16:05
+ */
+@Getter
+@Setter
+public class ConceptWrapper {
+    //关系起点术语id
+    private Long startId;
+    //关系起点术语名称
+    private String startName;
+    //关系起点术语类型
+    private Integer startType;
+    //关系类型
+    private Integer relationType;
+    //关系终点术语id
+    private Long endId;
+    //关系终点术语名称
+    private String endName;
+    //关系终点术语类型
+    private Integer endType;
+}

knowledgeman-service/src/main/java/com/diagbot/mapper/ConceptMapper.java

@@ -3,8 +3,11 @@ package com.diagbot.mapper;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.dto.ConceptRes;
+import com.diagbot.dto.ConceptWithOrderRes;
 import com.diagbot.dto.GetAllLisConceptDTO;
 import com.diagbot.entity.Concept;
+import com.diagbot.entity.wrapper.ConceptWrapper;
 import com.diagbot.vo.GetAllLisConceptVO;
 
 /**
@@ -24,5 +27,8 @@ public interface ConceptMapper extends BaseMapper<Concept> {
 	 */
 	List<GetAllLisConceptDTO> getAllLisConcept(GetAllLisConceptVO getAllLisConceptVO);
 
+	List<ConceptRes> getConcept(ConceptWrapper conceptWrapper);
+
+	List<ConceptWithOrderRes> getConceptWithOrder(ConceptWrapper conceptWrapper);
 	
 }

knowledgeman-service/src/main/java/com/diagbot/service/ConceptService.java

@@ -1,7 +1,12 @@
 package com.diagbot.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.ConceptRes;
+import com.diagbot.dto.ConceptWithOrderRes;
 import com.diagbot.entity.Concept;
+import com.diagbot.entity.wrapper.ConceptWrapper;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,7 @@ import com.diagbot.entity.Concept;
  */
 public interface ConceptService extends IService<Concept> {
 
+    List<ConceptRes> getConcept(ConceptWrapper conceptWrapper);
+
+    List<ConceptWithOrderRes> getConceptWithOrder(ConceptWrapper conceptWrapper);
 }

knowledgeman-service/src/main/java/com/diagbot/service/impl/ConceptServiceImpl.java

@@ -1,5 +1,8 @@
 package com.diagbot.service.impl;
 
+import com.diagbot.dto.ConceptRes;
+import com.diagbot.dto.ConceptWithOrderRes;
+import com.diagbot.entity.wrapper.ConceptWrapper;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -7,6 +10,8 @@ import com.diagbot.entity.Concept;
 import com.diagbot.mapper.ConceptMapper;
 import com.diagbot.service.ConceptService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,5 +22,14 @@ import com.diagbot.service.ConceptService;
  */
 @Service
 public class ConceptServiceImpl extends ServiceImpl<ConceptMapper, Concept> implements ConceptService {
-   
+
+    @Override
+    public List<ConceptRes> getConcept(ConceptWrapper conceptWrapper){
+        return baseMapper.getConcept(conceptWrapper);
+    }
+
+    @Override
+    public List<ConceptWithOrderRes> getConceptWithOrder(ConceptWrapper conceptWrapper){
+        return baseMapper.getConceptWithOrder(conceptWrapper);
+    }
 }

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

@@ -59,5 +59,88 @@
 		</if>
     </select>
 
-   
+
+	<select id="getConcept" resultType="com.diagbot.dto.ConceptRes" parameterType="com.diagbot.entity.wrapper.ConceptWrapper">
+		SELECT
+		t1.id AS startId,
+		t1.lib_name AS startName,
+		t3.id AS endId,
+		t3.lib_name AS endName
+		FROM
+		`kl_concept` t1,
+		`kl_relation` t2,
+		`kl_concept` t3
+		WHERE
+		t1.is_deleted = 'N'
+		AND t2.is_deleted = 'N'
+		AND t3.is_deleted = 'N'
+		AND t1.id = t2.start_id
+		AND t3.id = t2.end_id
+		<if test="startId != null">
+			AND t2.start_id = #{startId}
+		</if>
+		<if test="startName != null and startName != ''">
+			AND t1.lib_name = #{startName}
+		</if>
+		<if test="startType != null">
+			AND t1.lib_type = #{startType}
+		</if>
+		<if test="relationType != null">
+			AND t2.relation_id = #{relationType}
+		</if>
+		<if test="endId != null">
+			AND t2.end_id = #{endId}
+		</if>
+		<if test="endName != null and endName != ''">
+			AND t3.lib_name = #{endName}
+		</if>
+		<if test="endType != null">
+			AND t3.lib_type = #{endType}
+		</if>
+	</select>
+
+	<select id="getConceptWithOrder" resultType="com.diagbot.dto.ConceptWithOrderRes" parameterType="com.diagbot.entity.wrapper.ConceptWrapper">
+		SELECT
+		t1.id AS startId,
+		t1.lib_name AS startName,
+		t3.id AS endId,
+		t3.lib_name AS endName,
+		t4.order_no AS orderNo
+		FROM
+		`kl_concept` t1,
+		`kl_relation` t2,
+		`kl_concept` t3,
+		`kl_relation_order` t4
+		WHERE
+		t1.is_deleted = 'N'
+		AND t2.is_deleted = 'N'
+		AND t3.is_deleted = 'N'
+		AND t4.is_deleted = 'N'
+		AND t1.id = t2.start_id
+		AND t3.id = t2.end_id
+		AND t2.id = t4.t_relation_id
+		<if test="startId != null">
+			AND t2.start_id = #{startId}
+		</if>
+		<if test="startName != null and startName != ''">
+			AND t1.lib_name = #{startName}
+		</if>
+		<if test="startType != null">
+			AND t1.lib_type = #{startType}
+		</if>
+		<if test="relationType != null">
+			AND t2.relation_id = #{relationType}
+		</if>
+		<if test="endId != null">
+			AND t2.end_id = #{endId}
+		</if>
+		<if test="endName != null and endName != ''">
+			AND t3.lib_name = #{endName}
+		</if>
+		<if test="endType != null">
+			AND t3.lib_type = #{endType}
+		</if>
+		ORDER BY t4.order_no
+	</select>
+
 </mapper>