|
@@ -28,8 +28,7 @@ import java.util.stream.Collectors;
|
|
|
*/
|
|
|
@Component
|
|
|
public class QuestionUsualFacade extends QuestionUsualServiceImpl {
|
|
|
- @Autowired
|
|
|
- DeptInfoFacade deptInfoFacade;
|
|
|
+
|
|
|
@Autowired
|
|
|
AiptServiceClient aiptServiceClient;
|
|
|
@Autowired
|
|
@@ -53,16 +52,21 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
|
|
|
conceptBaseDTORespDTO = aiptServiceClient.getConceptUsual(conceptUsualVO);
|
|
|
}
|
|
|
RespDTOUtil.respNGDeal(conceptBaseDTORespDTO,"获取常用标签失败");
|
|
|
- if( conceptBaseDTORespDTO.data != null && ListUtil.isNotEmpty(conceptBaseDTORespDTO.data)){
|
|
|
+ if( conceptBaseDTORespDTO.data != null
|
|
|
+ && ListUtil.isNotEmpty(conceptBaseDTORespDTO.data)){
|
|
|
//提取标签名称
|
|
|
- List<String> conceptName = conceptBaseDTORespDTO.data.stream().map(ConceptBaseDTO::getName).collect(Collectors.toList());
|
|
|
+ List<String> conceptName = conceptBaseDTORespDTO.data.stream()
|
|
|
+ .map(ConceptBaseDTO::getName)
|
|
|
+ .collect(Collectors.toList());
|
|
|
//与question标签匹配
|
|
|
QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
|
|
|
questionInfoQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
|
|
|
.in("tag_name",conceptName)
|
|
|
.eq("type",questionUsualVO.getType());
|
|
|
List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
|
|
|
- Map<String,QuestionInfo> questionInfoMap = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getTagName,questionInfo -> questionInfo));
|
|
|
+ Map<String,QuestionInfo> questionInfoMap
|
|
|
+ = questionInfoList.stream()
|
|
|
+ .collect(Collectors.toMap(QuestionInfo::getTagName,questionInfo -> questionInfo));
|
|
|
questionUsualDTOList = BeanUtil.listCopyTo(conceptBaseDTORespDTO.data,QuestionUsualDTO.class);
|
|
|
for (QuestionUsualDTO questionUsualDTO: questionUsualDTOList) {
|
|
|
if(null != questionInfoMap.get(questionUsualDTO.getName())){
|