代码优化调整

aipt-service/src/main/java/com/diagbot/facade/ConceptDetailFacade.java

@@ -39,15 +39,11 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
         if (StringUtil.isBlank(conceptIntroduceVO.getName())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入概念名称");
         }
-        QueryWrapper<Concept> conceptQueryWrapper = new QueryWrapper<>();
-        conceptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                eq("lib_name", conceptIntroduceVO.getName()).
-                eq("lib_type", conceptIntroduceVO.getLibType());
-        Concept concept = conceptFacade.getOne(conceptQueryWrapper);
-        if (concept == null) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "概念不存在");
-        }
 
+        //验证存在并且获取概念基本信息
+        Concept concept = conceptFacade.exist(conceptIntroduceVO);
+
+        //获取概念提示信息
         QueryWrapper<ConceptDetail> conceptDetailQueryWrapper = new QueryWrapper<>();
         conceptDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("concept_id", concept.getId())

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

@@ -1,6 +1,12 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.Concept;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.ConceptServiceImpl;
+import com.diagbot.vo.ConceptBaseVO;
 import org.springframework.stereotype.Component;
 
 /**
@@ -11,4 +17,21 @@ import org.springframework.stereotype.Component;
 @Component
 public class ConceptFacade extends ConceptServiceImpl {
 
+    /**
+     * 验证存在并且获取概念基本信息
+     *
+     * @param conceptBaseVO 概念名称和类型
+     * @return 概念基本信息
+     */
+    public Concept exist(ConceptBaseVO conceptBaseVO) {
+        QueryWrapper<Concept> conceptQueryWrapper = new QueryWrapper<>();
+        conceptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("lib_name", conceptBaseVO.getName())
+                .eq("lib_type", conceptBaseVO.getLibType());
+        Concept concept = this.getOne(conceptQueryWrapper);
+        if (concept == null) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "概念不存在");
+        }
+        return concept;
+    }
 }

aipt-service/src/main/java/com/diagbot/vo/ConceptBaseVO.java

@@ -0,0 +1,21 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2019/5/6 18:50
+ */
+@Getter
+@Setter
+public class ConceptBaseVO {
+    @NotBlank(message = "概念名称不能为空")
+    private String name;
+    @NotNull(message = "词性不能为空")
+    private Integer libType;
+}

aipt-service/src/main/java/com/diagbot/vo/ConceptIntroduceVO.java

@@ -3,7 +3,6 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -13,11 +12,7 @@ import javax.validation.constraints.NotNull;
  */
 @Getter
 @Setter
-public class ConceptIntroduceVO {
-    @NotBlank(message = "概念名称不能为空")
-    private String name;
-    @NotNull(message = "词性不能为空")
-    private Integer libType;
+public class ConceptIntroduceVO extends ConceptBaseVO {
     @NotNull(message = "请输入展示位置")
     private Integer position;
 }