Merge remote-tracking branch 'origin/dev/knowledge' into debug

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

knowledgeman-service/src/main/java/com/diagbot/entity/LibraryDetail.java

@@ -27,7 +27,7 @@ public class LibraryDetail implements Serializable {
     /**
      * 是否删除,N:未删除，Y:删除
      */
-    private char isDeleted;
+    private String isDeleted;
 
     /**
      * 记录创建时间
@@ -96,11 +96,11 @@ public class LibraryDetail implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
-    public char getIsDeleted() {
+    public String getIsDeleted() {
         return isDeleted;
     }
 
-    public void setIsDeleted(char isDeleted) {
+    public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
     public LocalDateTime getGmtCreate() {

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

@@ -2,10 +2,8 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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;
@@ -13,16 +11,12 @@ 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;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @Description: 术语基本信息查询业务层
@@ -125,26 +119,29 @@ public class LibraryDetailFacade extends LibraryDetailServiceImpl {
             for (int i=0; i<amendTermVo.getInformation().size(); i++) {
                 libraryDetail = amendTermVo.getInformation().get(i);
 
-                QueryWrapper<LibraryDetail> detquery = new QueryWrapper<>();
-                detquery.eq("concept_id", libraryInfo.getConceptId());
-                libraryDetails = list(detquery);
+                if (libraryDetail.getTitle() != null && libraryDetail.getSource() != null) {
+                    QueryWrapper<LibraryDetail> detquery = new QueryWrapper<>();
+                    detquery.eq("concept_id", libraryInfo.getConceptId());
+                    detquery.eq("title", libraryDetail.getTitle());
+                    detquery.eq("source", libraryDetail.getSource());
+                    LibraryDetail exist = getOne(detquery);
 
-                if (libraryDetails.size() > 0) {
-                    LibraryDetail exist_medical = libraryDetails.get(0);
-                    libraryDetail.setId(exist_medical.getId());
-                }
-                else {
-                    libraryDetail.setConceptId(libraryInfo.getConceptId().longValue());
-                }
+                    if (exist != null) {
+                        libraryDetail.setId(exist.getId());
+                        libraryDetail.setConceptId(libraryInfo.getConceptId().longValue());
+                    }
 
-                libraryDetail.setIsDeleted('N');
-                this.saveOrUpdate(libraryDetail);
+//                    now = new Date();
+                    libraryDetail.setGmtModified(LocalDateTime.now());
+                    libraryDetail.setIsDeleted("N");
+                    this.saveOrUpdate(libraryDetail);
 
-                if (conceptDTO.getInformation() == null) {
-                    conceptDTO.setInformation(new ArrayList<LibraryDetail>());
-                }
+                    if (conceptDTO.getInformation() == null) {
+                        conceptDTO.setInformation(new ArrayList<LibraryDetail>());
+                    }
 
-                conceptDTO.getInformation().add(libraryDetail);
+                    conceptDTO.getInformation().add(libraryDetail);
+                }
             }
         }
         else {
@@ -181,7 +178,7 @@ public class LibraryDetailFacade extends LibraryDetailServiceImpl {
 
             if (libraryDetails != null && libraryDetails.size() > 0) {
                 for (LibraryDetail libraryDetail:libraryDetails) {
-                    libraryDetail.setIsDeleted('Y');
+                    libraryDetail.setIsDeleted("Y");
                     saveOrUpdate(libraryDetail);
                 }
                 isdeleted = true;