|
@@ -4,14 +4,14 @@ import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
-import com.qizhen.healsphere.dto.*;
|
|
|
-import com.qizhen.healsphere.entity.PresetInfo;
|
|
|
-import com.qizhen.healsphere.enums.IsDeleteEnum;
|
|
|
-import com.qizhen.healsphere.exception.CommonErrorCode;
|
|
|
-import com.qizhen.healsphere.exception.CommonException;
|
|
|
+import com.qizhen.healsphere.repository.mapper.entity.PresetInfo;
|
|
|
+import com.qizhen.healsphere.common.enums.IsDeleteEnum;
|
|
|
+import com.qizhen.healsphere.common.exception.CommonErrorCode;
|
|
|
+import com.qizhen.healsphere.common.exception.CommonException;
|
|
|
import com.qizhen.healsphere.service.impl.KgServiceImpl;
|
|
|
-import com.qizhen.healsphere.vo.KgQueryVO;
|
|
|
-import com.qizhen.healsphere.vo.KgTreeVO;
|
|
|
+import com.qizhen.healsphere.web.dto.*;
|
|
|
+import com.qizhen.healsphere.web.param.KgQuery;
|
|
|
+import com.qizhen.healsphere.web.param.KgTree;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
@@ -30,12 +30,12 @@ public class KgFacade extends KgServiceImpl {
|
|
|
@Autowired
|
|
|
private PresetInfoFacade presetInfoFacade;
|
|
|
|
|
|
- public GraphLabelDTO getGraphFac(KgQueryVO kgQueryVO) {
|
|
|
+ public GraphLabelDTO getGraphFac(KgQuery kgQuery) {
|
|
|
GraphLabelDTO graphLabelDTO = new GraphLabelDTO();
|
|
|
List<CategorieDTO> categories = new ArrayList<>();
|
|
|
List<GNodeDTO> node = new ArrayList<>();
|
|
|
List<LinkDTO> links = new ArrayList<>();
|
|
|
- List<GraphDTO> res = this.getGraph(kgQueryVO);
|
|
|
+ List<GraphDTO> res = this.getGraph(kgQuery);
|
|
|
if (CollUtil.isEmpty(res)) {
|
|
|
throw new CommonException(CommonErrorCode.NOT_EXISTS);
|
|
|
} else {
|
|
@@ -88,22 +88,22 @@ public class KgFacade extends KgServiceImpl {
|
|
|
return graphLabelDTO;
|
|
|
}
|
|
|
|
|
|
- public TreeDTO getTreeFac(KgTreeVO kgTreeVO) {
|
|
|
+ public TreeDTO getTreeFac(KgTree kgTree) {
|
|
|
TreeDTO treeDTO = new TreeDTO();
|
|
|
- if ((kgTreeVO.getType() == 1
|
|
|
- && (kgTreeVO.getSubType() == 1 || kgTreeVO.getSubType() == 2 || kgTreeVO.getSubType() == 3))
|
|
|
- || (kgTreeVO.getType() == 2 && (kgTreeVO.getSubType() == 0))
|
|
|
- || (kgTreeVO.getType() == 3 && (kgTreeVO.getSubType() == 0))
|
|
|
- || (kgTreeVO.getType() == 4 && (kgTreeVO.getSubType() == 0))
|
|
|
- || (kgTreeVO.getType() == 5 && (kgTreeVO.getSubType() == 0))
|
|
|
- || (kgTreeVO.getType() == 6 && (kgTreeVO.getSubType() == 0))) {
|
|
|
+ if ((kgTree.getType() == 1
|
|
|
+ && (kgTree.getSubType() == 1 || kgTree.getSubType() == 2 || kgTree.getSubType() == 3))
|
|
|
+ || (kgTree.getType() == 2 && (kgTree.getSubType() == 0))
|
|
|
+ || (kgTree.getType() == 3 && (kgTree.getSubType() == 0))
|
|
|
+ || (kgTree.getType() == 4 && (kgTree.getSubType() == 0))
|
|
|
+ || (kgTree.getType() == 5 && (kgTree.getSubType() == 0))
|
|
|
+ || (kgTree.getType() == 6 && (kgTree.getSubType() == 0))) {
|
|
|
// KgQueryVO kgQueryVO = new KgQueryVO();
|
|
|
// kgQueryVO.setLabelName("诊断依据");
|
|
|
// kgQueryVO.setInputStr("诊断依据");
|
|
|
// String tree = this.getTree(kgQueryVO);
|
|
|
PresetInfo presetInfo = presetInfoFacade.getOne(new QueryWrapper<PresetInfo>()
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
- .eq("type", (kgTreeVO.getType() * 10 + kgTreeVO.getSubType())), false);
|
|
|
+ .eq("type", (kgTree.getType() * 10 + kgTree.getSubType())), false);
|
|
|
String tree = "";
|
|
|
if (null != presetInfo){
|
|
|
tree = presetInfo.getContent();
|