术语集合内容维护

cdssman-service/src/main/java/com/diagbot/dto/ConceptCollectionDTO.java

@@ -1,8 +1,11 @@
 package com.diagbot.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @Description:
  * @Author:zhaops
@@ -22,4 +25,13 @@ public class ConceptCollectionDTO {
     private Integer conceptLibType;
     @ApiModelProperty(hidden = true)
     private Integer conceptStatus;
+    /**
+     * 修改时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date gmtModified;
+    /**
+     * 修改人
+     */
+    private String modifier;
 }

cdssman-service/src/main/java/com/diagbot/facade/KlConceptCollectionFacade.java

@@ -3,8 +3,10 @@ package com.diagbot.facade;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.ConceptCollectionDTO;
 import com.diagbot.dto.DictionaryInfoDTO;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.KlConcept;
 import com.diagbot.entity.KlLibraryInfo;
 import com.diagbot.entity.KlRelation;
@@ -20,6 +22,7 @@ import com.diagbot.service.KlRelationOrderService;
 import com.diagbot.service.KlRelationService;
 import com.diagbot.service.KlRuleConditionService;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.ConceptCollectionBaseVO;
 import com.diagbot.vo.ConceptCollectionPageVO;
@@ -27,7 +30,6 @@ import com.diagbot.vo.ConceptCollectionSaveVO;
 import com.diagbot.vo.IdVO;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.SystemUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
@@ -67,6 +69,8 @@ public class KlConceptCollectionFacade {
     KlRuleBaseFacade klRuleBaseFacade;
     @Autowired
     KlRuleConditionService klRuleConditionService;
+    @Autowired
+    UserServiceClient userServiceClient;
 
     /**
      * 获取术语集合列表
@@ -80,9 +84,30 @@ public class KlConceptCollectionFacade {
             conceptCollectionPageVO.setCollectionLibType(null);
         }
 
-        return klRelationFacade.getConceptCollectionPage(conceptCollectionPageVO);
-    }
+        IPage<ConceptCollectionDTO> page = klRelationFacade.getConceptCollectionPage(conceptCollectionPageVO);
+        List<ConceptCollectionDTO> records = page.getRecords();
+        List<String> userIds = records.stream().map(ConceptCollectionDTO::getModifier)
+                .distinct()
+                .collect(Collectors.toList());
+        if (ListUtil.isEmpty(userIds)) {
+            return page;
+        }
+        RespDTO<Map<String, String>> userRespDTO = userServiceClient.getUserInfoByIds(userIds);
+        if (RespDTOUtil.respIsNG(userRespDTO)) {
+            return page;
+        }
+        Map<String, String> userMap = userRespDTO.data;
+        records.forEach(record -> {
+            if (userMap.containsKey(record.getModifier())) {
+                record.setModifier(userMap.get(record.getModifier()));
+            } else {
+                record.setModifier("");
+            }
+        });
+        page.setRecords(records);
 
+        return page;
+    }
 
     /**
      * 保存（新增和修改）

cdssman-service/src/main/resources/mapper/KlRelationMapper.xml

@@ -203,6 +203,8 @@
     <select id="getConceptCollectionPage" resultType="com.diagbot.dto.ConceptCollectionDTO">
         SELECT
         t1.*,
+        t2.gmt_modified as gmtModified,
+        t2.modifier,
         t4.id AS conceptId,
         group_concat( t4.lib_name ) AS concatConceptLibName,
         t4.lib_type AS conceptLibType,
@@ -253,5 +255,6 @@
         </if>
         GROUP BY
         t1.collectionId
+        order by t2.gmt_modified desc
     </select>
 </mapper>