|
@@ -3,11 +3,13 @@ package com.diagbot.facade;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.diagbot.dto.DictionaryInfoDTO;
|
|
|
import com.diagbot.entity.KlDictionaryInfo;
|
|
|
+import com.diagbot.entity.KlLexicon;
|
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
|
import com.diagbot.service.impl.KlDictionaryInfoServiceImpl;
|
|
|
import com.diagbot.util.BeanUtil;
|
|
|
import com.diagbot.util.EntityUtil;
|
|
|
import com.diagbot.util.ListUtil;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
import java.util.List;
|
|
@@ -20,6 +22,10 @@ import java.util.Map;
|
|
|
*/
|
|
|
@Component
|
|
|
public class KlDictionaryInfoFacade extends KlDictionaryInfoServiceImpl {
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ KlLexiconFacade klLexiconFacade;
|
|
|
+
|
|
|
/**
|
|
|
* 返回字典信息
|
|
|
*
|
|
@@ -45,6 +51,20 @@ public class KlDictionaryInfoFacade extends KlDictionaryInfoServiceImpl {
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.orderByAsc("group_type", "order_no"));
|
|
|
List<DictionaryInfoDTO> listRes = BeanUtil.listCopyTo(list, DictionaryInfoDTO.class);
|
|
|
+
|
|
|
+ // 添加词库类型
|
|
|
+ List<KlLexicon> lexiconList = klLexiconFacade.list(new QueryWrapper<KlLexicon>().lambda()
|
|
|
+ .eq(KlLexicon::getIsDeleted, IsDeleteEnum.N.getKey()));
|
|
|
+ for (KlLexicon klLexicon : lexiconList) {
|
|
|
+ DictionaryInfoDTO dictionaryInfoDTO = new DictionaryInfoDTO();
|
|
|
+ dictionaryInfoDTO.setGroupType(-100L);
|
|
|
+ dictionaryInfoDTO.setName(klLexicon.getName());
|
|
|
+ dictionaryInfoDTO.setVal(String.valueOf(klLexicon.getCode()));
|
|
|
+ dictionaryInfoDTO.setOrderNo(klLexicon.getId().intValue());
|
|
|
+ dictionaryInfoDTO.setRemark("词库类型");
|
|
|
+ listRes.add(dictionaryInfoDTO);
|
|
|
+ }
|
|
|
+
|
|
|
return EntityUtil.makeEntityListMap(listRes, "groupType");
|
|
|
}
|
|
|
|