|
@@ -1,5 +1,6 @@
|
|
package com.diagbot.facade;
|
|
package com.diagbot.facade;
|
|
|
|
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.diagbot.client.CdssCoreClient;
|
|
import com.diagbot.client.CdssCoreClient;
|
|
@@ -7,7 +8,10 @@ import com.diagbot.dto.KlConceptStaticDTO;
|
|
import com.diagbot.dto.RespDTO;
|
|
import com.diagbot.dto.RespDTO;
|
|
import com.diagbot.dto.StaticKnowledgeDTO;
|
|
import com.diagbot.dto.StaticKnowledgeDTO;
|
|
import com.diagbot.dto.StaticKnowledgeIndexDTO;
|
|
import com.diagbot.dto.StaticKnowledgeIndexDTO;
|
|
|
|
+import com.diagbot.entity.User;
|
|
|
|
+import com.diagbot.enums.IsDeleteEnum;
|
|
import com.diagbot.service.impl.KlConceptStaticServiceImpl;
|
|
import com.diagbot.service.impl.KlConceptStaticServiceImpl;
|
|
|
|
+import com.diagbot.util.ListUtil;
|
|
import com.diagbot.util.RespDTOUtil;
|
|
import com.diagbot.util.RespDTOUtil;
|
|
import com.diagbot.util.UserUtils;
|
|
import com.diagbot.util.UserUtils;
|
|
import com.diagbot.vo.ChangeStatusVO;
|
|
import com.diagbot.vo.ChangeStatusVO;
|
|
@@ -21,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
+import java.util.Map;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -33,6 +38,8 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private CdssCoreClient cdssCoreClient;
|
|
private CdssCoreClient cdssCoreClient;
|
|
|
|
+ @Autowired
|
|
|
|
+ private UserFacade userFacade;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 静态知识检索
|
|
* 静态知识检索
|
|
@@ -83,6 +90,30 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
|
|
if (RespDTOUtil.respIsOK(respDTO)) {
|
|
if (RespDTOUtil.respIsOK(respDTO)) {
|
|
page = respDTO.data;
|
|
page = respDTO.data;
|
|
}
|
|
}
|
|
|
|
+ List<KlConceptStaticDTO> records = page.getRecords();
|
|
|
|
+ List<Long> userIds = records.stream().map(KlConceptStaticDTO::getModifier)
|
|
|
|
+ .distinct()
|
|
|
|
+ .map(Long::parseLong)
|
|
|
|
+ .collect(Collectors.toList());
|
|
|
|
+ List<User> users = userFacade.list(new QueryWrapper<User>()
|
|
|
|
+ .eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
|
+ .in("id", userIds));
|
|
|
|
+ if (ListUtil.isNotEmpty(userIds)) {
|
|
|
|
+ Map<Long, String> userMap = users.stream().collect(Collectors.toMap(User::getId, User::getLinkman));
|
|
|
|
+ records.forEach(record -> {
|
|
|
|
+ if (userMap.containsKey(Long.valueOf(record.getModifier()))) {
|
|
|
|
+ record.setModifier(userMap.get(Long.valueOf(record.getModifier())));
|
|
|
|
+ } else {
|
|
|
|
+ record.setModifier("");
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+
|
|
|
|
+ } else {
|
|
|
|
+ records.forEach(record -> {
|
|
|
|
+ record.setModifier("");
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+ page.setRecords(records);
|
|
return page;
|
|
return page;
|
|
}
|
|
}
|
|
|
|
|