更新术语静态知识删除接口

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

@@ -45,10 +45,7 @@ public class ClinicalController {
 
         SearchVo sData = clinicalFacade.processClinicalData(searchVo);
 
-//        Response<ResponseData> res = aiServiceClient.bayesPageData(sData);
-
-        Response<SearchVo> res = new Response<>();
-        res.setData(sData);
+        Response<ResponseData> res = aiServiceClient.bayesPageData(sData);
 
         return RespDTO.onSuc(res.getData());
     }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.ConceptDTO;
 import com.diagbot.dto.LibraryDetailDTO;
+import com.diagbot.entity.Concept;
 import com.diagbot.entity.LibraryDetail;
 import com.diagbot.entity.LibraryInfo;
 import com.diagbot.service.impl.LibraryDetailServiceImpl;
@@ -167,9 +168,11 @@ public class LibraryDetailFacade extends LibraryDetailServiceImpl {
      * @param knowledgeVo
      * @return ConceptDTO
      */
-    public Boolean removeConceptKnowledge(KnowledgeVo knowledgeVo) {
+    public ConceptDTO removeConceptKnowledge(KnowledgeVo knowledgeVo) {
 
-        Boolean isdeleted = false;
+        ConceptDTO conceptDTO = new ConceptDTO();
+        List<String> msg = new ArrayList<>();
+        String error = "";
         LibraryDetail libraryDetail;
 
         QueryWrapper<LibraryInfo> query = new QueryWrapper<>();
@@ -187,11 +190,21 @@ public class LibraryDetailFacade extends LibraryDetailServiceImpl {
             if (libraryDetail != null) {
                 libraryDetail.setIsDeleted("Y");
                 saveOrUpdate(libraryDetail);
-                isdeleted = true;
+//                isdeleted = true;
+            }
+            else {
+                error = "术语 \"" + knowledgeVo.getTerm() + "(" + knowledgeVo.getType() + ")\" " +
+                        "的 " + knowledgeVo.getSource() + "-" + knowledgeVo.getTitle() + " 不存在!";
             }
         }
+        else {
+            error = "术语 \"" + knowledgeVo.getTerm() + "(" + knowledgeVo.getType() + ")\" 不存在!";
+        }
+
 
-        return isdeleted;
+        msg.add(error);
+        conceptDTO.setMessage(msg);
+        return conceptDTO;
     }
 
     /**

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

@@ -4,6 +4,7 @@ package com.diagbot.web;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.*;
+import com.diagbot.entity.Concept;
 import com.diagbot.facade.LibraryDetailFacade;
 import com.diagbot.vo.AmendTermVo;
 import com.diagbot.vo.ConceptVo;
@@ -72,8 +73,14 @@ public class LibraryDetailController {
     @PostMapping("/removeConceptKnowledge")
     @SysLogger("removeConceptKnowledge")
     public RespDTO<ConceptDTO> removeConceptKnowledge(@Valid @RequestBody KnowledgeVo knowledgeVo) {
-        Boolean result = libraryDetailFacade.removeConceptKnowledge(knowledgeVo);
+        RespDTO<ConceptDTO> resp = new RespDTO<>();
+        ConceptDTO result = libraryDetailFacade.removeConceptKnowledge(knowledgeVo);
 
-        return RespDTO.onSuc(result);
+        if (result.getMessage().get(0).length() > 0) {
+            resp.code = "-1";
+            resp.msg = result.getMessage().get(0);
+        }
+
+        return resp;
     }
 }