更新术语静态知识接口

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

@@ -10,6 +10,7 @@ import com.diagbot.entity.*;
 import com.diagbot.service.impl.ConceptServiceImpl;
 import com.diagbot.vo.AmendTermVo;
 import com.diagbot.vo.ConceptVo;
+import com.diagbot.vo.KnowledgeVo;
 import com.diagbot.vo.TermVo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -171,6 +172,7 @@ public class ConceptFacade extends ConceptServiceImpl {
     public ConceptDTO removeConceptInfo(TermVo termVo) {
 
         ConceptDTO conceptDTO = getConcept(termVo);
+        KnowledgeVo knowledgeVo = new KnowledgeVo();
 
         if (conceptDTO == null) {
             conceptDTO = new ConceptDTO();
@@ -181,7 +183,9 @@ public class ConceptFacade extends ConceptServiceImpl {
             return conceptDTO;
         }
         else {
-            conceptDTO = libraryDetailFacade.getConceptKnowledge(termVo);
+            knowledgeVo.setTerm(termVo.getTerm());
+            knowledgeVo.setType(termVo.getType());
+            conceptDTO = libraryDetailFacade.getConceptKnowledge(knowledgeVo);
             if (conceptDTO.getInformation() != null && conceptDTO.getInformation().size() > 0) {
                 String msg = "概念\"" + termVo.getTerm() + "\"的静态知识还存在!";
                 conceptDTO.setMessage(new ArrayList<String>());

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

@@ -50,16 +50,18 @@ public class LibraryDetailFacade extends LibraryDetailServiceImpl {
     /**
      * 获取医学术语静态信息
      *
-     * @param termvo
+     * @param knowledgeVo
      * @return ConceptDTO
      */
-    public ConceptDTO getConceptKnowledge(@RequestBody TermVo termvo) {
+    public ConceptDTO getConceptKnowledge(@RequestBody KnowledgeVo knowledgeVo) {
 
-        List<LibraryInfo> libraryInfos;
         LibraryInfo libraryInfo;
-        List<LibraryDetail> libraryDetails;
+        List<LibraryDetail> libraryDetails = new ArrayList<>();
+        TermVo termVo = new TermVo();
+        termVo.setTerm(knowledgeVo.getTerm());
+        termVo.setType(knowledgeVo.getType());
 
-        ConceptDTO conceptDTO = conceptFacade.getConcept(termvo);
+        ConceptDTO conceptDTO = conceptFacade.getConcept(termVo);
 
         if (conceptDTO != null) {
             // 获取与医学术语的基本信息
@@ -67,18 +69,23 @@ public class LibraryDetailFacade extends LibraryDetailServiceImpl {
             query.eq("concept_id", conceptDTO.getId());
             query.eq("is_deleted", "N");
             query.eq("is_concept", 1);
-            libraryInfos = libraryInfoFacade.list(query);
+            libraryInfo = libraryInfoFacade.getOne(query);
 
-            if (libraryInfos != null) {
-                libraryInfo = libraryInfos.get(0);
-                conceptDTO.setName(libraryInfo.getName());
-            }
+            conceptDTO.setName(libraryInfo.getName());
 
             // 获取与术语相关的静态知识
             QueryWrapper<LibraryDetail> querydetail = new QueryWrapper<>();
             querydetail.eq("concept_id", conceptDTO.getId());
             querydetail.eq("is_deleted", "N");
 
+            if (knowledgeVo.getSource() != null && knowledgeVo.getSource().trim().length() > 0) {
+                querydetail.eq("source", knowledgeVo.getSource());
+            }
+
+            if (knowledgeVo.getTitle() != null && knowledgeVo.getTitle().trim().length() > 0) {
+                querydetail.eq("title", knowledgeVo.getTitle());
+            }
+
             libraryDetails = list(querydetail);
 
             if (libraryDetails != null) {
@@ -131,7 +138,6 @@ public class LibraryDetailFacade extends LibraryDetailServiceImpl {
                         libraryDetail.setConceptId(libraryInfo.getConceptId().longValue());
                     }
 
-//                    now = new Date();
                     libraryDetail.setGmtModified(LocalDateTime.now());
                     libraryDetail.setIsDeleted("N");
                     this.saveOrUpdate(libraryDetail);
@@ -163,7 +169,7 @@ public class LibraryDetailFacade extends LibraryDetailServiceImpl {
     public Boolean removeConceptKnowledge(KnowledgeVo knowledgeVo) {
 
         Boolean isdeleted = false;
-        List<LibraryDetail> libraryDetails;
+        LibraryDetail libraryDetail;
 
         QueryWrapper<LibraryInfo> query = new QueryWrapper<>();
         query.eq("name", knowledgeVo.getTerm());
@@ -173,14 +179,13 @@ public class LibraryDetailFacade extends LibraryDetailServiceImpl {
         if (libraryInfo != null) {
             QueryWrapper<LibraryDetail> detquery = new QueryWrapper<>();
             detquery.eq("concept_id", libraryInfo.getConceptId());
+            detquery.eq("source", knowledgeVo.getSource());
             detquery.eq("title", knowledgeVo.getTitle());
-            libraryDetails = list(detquery);
+            libraryDetail = getOne(detquery);
 
-            if (libraryDetails != null && libraryDetails.size() > 0) {
-                for (LibraryDetail libraryDetail:libraryDetails) {
-                    libraryDetail.setIsDeleted("Y");
-                    saveOrUpdate(libraryDetail);
-                }
+            if (libraryDetail != null) {
+                libraryDetail.setIsDeleted("Y");
+                saveOrUpdate(libraryDetail);
                 isdeleted = true;
             }
         }

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

@@ -44,18 +44,20 @@ public class LibraryDetailController {
 
 
     @ApiOperation(value = "术语静态知识查询",
-            notes = "Term：术语名称, 必填<br>Type：术语类型, 必填<br>")
+            notes = "Term：术语名称, 必填<br>Type：术语类型, 必填<br>" +
+                    "Source: 知识来源, 选填<br/>NewType: 知识标题, 选填<br/>")
     @PostMapping("/getConceptKnowledge")
     @SysLogger("getConceptKnowledge")
-    public RespDTO<ConceptDTO> getConceptKnowledge(@Valid @RequestBody TermVo termvo) {
-        ConceptDTO data = libraryDetailFacade.getConceptKnowledge(termvo);
+    public RespDTO<ConceptDTO> getConceptKnowledge(@Valid @RequestBody KnowledgeVo knowledgeVo) {
+        ConceptDTO data = libraryDetailFacade.getConceptKnowledge(knowledgeVo);
 
         return RespDTO.onSuc(data);
     }
 
 
     @ApiOperation(value = "术语静态知识修改",
-            notes = "NewTerm: 术语名称, 必填<br/>NewType: 术语类型, 必填<br/> ")
+            notes = "NewTerm: 术语名称, 必填<br/>NewType: 术语类型, 必填<br/>" +
+                    "Source: 知识来源, 必填<br/>NewType: 知识标题, 必填<br/>")
     @PostMapping("/upsertConceptKnowledge")
     @SysLogger("upsertConceptKnowledge")
     public RespDTO<ConceptDTO> upsertConceptKnowledge(@Valid @RequestBody AmendTermVo amendTermVo) {
@@ -65,7 +67,8 @@ public class LibraryDetailController {
     }
 
     @ApiOperation(value = "术语静态知识删除",
-            notes = "Term: 术语名称, 必填<br/>Type: 术语类型, 必填<br/>")
+            notes = "Term: 术语名称, 必填<br/>Type: 术语类型, 必填<br/>" +
+                    "Source: 知识来源, 必填<br/>NewType: 知识标题, 必填<br/>")
     @PostMapping("/removeConceptKnowledge")
     @SysLogger("removeConceptKnowledge")
     public RespDTO<ConceptDTO> removeConceptKnowledge(@Valid @RequestBody KnowledgeVo knowledgeVo) {