从词库检索删除type字段

icssman-service/src/main/java/com/diagbot/facade/QuestionFacade.java

@@ -38,6 +38,7 @@ import com.diagbot.vo.ConceptExistVO;
 import com.diagbot.vo.DeleteQuestionVO;
 import com.diagbot.vo.GetQuestionIdsByTypeVO;
 import com.diagbot.vo.GetQuestionInfoVO;
+import com.diagbot.vo.IndexIcssVO;
 import com.diagbot.vo.IndexLexiconVO;
 import com.diagbot.vo.QuestionIdsVO;
 import com.diagbot.vo.QuestionIndexSubVO;
@@ -731,15 +732,17 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
     }
 
 
-    public List<ConceptBaseDTO> indexByLexiconFac(IndexLexiconVO indexLexiconVO) {
-        RespDTO<List<ConceptBaseDTO>> res = knowledgemanServiceClient.indexByLexiconFac(indexLexiconVO);
+    public List<ConceptBaseDTO> indexByLexiconFac(IndexIcssVO indexIcssVO) {
+        IndexLexiconVO vo = new IndexLexiconVO();
+        BeanUtil.copyProperties(indexIcssVO, vo);
+        RespDTO<List<ConceptBaseDTO>> res = knowledgemanServiceClient.indexByLexiconFac(vo);
         RespDTOUtil.respNGDeal(res, "【远程调用】搜索概念失败");
 
         // 过滤已添加的标签
         List<QuestionInfo> questionInfoList = this.list(new QueryWrapper<QuestionInfo>()
                 .in("tag_name", res.data.stream().map(row -> row.getName()).collect(Collectors.toList()))
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("type", indexLexiconVO.getType())
+                .eq("type", indexIcssVO.getType())
                 .ne("tag_type", TagTypeEnum.T8.getKey()));
         List<String> nameExist = questionInfoList.stream().map(row -> row.getTagName()).collect(Collectors.toList());
         if (ListUtil.isNotEmpty(nameExist)) {

icssman-service/src/main/java/com/diagbot/vo/IndexIcssVO.java

@@ -0,0 +1,24 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: zhoutg
+ * @date: 2019/5/10 10:47
+ */
+@Getter
+@Setter
+public class IndexIcssVO {
+    @NotBlank(message = "名称不能为空")
+    private String name;
+    @NotNull(message = "词性类型不能为空")
+    private List<Integer> libType;
+    @NotNull(message = "标签所属不能为空")
+    private Integer type;
+}

icssman-service/src/main/java/com/diagbot/vo/IndexLexiconVO.java

@@ -19,6 +19,4 @@ public class IndexLexiconVO {
     private String name;
     @NotNull(message = "词性类型不能为空")
     private List<Integer> libType;
-    @NotNull(message = "标签所属不能为空")
-    private Integer type;
 }

icssman-service/src/main/java/com/diagbot/web/QuestionInfoController.java

@@ -10,7 +10,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.facade.QuestionFacade;
 import com.diagbot.vo.DeleteQuestionVO;
-import com.diagbot.vo.IndexLexiconVO;
+import com.diagbot.vo.IndexIcssVO;
 import com.diagbot.vo.QuestionIdsVO;
 import com.diagbot.vo.QuestionIndexSubVO;
 import com.diagbot.vo.QuestionIndexVO;
@@ -151,7 +151,7 @@ public class QuestionInfoController {
                     "type： 标签归属，必填<br>")
     @PostMapping("/indexByLexicon")
     @SysLogger("indexByLexicon")
-    public RespDTO<List<ConceptBaseDTO>> indexByLexicon(@RequestBody IndexLexiconVO indexLexiconVO){
-        return RespDTO.onSuc(questionFacade.indexByLexiconFac(indexLexiconVO));
+    public RespDTO<List<ConceptBaseDTO>> indexByLexicon(@RequestBody IndexIcssVO indexIcssVO){
+        return RespDTO.onSuc(questionFacade.indexByLexiconFac(indexIcssVO));
     }
 }

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

@@ -19,5 +19,4 @@ public class IndexLexiconVO {
     private String name;
     @NotNull(message = "词性类型不能为空")
     private List<Integer> libType;
-    private Integer type;
 }